From: Guillaume Desmottes Date: Fri, 17 Feb 2012 09:21:41 +0000 (+0100) Subject: Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-window' X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=e7f57aeaf4c3433dc48fa953791ae6598b34ae3d;hp=1a35f5897e424a4e2273f64f428a798e0812f76f Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-window' --- diff --git a/NEWS b/NEWS index b3cc0a9e..d8a919eb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,140 @@ +NEW in 3.3.5 (06/02/2012) +============ +Bugs fixed: + - Fixed #667037, Crash when editing contacts (Guillaume Desmottes) + - Fixed #562462, "Open new chats in separate windows" has no obvious opposite (Danielle Madeley) + - Fixed #575669, Join Chatroom lists all accounts (Will Thompson) + - Fixed #576912, Highlights me in 1-1 conversations for no reason. (Will Thompson) + - Fixed #591667, Improve highlighting messages containing your nickname. (Will Thompson) + - Fixed #591756, Warn the user before leaving chat rooms (Will Thompson) + - Fixed #612216, Default conversation window size is too small (Ken VanDine) + - Fixed #643699, empathy-auth-client window should be modal to the desktop (Guillaume Desmottes) + - Fixed #660856, can't add a jabber account without a tld in username (Guillaume Desmottes) + - Fixed #662916, Empathy keeps scrolling up (Guillaume Desmottes) + - Fixed #666522, Notification unsure if a contact is coming or going (Guillaume Desmottes) + - Fixed #666714, Personal Information dialog for my XMPP account has a number of glitches (Guillaume Desmottes) + - Fixed #668336, Remove Edit -> Personnal information (Guillaume Desmottes) + - Fixed #668372, Adding a second Gmail account lists this account twice (Guillaume Desmottes) + - Fixed #668498, Stop watching connectivity change (Guillaume Desmottes) + - Fixed #668502, "No topic defined" displayed when reconnecting a private chat (Guillaume Desmottes) + - Fixed #668663, The default value of "sort-criterium" is NOT consistent with the description. (Guillaume Desmottes) + - Fixed #668681, empathy-auth-client window doesn't have proper name (Danielle Madeley) + - Fixed #668796, Is someone in Favourite/Favorite People really "Ungrouped" (Danielle Madeley) + - Fixed #669300, accounts assistant: salut widget has Close and Apply buttons (Guillaume Desmottes) + - Fixed #667467, Remove about Add New Preset section on the Saved Presets box (Yasumichi Akahoshi) + - Fixed #668364, I forgot to remove an unnecessary adjective (Yasumichi Akahoshi) + +Translations: + - Updated cs Translation (Marek Černocký) + - Updated es Translation (Daniel Mustieles) + - Updated gl Translation (Fran Diéguez) + - Updated he Translation (Yaron Shahrabani) + - Updated nb Translation (Kjartan Maraas) + - Updated sl Translation (Matej Urbančič) + - Updated sv Translation (Daniel Nylander) + - Updated te Translation (Praveen Illa) + - Updated zh_HK Translation (Cheng-Chia Tseng) + - Updated zh_TW Translation (Cheng-Chia Tseng) + +Documentation translations: + - Updated es Documentation translation (Daniel Mustieles) + - Updated gl Documentation translation (Fran Diéguez) + +NEW in 3.3.4 (16/01/2012) +============ + +The empathy-accounts dialog has been partially re-designed, please report any +regression you may experience. + +Dependencies: + • champlain ≥ 0.12.1 (optional) + +Bugs fixed: + - Fixed #631236, Adding # on mistyping of channel names (Jovanka Gulicoska) + - Fixed #652670, Combine account parameter editing and personal information editing (Danielle Madeley, Guillaume Desmottes) + - Fixed #661500, Display map in tooltip (Guillaume Desmottes) + - Fixed #666864, Can't link contacts + - Fixed #667676, segfault in empathy-chat (Guillaume Desmottes) + - Fixed #667743, Topup menu item not displayed when re-connecting account (Guillaume Desmottes) + - Fixed #667791, Should set Account.Service on IRC accounts (Guillaume Desmottes) + - Fixed #666531, Invite IRC contacts to join room broken (Guillaume Desmottes) + +Translations: + - Updated be Translation (Kasia Bondarava) + - Updated es Translation (Daniel Mustieles) + - Updated et Translation (Mattias Põldaru) + - Updated gl Translation (Fran Diéguez) + - Updated he Translation (Yaron Shahrabani) + - Updated hu Translation (Gabor Kelemen) + - Updated mk Translation (Jovan Naumovski) + - Updated nl Translation (Hannie Dumoleyn) + - Updated ru Translation (Yuri Myasoedov) + - Updated tr Translation (Muhammet Kara) + - Updated xh Translation (Andiswa Mvanyashe) + - Updated zh_HK Translation (Cheng-Chia Tseng) + - Updated zh_TW Translation (Cheng-Chia Tseng) + +Documentation translations: + - Updated es Documentation translation (Daniel Mustieles) + - Updated fr Documentation translation (Bruno Brouard) + - Updated pl Documentation translation (Piotr Drąg) + - Updated sl Documentation translation (Andrej Žnidaršič) + +NEW in 3.3.3 (19/12/2011) +============ + +The "Where else?" release. + +A lot of code has been refactored in this release so if you experience any +regression please report them. Note that inviting IRC contacts is currently +broken (#666531), it should hopefully be fixed soon. + +Dependencies: + + • telepathy-glib ≥ 0.17.3 + • folks ≥ 0.6.6 + +Bugs fixed: + - Fixed #649208, Should move to empathy-chat's workspace rather than moving the window to the current workspace (Guillaume Desmottes) + - Fixed #654171, [pidgin importer] IRC accounts all show up as "irc (nick)", making them hard to distinguish (Guillaume Desmottes) + - Fixed #660547, Get rid of EmpathyContactManager (Guillaume Desmottes) + - Fixed #661640, Can't update the password of a Google account added with gnome-online-accounts (Guillaume Desmottes) + - Fixed #662873, empathy-chat crashed with SIGSEGV in tp_proxy_get_object_path() (Guillaume Desmottes) + - Fixed #663124, improvements to pulsesink/pulsesrc usage (Arun Raghavan) + - Fixed #663328, Stop using EmpathyContactListFlags (Guillaume Desmottes) + - Fixed #663387, Use the individual manager to display muc members (Guillaume Desmottes) + - Fixed #663682, remove EmpathyTpFile (Jonny Lamb) + - Fixed #664459, Always start video preview when using a non default webcam (Guillaume Desmottes) + - Fixed #664564, Doesn't handle TP_DELIVERY_STATUS_PERMANENTLY_FAILED (Guillaume Desmottes) + - Fixed #664795, Theme previews are not rendered correctly (depending on which theme is previewed beforehand) (Guillaume Desmottes) + - Fixed #664935, [Patch] Simple little patch to fix the FSF address in the COPYING file. (Brian Pepple) + - Fixed #665038, Stop using EmpathyContactMenu (Guillaume Desmottes) + - Fixed #665121, Stop using empathy_contact_list_get_all_groups (Guillaume Desmottes) + - Fixed #665171, audio-sink: sigsegv while starting a call (Guillaume Desmottes) + - Fixed #665256, possible memleak in camera-monitor: on_camera_added (Raluca Elena Podiuc) + - Fixed #665403, map-view: stop using EmpathyContactManager (Guillaume Desmottes) + - Fixed #665592, Can't call offline contacts from the log viewer (Guillaume Desmottes) + - Fixed #665853, Use new folks API to ensure personas (Guillaume Desmottes) + - Fixed #666163, EmpathyIndividualMenu cleanup (Guillaume Desmottes) + - Fixed #653812, Errors in the user manual (Milo Casagrande) + - Fixed #665244, new cheese camera device monitor crashes Empathy (Guillaume Desmottes) + +Translations: + - Updated es Translation (Daniel Mustieles) + - Updated he Translation (Yaron Shahrabani) + - Updated nb Translation (Kjartan Maraas) + - Updated ro Translation (Lucian Adrian Grijincu) + - Updated ru Translation (Vladislav Boboshko) + - Updated sl Translation (Matej Urbančič) + - Updated uk Translation (Daniel Korostil) + - Updated zh_CN Translation (Yangtse Su) + +Documentation translations: + - Updated es Documentation translation (Daniel Mustieles) + - Updated it Documentation translation (Milo Casagrande) + - Updated sl Documentation translation (Matej Urbančič) + - Updated zh_CN Documentation translation (Funda Wang, Guanhao Yin) + NEW in 3.3.2 (21/11/2011) ============ diff --git a/configure.ac b/configure.ac index e0e7e43e..cb92b839 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ m4_define(empathy_released, 0) m4_define([empathy_major_version], [3]) m4_define([empathy_minor_version], [3]) -m4_define([empathy_micro_version], [2]) +m4_define([empathy_micro_version], [5]) m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' @@ -34,7 +34,7 @@ AC_COPYRIGHT([ # Minimal version required # Hardp deps -FOLKS_REQUIRED=0.6.2 +FOLKS_REQUIRED=0.6.6 GLIB_REQUIRED=2.30.0 GNUTLS_REQUIRED=2.8.5 GTK_REQUIRED=3.0.2 @@ -57,6 +57,7 @@ GEOCLUE_REQUIRED=0.11 ISO_CODES_REQUIRED=0.35 NAUTILUS_SENDTO_REQUIRED=2.90.0 NETWORK_MANAGER_REQUIRED=0.7.0 +CHAMPLAIN_REQUIRED=0.12.1 # Use --enable-maintainer-mode to disable deprecated symbols, # disable single include and enable GSEAL. If this is not a released empathy, @@ -70,6 +71,9 @@ NETWORK_MANAGER_REQUIRED=0.7.0 # those warnings later during the cycle (bgo #662662) AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated]) +# FIXME: bgo #669673 +AC_DEFINE(CLUTTER_DISABLE_DEPRECATION_WARNINGS, 1, [Build with Clutter deprecated]) + # telepathy-yell prev_top_build_prefix=$ac_top_build_prefix prev_ac_configure_args=$ac_configure_args @@ -450,7 +454,7 @@ if test "x$enable_map" != "xno"; then [ clutter-gtk-1.0 champlain-gtk-0.12 - champlain-0.12 + champlain-0.12 >= $CHAMPLAIN_REQUIRED ], have_libchamplain="yes", have_libchamplain="no") if test "x$have_libchamplain" = "xyes"; then diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in index f3975fce..8e7d9fd1 100644 --- a/data/org.gnome.Empathy.gschema.xml.in +++ b/data/org.gnome.Empathy.gschema.xml.in @@ -88,12 +88,17 @@ present them to the user immediately. <_summary>The position for the chat window side pane <_description>The stored position (in pixels) of the chat window side pane. + + true + <_summary>Show contact groups + <_description>Whether to show groups in the contact list. + 'state' <_summary>Contact list sort criterion - <_description>Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value "name". A value of "state" will sort the contact list by state. + <_description>Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value "state". A value of "name" will sort the contact list by name. @@ -201,6 +206,11 @@ present them to the user immediately. <_summary>Enable WebKit Developer Tools <_description>Whether WebKit developer tools, such as the Web Inspector, should be enabled. + + true + <_summary>Inform other users when you are typing to them + <_description>Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state. + true <_summary>Use theme for chat rooms diff --git a/help/C/add-account.page b/help/C/add-account.page index 86145c0c..b727eddf 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -14,8 +14,9 @@ --> - - + + + Milo Casagrande milo@ubuntu.com @@ -26,7 +27,7 @@

Creative Commons Share Alike 3.0

- + + + + Phil Bull philbull@gmail.com

Creative Commons Share Alike 3.0

- + + Milo Casagrande milo@ubuntu.com @@ -53,13 +54,12 @@ side of the window.

-

Deselect Enabled on the right side of the - window. +

On the right side of the window, switch it off.

- To re-enable the account, simply select Enabled. + To re-enable the account, switch it on.

diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page index 2a85f156..f4be7bbb 100644 --- a/help/C/irc-manage.page +++ b/help/C/irc-manage.page @@ -2,8 +2,7 @@ xmlns:e="http://projectmallard.org/experimental/" xmlns:if="http://projectmallard.org/experimental/if/" type="guide" style="2column" - id="irc-manage" - groups="one two"> + id="irc-manage"> diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page index a1668dfe..97718427 100644 --- a/help/C/prev-conv.page +++ b/help/C/prev-conv.page @@ -12,6 +12,7 @@ --> + Milo Casagrande milo@ubuntu.com @@ -22,7 +23,7 @@

Creative Commons Share Alike 3.0

- + - +-->

- Deselect the Enabled, and then select it again to try to - reconnect to the service. + Switch the account off, and then switch it on to try to reconnect to the + service.

- +
Proxy support

At the moment Empathy can not be configured to work with a - proxy. + proxy.

diff --git a/help/C/remove-account.page b/help/C/remove-account.page index ff2d6108..85b6ac07 100644 --- a/help/C/remove-account.page +++ b/help/C/remove-account.page @@ -14,13 +14,14 @@ --> + Milo Casagrande milo@ubuntu.com

Creative Commons Share Alike 3.0

- + - + + Milo Casagrande milo@ubuntu.com

Creative Commons Share Alike 3.0

- + Start a video conversation

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 + 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.

@@ -61,7 +62,7 @@

- From the Contact List window, right-click on the meta-contact. + From the Contact List window, right-click on the meta-contact.

@@ -80,6 +81,4 @@

- - diff --git a/help/de/de.po b/help/de/de.po index 4f6e78c5..fb6e8763 100644 --- a/help/de/de.po +++ b/help/de/de.po @@ -4,16 +4,16 @@ # documentation package. # # Philipp Kerling , 2008. -# Mario Blättermann , 2008-2011. +# Mario Blättermann , 2008-2012. # Christian Kirbach , 2009, 2010. # msgid "" msgstr "" "Project-Id-Version: empathy help master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-05 18:45+0000\n" -"PO-Revision-Date: 2011-09-06 20:40+0100\n" -"Last-Translator: Mario Blättermann \n" +"POT-Creation-Date: 2012-01-20 18:47+0000\n" +"PO-Revision-Date: 2012-02-07 14:50+0100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +24,7 @@ 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/video-call.page:38(None) C/audio-video.page:70(None) +#: C/video-call.page:39(None) C/audio-video.page:70(None) #: C/audio-call.page:36(None) msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" msgstr "original" @@ -33,15 +33,15 @@ msgstr "original" msgid "Start a video conversation with one of your contacts." msgstr "Beginnen Sie eine Videounterhaltung mit einem Ihrer Kontakte." -#: C/video-call.page:21(name) C/status-icons.page:16(name) +#: C/video-call.page:22(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/remove-account.page:19(name) C/prob-conn-neterror.page:19(name) +#: C/prob-conn-name.page:18(name) C/prob-conn-auth.page:21(name) +#: C/prob-conn-acctdisabled.page:19(name) C/prev-conv.page:17(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-manage.page:19(name) C/irc-join-room.page:16(name) #: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name) #: C/introduction.page:13(name) C/index.page:19(name) #: C/import-account.page:23(name) C/hide-contacts.page:11(name) @@ -49,21 +49,21 @@ msgstr "Beginnen Sie eine Videounterhaltung mit einem Ihrer Kontakte." #: 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/disable-account.page:21(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/add-account.page:21(name) msgid "Milo Casagrande" msgstr "Milo Casagrande" -#: C/video-call.page:22(email) C/status-icons.page:17(email) +#: C/video-call.page:23(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/remove-account.page:20(email) C/prob-conn-neterror.page:20(email) +#: C/prob-conn-name.page:19(email) C/prob-conn-auth.page:22(email) +#: C/prob-conn-acctdisabled.page:20(email) C/prev-conv.page:18(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-manage.page:20(email) C/irc-join-room.page:17(email) #: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email) #: C/introduction.page:14(email) C/index.page:20(email) #: C/import-account.page:24(email) C/hide-contacts.page:12(email) @@ -71,21 +71,21 @@ msgstr "Milo Casagrande" #: 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/favorite-rooms.page:15(email) C/disable-account.page:22(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) +#: C/audio-call.page:20(email) C/add-account.page:22(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/video-call.page:26(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/remove-account.page:23(p) C/prob-conn.page:18(p) +#: C/prob-conn-neterror.page:23(p) C/prob-conn-name.page:22(p) +#: C/prob-conn-auth.page:25(p) C/prob-conn-acctdisabled.page:23(p) +#: C/prev-conv.page:25(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-nick-password.page:22(p) C/irc-manage.page:23(p) #: C/irc-join-room.page:20(p) C/irc-join-pwd.page:21(p) #: C/irc-commands.page:14(p) C/introduction.page:17(p) C/index.page:23(p) #: C/import-account.page:31(p) C/hide-contacts.page:15(p) @@ -93,22 +93,22 @@ msgstr "milo@ubuntu.com" #: 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/disable-account.page:29(p) C/create-account.page:23(p) +#: C/change-status.page:28(p) C/audio-video.page:21(p) C/audio-call.page:23(p) +#: C/add-contact.page:22(p) C/add-account.page:29(p) #: C/accounts-window.page:22(p) C/account-jabber.page:18(p) #: C/account-irc.page:20(p) msgid "Creative Commons Share Alike 3.0" msgstr "Creative Commons Share Alike 3.0" -#: C/video-call.page:28(title) +#: C/video-call.page:29(title) msgid "Start a video conversation" msgstr "Eine Video-Unterhaltung beginnen" -#: C/video-call.page:30(p) +#: C/video-call.page:31(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 " +"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 "" @@ -117,7 +117,7 @@ msgstr "" "Kontentypen zur Verfügung. Außerdem muss die andere Person mit einer " "Anwendung arbeiten, die Videoanrufe unterstützt." -#: C/video-call.page:37(p) +#: C/video-call.page:38(p) msgid "" "From the Contact List window, click the video call icon next to " @@ -129,7 +129,7 @@ msgstr "" "neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie Videoanruf." -#: C/video-call.page:43(p) C/audio-call.page:42(p) +#: C/video-call.page:44(p) C/audio-call.page:42(p) msgid "" "A new window will open. When the connection is established, you will see " "Connected at the bottom of the window, along with the total " @@ -139,13 +139,13 @@ msgstr "" "Sie am unteren Rand des Fensters Verbunden und die Gesamtzeit der " "Unterhaltung." -#: C/video-call.page:48(p) C/audio-call.page:48(p) +#: C/video-call.page:49(p) C/audio-call.page:48(p) msgid "To end the conversation, click on Hang up." msgstr "" "Um eine Unterhaltung zu beenden, klicken Sie auf Auflegen." -#: C/video-call.page:54(p) +#: C/video-call.page:55(p) msgid "" "To turn a video conversation into an audio conversation, choose VideoVideo Off." @@ -154,16 +154,16 @@ msgstr "" "VideoVideo aus." -#: C/video-call.page:60(title) +#: C/video-call.page:61(title) msgid "Start a video conversation with a meta-contact" msgstr "Beginnen einer Videounterhaltung mit einem Meta-Kontakt" -#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p) +#: C/video-call.page:64(p) C/send-message.page:53(p) C/audio-call.page:66(p) msgid "" "From the Contact List window, right-click on the meta-contact." msgstr "Klicken Sie imKontaktlisten-Fenster auf den Meta-Kontakt." -#: C/video-call.page:68(p) +#: C/video-call.page:69(p) msgid "" "Select the contact you want to have the conversation, and from the menu " "select Video Call." @@ -171,7 +171,7 @@ msgstr "" "Wählen Sie den Kontakt aus, mit dem Sie eine Unterhaltung beginnen wollen, " "und wählen Sie im Menü Videoanruf." -#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p) +#: C/video-call.page:76(p) C/send-message.page:65(p) C/audio-call.page:78(p) msgid "" "To recognize if a contact is a meta-contact, move your mouse on a " "contact in the Contact List window, and stop over it for a second: " @@ -212,17 +212,17 @@ msgid "Understanding the various statuses and status icons." msgstr "Erläuterung der verschiedenen Status und deren Symbole." #: 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/prev-conv.page:21(name) C/import-account.page:27(name) +#: C/disable-account.page:25(name) C/audio-video.page:109(cite) +#: C/audio-video.page:117(cite) C/add-account.page:25(name) +#: C/accounts-window.page:18(name) C/account-jabber.page:14(name) +#: C/account-irc.page:16(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/status-icons.page:21(email) C/prev-conv.page:22(email) +#: C/import-account.page:28(email) C/disable-account.page:26(email) +#: C/add-account.page:26(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" @@ -492,13 +492,13 @@ msgstr "" #: 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." +"use it again, click on the little heart on the right of the text box where " +"you wrote your custom message." msgstr "" "Wenn Sie die benutzerdefinierte Nachricht als bevorzugt festlegen wollen, " "speichern Sie sie, um sie wiederverwenden zu können. Klicken Sie anschließend " -"auf den kleinen Stern an der rechten Seite des Textfeldes, in welches Sie " -"Ihre benutzerdefinierte Nachricht eingegeben haben." +"auf das kleine Herz an der rechten Seite des Textfeldes, in welches Sie Ihre " +"benutzerdefinierte Nachricht eingegeben haben." #: C/set-custom-status.page:69(p) msgid "" @@ -510,9 +510,8 @@ msgstr "" "für die aktuelle Sitzung gespeichert." #: C/set-custom-status.page:78(title) -msgid "Edit, remove and add a custom message" -msgstr "" -"Bearbeiten, Entfernen und Hinzufügen einer benutzerdefinierten Nachricht" +msgid "Edit and remove a custom message" +msgstr "Eine benutzerdefinierte Nachricht bearbeiten und entfernen" #: C/set-custom-status.page:88(p) msgid "Select Edit Custom Message." @@ -552,44 +551,17 @@ msgstr "" msgid "Click on the Remove button." msgstr "Klicken Sie auf den Knopf Entfernen." -#: C/set-custom-status.page:131(p) -msgid "To add a new custom message, from the Add New Preset section:" -msgstr "" -"So fügen Sie im Abschnitt Neue Voreinstellung hinzufügen eine neue " -"benutzerdefinierte Nachricht hinzu:" - -#: C/set-custom-status.page:136(p) -msgid "" -"Click on the drop-down list to select the status you want to set a custom " -"message to." -msgstr "" -"Klicken Sie auf die Auswahlliste, um den Status auszuwählen, dem Sie die " -"benutzerdefinierte Nachricht zuordnen wollen." - -#: C/set-custom-status.page:142(p) -msgid "Click on the text box, and type the new custom message." -msgstr "" -"Klicken Sie in das Textfeld und geben Sie die neue benutzerdefinierte " -"Nachricht ein." - -#: C/set-custom-status.page:147(p) -msgid "Click on Add to add the new message to the presets ones." -msgstr "" -"Klicken Sie auf Hinzufügen, um die neue Nachricht zu den " -"voreingestellten Nachrichten hinzuzufügen." - -#: C/set-custom-status.page:156(p) +#: C/set-custom-status.page:133(p) msgid "When finished, click on Close." msgstr "Klicken Sie auf Schließen, sobald Sie fertig sind." -#: C/set-custom-status.page:163(p) +#: C/set-custom-status.page:140(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 Contact List " -"window." +"When you edit a custom message, it will not be set as the current status " +"message. You will need to select it from the Contact List window." msgstr "" -"Wenn Sie eine neue benutzerdefinierte Nachricht hinzufügen oder bearbeiten, " -"wird diese nicht als aktuelle Statusnachricht festgelegt. Sie müssen Sie im " +"Wenn Sie eine neue benutzerdefinierte Nachricht bearbeiten, wird diese nicht " +"als aktuelle Statusnachricht festgelegt. Sie müssen Sie im " "Kontaktlisten-Fenster auswählen." #: C/send-message.page:8(desc) @@ -597,16 +569,16 @@ msgid "Send a message to one of your contacts." msgstr "Eine Nachricht an einen Ihrer Kontakte senden." #: 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) +#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:15(name) +#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:15(name) +#: C/change-status.page:24(name) C/add-contact.page:18(name) msgid "Phil Bull" msgstr "Phil Bull" #: 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) +#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:16(email) +#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:16(email) +#: C/change-status.page:25(email) C/add-contact.page:19(email) msgid "philbull@gmail.com" msgstr "philbull@gmail.com" @@ -777,11 +749,11 @@ msgstr "" msgid "Completely remove an account from Empathy." msgstr "Ein Konto vollständig aus Empathy löschen." -#: C/remove-account.page:33(title) +#: C/remove-account.page:34(title) msgid "Remove an account" msgstr "Löschen eines Kontos" -#: C/remove-account.page:35(p) +#: C/remove-account.page:36(p) msgid "" "You can completely remove an account from Empathy if you no longer " "wish to use the account. If you wish to use the account in Empathy " @@ -792,8 +764,8 @@ msgstr "" "Empathy erneut nutzen wollen, dann müssen Sie die Kontendetails " "erneut eingeben." -#: 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/remove-account.page:43(p) C/irc-nick-password.page:50(p) +#: C/disable-account.page:49(p) C/add-account.page:49(p) msgid "" "From the Contact List window, choose EditAccounts, or press F4." @@ -801,7 +773,7 @@ msgstr "" "Wählen Sie im Kontaktlisten-Fenster BearbeitenKonten oder drücken Sie F4." -#: C/remove-account.page:46(p) +#: C/remove-account.page:47(p) msgid "" "Select the account you wish to remove from the accounts list on the left side " "of the window." @@ -809,11 +781,11 @@ msgstr "" "Wählen Sie das Konto, das Sie aus der Kontenliste entfernen wollen, an der " "linken Seite des Fensters aus." -#: C/remove-account.page:50(p) -msgid "Click on Remove." -msgstr "Klicken Sie auf Entfernen." +#: C/remove-account.page:51(p) +msgid "Click -." +msgstr "Klicken Sie auf -." -#: C/remove-account.page:53(p) +#: C/remove-account.page:54(p) msgid "" "A dialog will be shown asking for confirmation. Click the Remove " "button to permanently remove the account." @@ -821,7 +793,7 @@ msgstr "" "Ein Dialogfenster bittet darum, den Vorgang zu bestätigen. Klicken Sie auf " "den Knopf Entfernen, um das Konto dauerhaft zu entfernen." -#: C/remove-account.page:59(p) +#: C/remove-account.page:60(p) msgid "" "Even after removing an account, Empathy does not delete your " "conversation history for that account." @@ -841,7 +813,7 @@ msgstr "Probleme beim Verbinden zu einem Sofortnachrichtendienst" #. 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-neterror.page:59(None) C/prob-conn-name.page:44(None) #: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None) msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" msgstr "original" @@ -854,16 +826,16 @@ msgstr "" "Eine Fehlermeldung mit dem Text »Netzwerkfehler« erscheint im " "Hauptfenster." -#: C/prob-conn-neterror.page:33(title) +#: C/prob-conn-neterror.page:34(title) msgid "I get a message that says “Network error”" msgstr "Eine Meldung zeigt einen »Netzwerkfehler« an" -#: C/prob-conn-neterror.page:36(cite) +#: C/prob-conn-neterror.page:37(cite) msgid "shaunm" msgstr "shaunm" # Blöd, dass diese Kommentare auch noch in der pot-Datei erscheinen. Mallard ist eben noch lange nicht da, wo es sein sollte. -#: C/prob-conn-neterror.page:37(p) +#: C/prob-conn-neterror.page:38(p) msgid "" "Empathy no longer allows you to create an IRC account without a valid nick. " "I've removed the guide link. Remove the text." @@ -871,7 +843,7 @@ msgstr "" "Empathy erlaubt es nicht mehr, ein IRC-Konto ohne einen gültigen " "Spitznamen anzulegen" -#: C/prob-conn-neterror.page:41(p) +#: C/prob-conn-neterror.page:42(p) msgid "" "This kind of error happens when Empathy cannot communicate with " "the instant messaging service for some reason." @@ -879,7 +851,7 @@ msgstr "" "Dieser Fehler tritt auf, wenn Empathy aus irgendeinem Grund nicht " "in der Lage ist, mit dem Sofortnachrichtendienst zu kommunizieren." -#: C/prob-conn-neterror.page:45(p) +#: C/prob-conn-neterror.page:46(p) msgid "" "Also, this kind of error happens when you try to use an IRC account without " "setting a nickname." @@ -887,15 +859,15 @@ msgstr "" "Dieser Fehler tritt auch auf, wenn Sie ein IRC-Konto verwenden wollen, ohne " "einen Spitznamen festzulegen." -#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p) -#: C/prob-conn-acctdisabled.page:43(p) +#: C/prob-conn-neterror.page:53(p) C/prob-conn-auth.page:45(p) +#: C/prob-conn-acctdisabled.page:44(p) msgid "" "Make sure that you are connected to the Internet, or to a local area network." msgstr "" "Stellen Sie sicher, dass Sie mit dem Internet beziehungsweise mit einem " "lokalen Netzwerk verbunden sind." -#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p) +#: C/prob-conn-neterror.page:58(p) C/prob-conn-name.page:43(p) #: C/prob-conn-auth.page:57(p) msgid "" "Click the Bearbeiten-Symbol in der Fehlermeldung." -#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p) +#: C/prob-conn-neterror.page:64(p) C/prob-conn-acctdisabled.page:60(p) msgid "" "Check in the Advanced section that all the details are correct. " "You should be able to find these details from the website of the messaging " @@ -914,19 +886,19 @@ msgstr "" "korrekt sind. Es sollte möglich sein, diese Details auf der Webseite des " "jeweiligen Sofortnachrichtendienstes zu finden." -#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p) +#: C/prob-conn-neterror.page:79(p) C/prob-conn-name.page:65(p) msgid "" -"Deselect the Enabled, and then select it again to try to reconnect " -"to the service." +"Switch the account off, and then switch it on to try to reconnect to the " +"service." msgstr "" -"Deaktivieren Sie das Ankreuzfeld Aktiviert und aktivieren Sie es " -"erneut, um einen neuen Verbindungsversuch zu starten." +"Deaktivieren Sie das Konto und aktivieren Sie es erneut, um einen neuen " +"Verbindungsversuch zu starten." -#: C/prob-conn-neterror.page:90(title) +#: C/prob-conn-neterror.page:87(title) msgid "Proxy support" msgstr "Proxy-Unterstützung" -#: C/prob-conn-neterror.page:91(p) +#: C/prob-conn-neterror.page:88(p) msgid "" "At the moment Empathy can not be configured to work with a proxy." msgstr "" @@ -945,11 +917,11 @@ msgstr "" "Eine Fehlermeldung »Name bereits in Benutzung« erscheint im " "Hauptfenster." -#: C/prob-conn-name.page:32(title) +#: C/prob-conn-name.page:33(title) msgid "I get a message that says “Name in use”" msgstr "Eine Meldung zeigt »Name bereits in Benutzung« an" -#: C/prob-conn-name.page:34(p) +#: C/prob-conn-name.page:35(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 " @@ -959,13 +931,13 @@ msgstr "" "und Sie einen Spitznamen verwenden wollen, den in diesem bestimmten Netzwerk " "bereits jemand anders gewählt hat." -#: C/prob-conn-name.page:50(p) +#: C/prob-conn-name.page:51(p) msgid "In the Nickname text box, type a new nickname." msgstr "" "Geben Sie in das Spitzname-Textfeld einen neuen " "Spitznamen ein." -#: C/prob-conn-name.page:55(p) +#: C/prob-conn-name.page:56(p) msgid "" "If you have registered that nickname within the network you are using, set " "the password for that nickname. For more information, see ." -#: C/prob-conn-name.page:64(p) -msgid "" -"Deselect the Enabled check-box next to the name of your account, " -"and then select it again to try to reconnect to the service." -msgstr "" -"Deaktivieren Sie das Ankreuzfeld Aktiviert neben dem Namen Ihres " -"Kontos und aktivieren Sie es erneut, um einen neuen Verbindungsversuch zu " -"starten." - #: C/prob-conn-auth.page:8(desc) msgid "" "An error message which says “Authentication failed” appears in the " @@ -1016,13 +979,21 @@ msgstr "" "dem Sie sich verbinden wollen. Falls Sie über kein Konto verfügen, verweigern " "die meisten Dienste die Verbindung." -#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p) +#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:55(p) msgid "" "Type your username and password again to make sure that they are correct." msgstr "" "Geben sie Ihren Benutzernamen und Ihr Passwort erneut ein, um sicher zu " "stellen, dass diese korrekt sind." +#: C/prob-conn-auth.page:68(p) +msgid "" +"Deselect the Enabled, and then select it again to try to reconnect " +"to the service." +msgstr "" +"Deaktivieren Sie das Ankreuzfeld Aktiviert und aktivieren Sie es " +"erneut, um einen neuen Verbindungsversuch zu starten." + #: C/prob-conn-acctdisabled.page:7(desc) msgid "" "The instant messaging account that you want to use is not enabled in the list " @@ -1031,11 +1002,11 @@ msgstr "" "Das Sofortnachrichten-Konto, welches Sie verwenden wollen, ist in der " "Kontenliste nicht aktiviert." -#: C/prob-conn-acctdisabled.page:33(title) +#: C/prob-conn-acctdisabled.page:34(title) msgid "My account is not enabled" msgstr "Mein Konto ist nicht aktiviert" -#: C/prob-conn-acctdisabled.page:35(p) +#: C/prob-conn-acctdisabled.page:36(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 " @@ -1045,7 +1016,7 @@ msgstr "" "aktiviert ist, wenn Sie eine neue Unterhaltung starten oder einen Raum " "betreten wollen, könnten Ihre Kontendetails eventuell nicht korrekt sein." -#: C/prob-conn-acctdisabled.page:48(p) +#: C/prob-conn-acctdisabled.page:49(p) msgid "" "Choose EditAccounts and select the " "account that is not working." @@ -1053,38 +1024,19 @@ msgstr "" "Wählen Sie BearbeitenKonten und wählen " "Sie den nicht funktionierenden Kontakt aus." -#: C/prob-conn-acctdisabled.page:65(p) -msgid "" -"Check that the Enabled check-box is selected. " -"If it is not, select the check-box to enable the account." -msgstr "" -"Stellen Sie sicher, dass das Ankreuzfeld Aktiviert neben dem Namen Ihres Kontos ausgewählt ist. Falls nicht, aktivieren Sie " -"das Ankreuzfeld, um das Konto zu aktivieren." +#: C/prob-conn-acctdisabled.page:66(p) +msgid "Check that the account is switched on." +msgstr "Überprüfen Sie, ob das Konto eingeschaltet ist." #: C/prev-conv.page:8(desc) msgid "Browse or search your previous conversations." msgstr "Betrachten und Durchsuchen Ihrer früheren Unterhaltungen." -#: C/prev-conv.page:35(title) +#: C/prev-conv.page:36(title) msgid "View previous conversations" msgstr "Vorherige Unterhaltungen anschauen" -#: C/prev-conv.page:39(p) -msgid "" -"Highlighting text is quirky: #593733. 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 "" -"Highlighting text is quirky: #593733. 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." - -#: C/prev-conv.page:46(p) +#: C/prev-conv.page:38(p) msgid "" "Empathy automatically saves all your text conversations you have " "with your contacts. You can search through all of your " @@ -1096,7 +1048,7 @@ msgstr "" "früheren Unterhaltungen durchsuchen oder frühere Unterhaltungen anhand Kontakt und Datum suchen." -#: C/prev-conv.page:54(p) +#: C/prev-conv.page:46(p) msgid "" "You do not need to be connected to the Internet to view and search your " "previous conversations." @@ -1104,17 +1056,17 @@ msgstr "" "Sie müssen nicht mit dem Internet verbunden sein, um Ihre vorherigen " "Unterhaltungen zu betrachten und zu durchsuchen." -#: C/prev-conv.page:61(title) +#: C/prev-conv.page:53(title) msgid "Search previous conversations" msgstr "Vorherige Unterhaltungen durchsuchen" -#: C/prev-conv.page:63(p) +#: C/prev-conv.page:55(p) msgid "" "You can perform a full-text search through all of your previous conversations." msgstr "" "Sie können den Volltext aller Ihrer vorherigen Unterhaltungen durchsuchen." -#: C/prev-conv.page:67(p) C/prev-conv.page:96(p) +#: C/prev-conv.page:59(p) C/prev-conv.page:87(p) msgid "" "From the Contact List window, choose ViewPrevious Conversations. Alternatively, press F3Vorherige Unterhaltungen. Alternativ drücken Sie " "F3." -#: C/prev-conv.page:71(p) -msgid "Select the Search tab." -msgstr "Wählen Sie den Reiter Suchen." - -#: C/prev-conv.page:74(p) +#: C/prev-conv.page:63(p) msgid "" -"In the For field, type the text you want to search for. Click " -"Find or press Enter." +"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 "" -"Geben Sie in das Nach-Textfeld den Text ein, nach dem Sie suchen " -"wollen. Klicken Sie auf Suchen oder drücken Sie die " -"Eingabetaste." +"Wählen Sie ein Konto in der Auswahlliste oben. Eine Liste der Kontakte und " +"Unterhaltungsräume für dieses Konto wird darunter angezeigt." + +#: C/prev-conv.page:67(p) +msgid "" +"Type the text you want to search for in the Search text field." +msgstr "Geben Sie den zu suchenden Text im Suchfeld ein." -#: C/prev-conv.page:78(p) +#: C/prev-conv.page:71(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." +"Any conversations that matched your search terms will be shown. By default, " +"conversations are ordered by date." msgstr "" "Jegliche Unterhaltungen, die auf Ihre Suchbegriffe zutreffen, werden in der " "Liste unterhalb des Suchfeldes angezeigt. Per Vorgabe sind die Unterhaltungen " "nach Datum geordnet." -#: C/prev-conv.page:82(p) -msgid "" -"Click on a conversation to view it. Empathy will select the text " -"in the conversation that matched your search terms." -msgstr "" -"Klicken Sie auf eine Unterhaltung, um sie zu betrachten. Empathy " -"hebt in der Unterhaltung den Text hervor, der Ihren Suchbegriffen entspricht." - -#: C/prev-conv.page:89(title) +#: C/prev-conv.page:80(title) msgid "Browse previous conversations" msgstr "Vorherige Unterhaltungen betrachten" -#: C/prev-conv.page:91(p) +#: C/prev-conv.page:82(p) msgid "" "You can browse your previous conversations with your contacts or in chat " "rooms by date." @@ -1166,11 +1110,7 @@ msgstr "" "Sie können Ihre früheren Unterhaltungen mit Ihren Kontakten oder in " "Unterhaltungsräumen anhand des Datums durchsuchen." -#: C/prev-conv.page:100(p) -msgid "Select the Conversations tab." -msgstr "Wählen Sie den Reiter Unterhaltungen." - -#: C/prev-conv.page:103(p) +#: C/prev-conv.page:91(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." @@ -1178,7 +1118,7 @@ msgstr "" "Wählen Sie ein Konto in der Auswahlliste oben links. Eine Liste der Kontakte " "und Unterhaltungsräume für dieses Konto wird darunter angezeigt." -#: C/prev-conv.page:107(p) +#: C/prev-conv.page:95(p) msgid "" "Select a contact or chat room to view your previous conversations from. By " "default the most recent conversation will be shown." @@ -1187,7 +1127,7 @@ msgstr "" "Unterhaltungen zu betrachten. Per Vorgabe wird die letzte Unterhaltung " "angezeigt." -#: C/prev-conv.page:111(p) +#: C/prev-conv.page:99(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 " @@ -1200,21 +1140,21 @@ msgstr "" "Klicken Sie auf die Pfeile neben den Monats- und Jahresangaben, um zu " "früheren Daten zu gehen." -#: C/prev-conv.page:117(p) +#: C/prev-conv.page:105(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." +"You can search for text in the conversations by typing into the search field " +"at the top. The matching conversations will be showed." msgstr "" -"Sie können nach Text in der angezeigten Unterhaltung suchen, indem Sie ihn in " -"das Suchfeld oben eingeben. Der damit übereinstimmende Text wird " +"Sie können nach Text in den Unterhaltungen suchen, indem Sie ihn in das " +"Suchfeld oben eingeben. Die damit übereinstimmenden unterhaltungen werden " "hervorgehoben." -#: C/prev-conv.page:121(p) +#: C/prev-conv.page:111(p) msgid "" "You can quickly view the previous conversations with one of your contacts " "from the Contact List window. Simply right click the contact and " -"choose View Previous Conversations. The Previous " -"Conversations window will open with that contact already selected." +"choose Previous Conversations. The Previous Conversations window will open with that contact already selected." msgstr "" "Im Kontaktlisten-Fenster können Sie schnell die früheren " "Unterhaltungen mit einem Ihrer Kontakte betrachten. Klicken Sie einfach mit " @@ -1526,6 +1466,7 @@ msgstr "" "Registrierung Ihres Spitznamens verwendet haben." #: C/irc-nick-password.page:63(p) C/import-account.page:61(p) +#: C/add-account.page:74(p) msgid "Click Apply." msgstr "Klicken Sie auf Anwenden." @@ -1540,15 +1481,15 @@ msgstr "" "gegenwärtig nicht möglich, mit Empathy einen IRC-Spitznamen zu " "registrieren oder das Passwort für Ihren Spitznamen zu ändern." -#: C/irc-manage.page:10(desc) +#: C/irc-manage.page:9(desc) msgid "How to use IRC with Empathy." msgstr "Benutzung des IRC mit Empathy." -#: C/irc-manage.page:35(title) +#: C/irc-manage.page:34(title) msgid "Internet Relay Chat (IRC)" msgstr "Internet Relay Chat (IRC)" -#: C/irc-manage.page:38(p) C/account-irc.page:39(p) +#: C/irc-manage.page:37(p) C/account-irc.page:39(p) msgid "" "You must have the telepathy-idle package installed to use IRC in " "Empathy." @@ -1556,23 +1497,23 @@ msgstr "" "Sie müssen das Paket telepathy-idle installiert haben, um das IRC " "in Empathy nutzen zu können." -#: C/irc-manage.page:42(link) +#: C/irc-manage.page:41(link) msgid "Install telepathy-idle" msgstr "telepathy-idle installieren" -#: C/irc-manage.page:49(title) +#: C/irc-manage.page:48(title) msgid "IRC Chat Rooms and Conversations" msgstr "IRC-Räume und Unterhaltungen" -#: C/irc-manage.page:51(title) +#: C/irc-manage.page:50(title) msgid "Chat Rooms and Conversations" msgstr "Unterhaltungsräume und Unterhaltungen" -#: C/irc-manage.page:56(title) +#: C/irc-manage.page:55(title) msgid "Common IRC Problems" msgstr "Häufige Probleme im IRC" -#: C/irc-manage.page:58(title) C/index.page:55(title) +#: C/irc-manage.page:57(title) C/index.page:55(title) msgid "Common Problems" msgstr "Häufig auftretende Probleme" @@ -2425,11 +2366,11 @@ msgstr "" "Empathy daran hindern, die Verbindung zu einem Konto automatisch " "herzustellen." -#: C/disable-account.page:39(title) +#: C/disable-account.page:40(title) msgid "Disable an account" msgstr "Deaktivieren eines Kontos" -#: C/disable-account.page:41(p) +#: C/disable-account.page:42(p) msgid "" "You can disable an account to prevent Empathy from logging in to " "it without removing the account entirely. You may wish to disable and re-" @@ -2442,7 +2383,7 @@ msgstr "" "nur zeitweise angemeldet sein wollen, aber Empathy noch für andere " "Konten nutzen wollen." -#: C/disable-account.page:52(p) +#: C/disable-account.page:53(p) msgid "" "Select the account you wish to disable from the accounts list on the left " "side of the window." @@ -2450,20 +2391,13 @@ msgstr "" "Wählen Sie das Konto, das Sie aus der Kontenliste entfernen wollen, an der " "linken Seite des Dialogs aus." -#: C/disable-account.page:56(p) -msgid "" -"Deselect Enabled on the right side of the " -"window." -msgstr "" -"Entfernen Sie die Markierung von Aktiviert an " -"der rechten Seite des Fensters." +#: C/disable-account.page:57(p) +msgid "On the right side of the window, switch it off." +msgstr "Schalten Sie es an der rechten Seite des Fensters aus." #: C/disable-account.page:62(p) -msgid "" -"To re-enable the account, simply select Enabled." -msgstr "" -"Um das Konto erneut zu aktivieren, wählen Sie Aktiviert." +msgid "To re-enable the account, switch it on." +msgstr "Um das Konto erneut zu aktivieren, schalten Sie es ein." #: C/create-account.page:9(desc) msgid "Register for an account with one of the supported messaging services." @@ -2688,11 +2622,11 @@ msgid "Change your status to advertise your availability to your contacts." msgstr "" "Ändern des Status, um Ihre Kontakte über Ihre Verfügbarkeit zu informieren." -#: C/change-status.page:34(title) +#: C/change-status.page:39(title) msgid "Change your status" msgstr "Ändern Ihres Status" -#: C/change-status.page:36(p) +#: C/change-status.page:41(p) msgid "" "You can set your status to indicate your availability to your contacts. " "Empathy allows you to select from a list of defined statuses." @@ -2701,29 +2635,29 @@ msgstr "" "anzuzeigen. Empathy ermöglicht Ihnen, aus einer Liste " "vordefinierter Status zu wählen." -#: C/change-status.page:41(p) +#: C/change-status.page:46(p) msgid "" "Click on the drop-down list at the top of the Contact List window." msgstr "" "Klicken Sie auf die Auswahlliste oben im Kontaktlisten-Fenster." -#: C/change-status.page:46(p) +#: C/change-status.page:51(p) msgid "Select a status from the list." msgstr "Wählen Sie einen Status in der Liste aus." -#: C/change-status.page:52(p) +#: C/change-status.page:57(p) msgid "" "See for a list of the built-in statuses and " -"what they mean. You can also add custom " +"what they mean. You can also add custom " "status messages to provide more information about your availability to " "your contacts." msgstr "" "In finden Sie eine Liste mitgelieferter Status " -"sowie deren Bedeutung. Sie können auch benutzerdefinierte Statusmeldungen hinzufügen, um für Ihre Kontakte " "weitere Informationen über Ihren Status bereitzustellen." -#: C/change-status.page:58(p) +#: C/change-status.page:63(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." @@ -3035,11 +2969,11 @@ msgstr "" msgid "Add a new account to Empathy." msgstr "Einen neuen Kontakt zu Empathy hinzufügen." -#: C/add-account.page:39(title) +#: C/add-account.page:40(title) msgid "Add a new account" msgstr "Hinzufügen eines neuen Kontos" -#: C/add-account.page:41(p) +#: C/add-account.page:42(p) msgid "" "You can add instant messaging accounts from any supported service to " "communicate with all of your contacts in Empathy. For some account " @@ -3052,11 +2986,11 @@ msgstr "" "eines neuen Kontos. Weitere Details hierzu finden Sie in ." -#: C/add-account.page:52(p) -msgid "Click Add." -msgstr "Klicken Sie auf Hinzufügen." +#: C/add-account.page:53(p) +msgid "Click +." +msgstr "Klicken Sie auf +." -#: C/add-account.page:57(p) +#: C/add-account.page:58(p) msgid "" "From the Protocol drop-down list, select the type of account you " "wish to add." @@ -3064,7 +2998,7 @@ msgstr "" "Aus der Protokoll-Aufklappliste wählen Sie den Kontentyp, welchen " "Sie hinzufügen wollen." -#: C/add-account.page:61(p) +#: C/add-account.page:62(p) msgid "" "If you do not already have a registered account, select Create a new " "account on the server. This feature is not available for all account " @@ -3077,22 +3011,18 @@ msgstr "" "Dienstanbietern. Weitere Informationen hierzu finden Sie in ." -#: C/add-account.page:66(p) +#: C/add-account.page:69(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 " -" for more information." +"for more information." msgstr "" "Geben Sie die benötigten Informationen ein. Für die meisten Konten wird die " "Eingabe einer Anmeldekennung und eines Passworts genügen. Einige Konten " "könnten zusätzliche Angaben erfordern. Weitere Informationen hierzu finden " "Sie in ." -#: C/add-account.page:71(p) -msgid "Click Log in." -msgstr "Klicken Sie auf Anmelden." - -#: C/add-account.page:78(p) +#: C/add-account.page:81(p) msgid "" "To change the name that identifies the account in the Accounts " "window, select the account from the list on the left and either click on the " @@ -3513,10 +3443,101 @@ msgstr "" #: C/index.page:0(None) msgid "translator-credits" msgstr "" -"Mario Blättermann , 2008, 2009, 2010, 2011\n" +"Mario Blättermann , 2008-2012\n" "Philipp Kerling , 2008\n" "Christian Kirbach , 2010." +#~ msgid "Edit, remove and add a custom message" +#~ msgstr "" +#~ "Bearbeiten, Entfernen und Hinzufügen einer benutzerdefinierten Nachricht" + +#~ msgid "" +#~ "To add a new custom message, from the Add New Preset section:" +#~ msgstr "" +#~ "So fügen Sie im Abschnitt Neue Voreinstellung hinzufügen eine " +#~ "neue benutzerdefinierte Nachricht hinzu:" + +#~ msgid "" +#~ "Click on the drop-down list to select the status you want to set a custom " +#~ "message to." +#~ msgstr "" +#~ "Klicken Sie auf die Auswahlliste, um den Status auszuwählen, dem Sie die " +#~ "benutzerdefinierte Nachricht zuordnen wollen." + +#~ msgid "Click on the text box, and type the new custom message." +#~ msgstr "" +#~ "Klicken Sie in das Textfeld und geben Sie die neue benutzerdefinierte " +#~ "Nachricht ein." + +#~ msgid "Click on Add to add the new message to the presets ones." +#~ msgstr "" +#~ "Klicken Sie auf Hinzufügen, um die neue Nachricht zu den " +#~ "voreingestellten Nachrichten hinzuzufügen." + +#~ msgid "Click on Remove." +#~ msgstr "Klicken Sie auf Entfernen." + +#~ msgid "" +#~ "Deselect the Enabled check-box next to the name of your " +#~ "account, and then select it again to try to reconnect to the service." +#~ msgstr "" +#~ "Deaktivieren Sie das Ankreuzfeld Aktiviert neben dem Namen " +#~ "Ihres Kontos und aktivieren Sie es erneut, um einen neuen " +#~ "Verbindungsversuch zu starten." + +#~ msgid "" +#~ "Check that the Enabled check-box is " +#~ "selected. If it is not, select the check-box to enable the account." +#~ msgstr "" +#~ "Stellen Sie sicher, dass das Ankreuzfeld Aktiviert neben dem Namen Ihres Kontos ausgewählt ist. Falls " +#~ "nicht, aktivieren Sie das Ankreuzfeld, um das Konto zu aktivieren." + +#~ msgid "" +#~ "Highlighting text is quirky: #593733. 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 "" +#~ "Highlighting text is quirky: #593733. 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." + +#~ msgid "Select the Search tab." +#~ msgstr "Wählen Sie den Reiter Suchen." + +#~ msgid "" +#~ "In the For field, type the text you want to search for. Click " +#~ "Find or press Enter." +#~ msgstr "" +#~ "Geben Sie in das Nach-Textfeld den Text ein, nach dem Sie " +#~ "suchen wollen. Klicken Sie auf Suchen oder drücken Sie die " +#~ "Eingabetaste." + +#~ msgid "" +#~ "Click on a conversation to view it. Empathy will select the " +#~ "text in the conversation that matched your search terms." +#~ msgstr "" +#~ "Klicken Sie auf eine Unterhaltung, um sie zu betrachten. Empathy hebt in der Unterhaltung den Text hervor, der Ihren Suchbegriffen " +#~ "entspricht." + +#~ msgid "Select the Conversations tab." +#~ msgstr "Wählen Sie den Reiter Unterhaltungen." + +#~ msgid "" +#~ "Deselect Enabled on the right side of the " +#~ "window." +#~ msgstr "" +#~ "Entfernen Sie die Markierung von Aktiviert " +#~ "an der rechten Seite des Fensters." + +#~ msgid "Click Log in." +#~ msgstr "Klicken Sie auf Anmelden." + #~ msgid "" #~ "In order to be able to share your desktop or to remotely use your contacts " #~ "desktop, it is necessary to have a remote desktop viewer application " diff --git a/help/es/es.po b/help/es/es.po index f35a961d..3257a789 100644 --- a/help/es/es.po +++ b/help/es/es.po @@ -1,24 +1,24 @@ # translation of empathy-help.master.po to Español -# Daniel Mustieles , 2011. # Jorge González , 2009, 2010, 2011. +# Daniel Mustieles , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: empathy-help.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-05 18:45+0000\n" -"PO-Revision-Date: 2011-09-05 23:28+0200\n" -"Last-Translator: Jorge González \n" -"Language-Team: Español; Castellano \n" +"POT-Creation-Date: 2012-01-20 18:47+0000\n" +"PO-Revision-Date: 2012-01-21 11:20+0100\n" +"Last-Translator: Daniel Mustieles \n" +"Language-Team: Español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. When image changes, this message will be marked fuzzy or untranslated for you. #. It doesn't matter what you translate it to: it's not used at all. -#: C/video-call.page:38(None) C/audio-video.page:70(None) +#: C/video-call.page:39(None) C/audio-video.page:70(None) #: C/audio-call.page:36(None) msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" msgstr "" @@ -28,15 +28,15 @@ msgstr "" 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:21(name) C/status-icons.page:16(name) +#: C/video-call.page:22(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/remove-account.page:19(name) C/prob-conn-neterror.page:19(name) +#: C/prob-conn-name.page:18(name) C/prob-conn-auth.page:21(name) +#: C/prob-conn-acctdisabled.page:19(name) C/prev-conv.page:17(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-manage.page:19(name) C/irc-join-room.page:16(name) #: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name) #: C/introduction.page:13(name) C/index.page:19(name) #: C/import-account.page:23(name) C/hide-contacts.page:11(name) @@ -44,21 +44,21 @@ msgstr "Iniciar una conversación de vídeo con uno de sus contactos." #: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name) #: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name) #: C/geolocation.page:17(name) C/favorite-rooms.page:14(name) -#: C/disable-account.page:20(name) C/create-account.page:19(name) +#: C/disable-account.page:21(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/add-account.page:21(name) msgid "Milo Casagrande" msgstr "Milo Casagrande" -#: C/video-call.page:22(email) C/status-icons.page:17(email) +#: C/video-call.page:23(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/remove-account.page:20(email) C/prob-conn-neterror.page:20(email) +#: C/prob-conn-name.page:19(email) C/prob-conn-auth.page:22(email) +#: C/prob-conn-acctdisabled.page:20(email) C/prev-conv.page:18(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-manage.page:20(email) C/irc-join-room.page:17(email) #: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email) #: C/introduction.page:14(email) C/index.page:20(email) #: C/import-account.page:24(email) C/hide-contacts.page:12(email) @@ -66,44 +66,44 @@ msgstr "Milo Casagrande" #: 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/favorite-rooms.page:15(email) C/disable-account.page:22(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) +#: C/audio-call.page:20(email) C/add-account.page:22(email) msgid "milo@ubuntu.com" msgstr "milo@ubuntu.com" -#: C/video-call.page:25(p) C/status-icons.page:24(p) +#: C/video-call.page:26(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/salut-protocol.page:22(p) C/remove-account.page:23(p) +#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:23(p) +#: C/prob-conn-name.page:22(p) C/prob-conn-auth.page:25(p) +#: C/prob-conn-acctdisabled.page:23(p) C/prev-conv.page:25(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-manage.page:23(p) C/irc-join-room.page:20(p) #: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p) #: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p) #: C/hide-contacts.page:15(p) C/group-conversations.page:23(p) #: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p) #: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p) #: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p) -#: C/favorite-rooms.page:18(p) C/disable-account.page:28(p) -#: C/create-account.page:23(p) C/change-status.page:23(p) +#: C/favorite-rooms.page:18(p) C/disable-account.page:29(p) +#: C/create-account.page:23(p) C/change-status.page:28(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/add-account.page:29(p) C/accounts-window.page:22(p) #: C/account-jabber.page:18(p) C/account-irc.page:20(p) msgid "Creative Commons Share Alike 3.0" msgstr "Creative Commons Compartir Igual 3.0" -#: C/video-call.page:28(title) +#: C/video-call.page:29(title) msgid "Start a video conversation" msgstr "Comenzar una conversación de vídeo" -#: C/video-call.page:30(p) +#: C/video-call.page:31(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 " +"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 "" @@ -112,7 +112,7 @@ msgstr "" "cuentas y requiere que la otra persona tenga una aplicación que soporte " "llamadas de vídeo." -#: C/video-call.page:37(p) +#: C/video-call.page:38(p) msgid "" "From the Contact List window, click the video call icon " @@ -124,7 +124,7 @@ msgstr "" "media> junto al nombre del contacto al que desea llamar y seleccione Llamada de vídeo." -#: C/video-call.page:43(p) C/audio-call.page:42(p) +#: C/video-call.page:44(p) C/audio-call.page:42(p) msgid "" "A new window will open. When the connection is established, you will see " "Connected at the bottom of the window, along with the total " @@ -134,12 +134,12 @@ msgstr "" "en la parte inferior de la ventana, Connectado y el tiempo total " "de conversación." -#: C/video-call.page:48(p) C/audio-call.page:48(p) +#: C/video-call.page:49(p) C/audio-call.page:48(p) msgid "To end the conversation, click on Hang up." msgstr "" "Para finalizar una conversación pulse Colgar." -#: C/video-call.page:54(p) +#: C/video-call.page:55(p) msgid "" "To turn a video conversation into an audio conversation, choose VideoVideo Off." @@ -148,18 +148,18 @@ msgstr "" "VídeoVídeo " "apagado." -#: C/video-call.page:60(title) +#: C/video-call.page:61(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:63(p) C/send-message.page:53(p) C/audio-call.page:66(p) +#: C/video-call.page:64(p) C/send-message.page:53(p) C/audio-call.page:66(p) msgid "" "From the Contact List window, right-click on the meta-contact." msgstr "" "Desde la ventana Lista de contactos, pulse con el botón derecho " "sobre el metacontacto." -#: C/video-call.page:68(p) +#: C/video-call.page:69(p) msgid "" "Select the contact you want to have the conversation, and from the menu " "select Video Call." @@ -167,7 +167,7 @@ msgstr "" "Seleccione el contacto con el que quiere tener la conversación y, del menú, " "seleccione Llamada de vídeo." -#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p) +#: C/video-call.page:76(p) C/send-message.page:65(p) C/audio-call.page:78(p) msgid "" "To recognize if a contact is a meta-contact, move your mouse on a " "contact in the Contact List window, and stop over it for a " @@ -208,17 +208,17 @@ msgid "Understanding the various statuses and status icons." msgstr "Entender los diversos estados e iconos de estado." #: 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/prev-conv.page:21(name) C/import-account.page:27(name) +#: C/disable-account.page:25(name) C/audio-video.page:109(cite) +#: C/audio-video.page:117(cite) C/add-account.page:25(name) +#: C/accounts-window.page:18(name) C/account-jabber.page:14(name) +#: C/account-irc.page:16(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/status-icons.page:21(email) C/prev-conv.page:22(email) +#: C/import-account.page:28(email) C/disable-account.page:26(email) +#: C/add-account.page:26(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" @@ -320,7 +320,6 @@ msgstr "" "cuentas." #: C/share-desktop.page:7(desc) -#| msgid "Share the desktop with your contacts." msgid "Show your desktop to your contacts." msgstr "Mostrar su escritorio a sus contactos." @@ -337,11 +336,6 @@ msgid "Share your desktop" msgstr "Compartir su escritorio" #: C/share-desktop.page:35(p) -#| msgid "" -#| "It is possible, with some of your contacts, to share your desktop with " -#| "them, or to start using your contacts desktop. You can use this " -#| "functionality to show your desktop to your contacts, to ask for help or " -#| "to help your contacts resolve a problem." 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, " @@ -362,18 +356,12 @@ msgstr "" "servidor VNC de GNOME, tiene el soporte necesario." #: C/share-desktop.page:51(p) -#| msgid "" -#| "From the Contact List window, perform one of the following:" msgid "From the Contact List window, do one of the following:" msgstr "" "En la ventana de la Lista de contactos realice una de las " "siguientes:" #: C/share-desktop.page:56(p) -#| msgid "" -#| "Select the contact you want to share your desktop with, and choose " -#| "EditContactShare my desktop." msgid "" "Select the contact you want to share your desktop with and choose " "EditContactShare My Desktop." #: C/share-desktop.page:63(p) -#| msgid "" -#| "Right-click on the name of the contact you want to share your desktop " -#| "with, and select Share my desktop." msgid "" "Right-click on the name of the contact you want to share your desktop with " "and select Share My Desktop." @@ -412,9 +397,6 @@ msgstr "" "compartición de escritorio." #: C/share-desktop.page:82(p) -#| msgid "" -#| "For more information about how to use the remote desktop viewer " -#| "application, refer to its help." msgid "" "For more information about how to use the remote desktop sharing " "application, refer to its help." @@ -431,10 +413,6 @@ msgstr "" "ralentización del rendimiento del sistema y una baja velocidad de Internet." #: C/share-desktop.page:96(p) -#| msgid "" -#| "Not all your contacts might be able to support this functionality. It is " -#| "necessary for them to have at least the 2.28 version of Empathy and a remote desktop viewer application installed in their system." 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 Empathy and a " @@ -503,14 +481,18 @@ msgstr "" "de la ventana y pulse Intro para establecer el mensaje." #: 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." 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 " +"use it again, click on the little heart on the right of the text box where " "you wrote your custom message." msgstr "" "Si quiere establecer el mensaje personalizado como un favorito, guardándolo " -"para usarlo de nuevo, pulse en la pequeña estrella a la derecha de la caja " -"de texto donde escribió su mensaje personalizado." +"para usarlo de nuevo, pulse en el pequeño corazón a la derecha de la caja de " +"texto donde escribió su mensaje personalizado." #: C/set-custom-status.page:69(p) msgid "" @@ -521,8 +503,9 @@ msgstr "" "que use Empathy. Sólo se guardará durante la sesión actual." #: C/set-custom-status.page:78(title) -msgid "Edit, remove and add a custom message" -msgstr "Editar, quitar y añadir un mensaje personalizado" +#| msgid "To remove a custom message:" +msgid "Edit and remove a custom message" +msgstr "Editar y quitar un mensaje personalizado" #: C/set-custom-status.page:88(p) msgid "Select Edit Custom Message." @@ -562,58 +545,38 @@ msgstr "" msgid "Click on the Remove button." msgstr "Pulse el botón Quitar." -#: C/set-custom-status.page:131(p) -msgid "" -"To add a new custom message, from the Add New Preset section:" -msgstr "" -"Para añadir un mensaje personalizado nuevo, desde la sección Añadir " -"estado guardado " - -#: C/set-custom-status.page:136(p) -msgid "" -"Click on the drop-down list to select the status you want to set a custom " -"message to." -msgstr "" -"Pulse en la lista desplegable para seleccionar el estado en el que quiere " -"establecer un mensaje personalizado." - -#: C/set-custom-status.page:142(p) -msgid "Click on the text box, and type the new custom message." -msgstr "Pulse en la caja de texto y escriba el mensaje personalizado nuevo." - -#: C/set-custom-status.page:147(p) -msgid "Click on Add to add the new message to the presets ones." -msgstr "Pulse Añadir para añadir un mensaje nuevo a los guardados." - -#: C/set-custom-status.page:156(p) +#: C/set-custom-status.page:133(p) msgid "When finished, click on Close." msgstr "Cuando haya terminado pulse Cerrar." -#: C/set-custom-status.page:163(p) +#: C/set-custom-status.page:140(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 Contact " +#| "List window." 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 Contact List " -"window." +"When you edit a custom message, it will not be set as the current status " +"message. You will need to select it from the Contact List window." msgstr "" -"Cuando edita o añade un mensaje personalizado nuevo no se establece como el " -"mensaje de estado actual. Tiene que seleccionarlo en la ventana de " -"Lista de contactos." +"Cuando edita un mensaje personalizado nuevo no se establece como el mensaje " +"de estado actual. Deberá seleccionarlo en la ventana de Lista de " +"contactos." #: C/send-message.page:8(desc) msgid "Send a message to one of your contacts." msgstr "Enviar un mensaje a uno de sus contactos." #: 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) +#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:15(name) +#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:15(name) +#: C/change-status.page:24(name) C/add-contact.page:18(name) msgid "Phil Bull" msgstr "Phil Bull" #: 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) +#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:16(email) +#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:16(email) +#: C/change-status.page:25(email) C/add-contact.page:19(email) msgid "philbull@gmail.com" msgstr "philbull@gmail.com" @@ -782,11 +745,11 @@ msgstr "" msgid "Completely remove an account from Empathy." msgstr "Quitar completamente una cuenta en Empathy." -#: C/remove-account.page:33(title) +#: C/remove-account.page:34(title) msgid "Remove an account" msgstr "Quitar una cuenta" -#: C/remove-account.page:35(p) +#: C/remove-account.page:36(p) msgid "" "You can completely remove an account from Empathy if you no " "longer wish to use the account. If you wish to use the account in " @@ -797,8 +760,8 @@ msgstr "" "seguir usándola. Si quiere usar de nuevo la cuenta en Empathy en " "el futuro, deberá añadir los detalles de la cuenta de nuevo." -#: 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/remove-account.page:43(p) C/irc-nick-password.page:50(p) +#: C/disable-account.page:49(p) C/add-account.page:49(p) msgid "" "From the Contact List window, choose EditAccounts, or press F4." @@ -806,7 +769,7 @@ msgstr "" "Desde la ventana Lista de contactos elija EditarCuentas o pulse F4." -#: C/remove-account.page:46(p) +#: C/remove-account.page:47(p) msgid "" "Select the account you wish to remove from the accounts list on the left " "side of the window." @@ -814,11 +777,11 @@ msgstr "" "Seleccione la cuenta que quiere quitar de la lista de cuentas en la parte " "izquierda de la ventana." -#: C/remove-account.page:50(p) -msgid "Click on Remove." -msgstr "Pulse Quitar." +#: C/remove-account.page:51(p) +msgid "Click -." +msgstr "Pulse -." -#: C/remove-account.page:53(p) +#: C/remove-account.page:54(p) msgid "" "A dialog will be shown asking for confirmation. Click the Remove " "button to permanently remove the account." @@ -826,7 +789,7 @@ msgstr "" "Se mostrará un diálogo preguntando por una confirmación. Pulse el botón " "Quitar para quitar la cuenta permanentemente." -#: C/remove-account.page:59(p) +#: C/remove-account.page:60(p) msgid "" "Even after removing an account, Empathy does not delete your " "conversation history for that account." @@ -846,7 +809,7 @@ msgstr "Problemas al conectarse a un servicio de mensajería instantánea" #. 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-neterror.page:59(None) C/prob-conn-name.page:44(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" @@ -859,15 +822,15 @@ msgstr "" "Aparecerá el mensaje de error «Error de red» en la ventana " "principal." -#: C/prob-conn-neterror.page:33(title) +#: C/prob-conn-neterror.page:34(title) msgid "I get a message that says “Network error”" msgstr "Obtengo un mensaje que muestra «Error de red»" -#: C/prob-conn-neterror.page:36(cite) +#: C/prob-conn-neterror.page:37(cite) msgid "shaunm" msgstr "shaunm" -#: C/prob-conn-neterror.page:37(p) +#: C/prob-conn-neterror.page:38(p) msgid "" "Empathy no longer allows you to create an IRC account without a valid nick. " "I've removed the guide link. Remove the text." @@ -875,7 +838,7 @@ msgstr "" "Empathy ya no le permite crear una cuenta de IRC sin un apodo válido. Se ha " "quitado el enlace de guía. Quitar el texto." -#: C/prob-conn-neterror.page:41(p) +#: C/prob-conn-neterror.page:42(p) msgid "" "This kind of error happens when Empathy cannot communicate with " "the instant messaging service for some reason." @@ -883,7 +846,7 @@ msgstr "" "Este tipo de mensaje sucede cuando Empathy no se puede comunicar " "con el servicio de mensajería instantánea por alguna razón." -#: C/prob-conn-neterror.page:45(p) +#: C/prob-conn-neterror.page:46(p) msgid "" "Also, this kind of error happens when you try to use an IRC account without " "setting a nickname." @@ -891,13 +854,13 @@ msgstr "" "Este tipo de error también sucede cuando intenta usar una cuenta de IRC sin " "haber configurado el apodo." -#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p) -#: C/prob-conn-acctdisabled.page:43(p) +#: C/prob-conn-neterror.page:53(p) C/prob-conn-auth.page:45(p) +#: C/prob-conn-acctdisabled.page:44(p) msgid "" "Make sure that you are connected to the Internet, or to a local area network." msgstr "Asegúrese de que está conectado a Internet o a una red de área local." -#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p) +#: C/prob-conn-neterror.page:58(p) C/prob-conn-name.page:43(p) #: C/prob-conn-auth.page:57(p) msgid "" "Click the Editar en el mensaje de error." -#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p) +#: C/prob-conn-neterror.page:64(p) C/prob-conn-acctdisabled.page:60(p) msgid "" "Check in the Advanced section that all the details are correct. " "You should be able to find these details from the website of the messaging " @@ -916,19 +879,18 @@ msgstr "" "correctos. Debería poder encontrar estos detalles en la página web del " "servicio de mensajería." -#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p) +#: C/prob-conn-neterror.page:79(p) C/prob-conn-name.page:65(p) msgid "" -"Deselect the Enabled, and then select it again to try to " -"reconnect to the service." +"Switch the account off, and then switch it on to try to reconnect to the " +"service." msgstr "" -"Deseleccione la casilla de verificación Activada y después " -"selecciónela de nuevo para intentar reconectar con el servicio." +"Salga de la cuenta y vuelva a entrar para volver a conectarse al servicio." -#: C/prob-conn-neterror.page:90(title) +#: C/prob-conn-neterror.page:87(title) msgid "Proxy support" msgstr "Soporte de proxy" -#: C/prob-conn-neterror.page:91(p) +#: C/prob-conn-neterror.page:88(p) msgid "" "At the moment Empathy can not be configured to work with a proxy." msgstr "" @@ -947,11 +909,11 @@ msgstr "" "Aparecen en la ventana principal un mensaje de error que dice «Nombre " "en uso»." -#: C/prob-conn-name.page:32(title) +#: C/prob-conn-name.page:33(title) msgid "I get a message that says “Name in use”" msgstr "Obtengo un mensaje de error que muestra «Nombre en uso»" -#: C/prob-conn-name.page:34(p) +#: C/prob-conn-name.page:35(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 " @@ -961,11 +923,11 @@ msgstr "" "está usando un apodo que ya está usando otra persona en esa red en " "particular." -#: C/prob-conn-name.page:50(p) +#: C/prob-conn-name.page:51(p) msgid "In the Nickname text box, type a new nickname." msgstr "En la caja de texto Apodo escriba un apodo nuevo." -#: C/prob-conn-name.page:55(p) +#: C/prob-conn-name.page:56(p) msgid "" "If you have registered that nickname within the network you are using, set " "the password for that nickname. For more information, see ." -#: C/prob-conn-name.page:64(p) -msgid "" -"Deselect the Enabled check-box next to the name of your account, " -"and then select it again to try to reconnect to the service." -msgstr "" -"Deseleccione la casilla de verificación Activada junto al nombre " -"de su cuenta y después selecciónela de nuevo para intentar reconectar con el " -"servicio." - #: C/prob-conn-auth.page:8(desc) msgid "" "An error message which says “Authentication failed” appears in " @@ -1016,13 +969,21 @@ msgstr "" "intentando conectarse. Si no tiene una cuenta la mayoría de los servicios no " "le permitirán que se conecte." -#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p) +#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:55(p) msgid "" "Type your username and password again to make sure that they are correct." msgstr "" "Escriba su nombre de usuario y contraseña de nuevo y asegúrese de que son " "correctos." +#: C/prob-conn-auth.page:68(p) +msgid "" +"Deselect the Enabled, and then select it again to try to " +"reconnect to the service." +msgstr "" +"Deseleccione la casilla de verificación Activada y después " +"selecciónela de nuevo para intentar reconectar con el servicio." + #: C/prob-conn-acctdisabled.page:7(desc) msgid "" "The instant messaging account that you want to use is not enabled in the " @@ -1031,11 +992,11 @@ msgstr "" "La cuenta de mensajería instantánea que quiere usar no está activada en la " "lista de cuentas." -#: C/prob-conn-acctdisabled.page:33(title) +#: C/prob-conn-acctdisabled.page:34(title) msgid "My account is not enabled" msgstr "Mi cuenta no está activada" -#: C/prob-conn-acctdisabled.page:35(p) +#: C/prob-conn-acctdisabled.page:36(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 " @@ -1046,7 +1007,7 @@ msgstr "" "nueva o unirse a una charla, puede que los detalles de su cuenta no sean " "correctos." -#: C/prob-conn-acctdisabled.page:48(p) +#: C/prob-conn-acctdisabled.page:49(p) msgid "" "Choose EditAccounts and select the " "account that is not working." @@ -1054,38 +1015,19 @@ msgstr "" "Elija EditarCuentas y seleccione la " "cuenta que no está funcionando." -#: C/prob-conn-acctdisabled.page:65(p) -msgid "" -"Check that the Enabled check-box is selected. " -"If it is not, select the check-box to enable the account." -msgstr "" -"Compruebe que la casilla de verificación Activada está seleccionada. Si no lo está, marque la casilla de verificación " -"para activar la cuenta." +#: C/prob-conn-acctdisabled.page:66(p) +msgid "Check that the account is switched on." +msgstr "Compruebe que la cuenta está activada" #: C/prev-conv.page:8(desc) msgid "Browse or search your previous conversations." msgstr "Examinar o buscar en sus conversaciones anteriores" -#: C/prev-conv.page:35(title) +#: C/prev-conv.page:36(title) msgid "View previous conversations" msgstr "Ver conversaciones anteriores" -#: C/prev-conv.page:39(p) -msgid "" -"Highlighting text is quirky: #593733. 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 "" -"Resaltar texto es extraño: #593733. Si existe un resaltado actualmente, " -"independiente de la selección (en amarillo, por ejemplo), se puede usar el " -"término «resaltar». De otra forma se debe usar el término «seleccionado». " -"Siga el progreso del error." - -#: C/prev-conv.page:46(p) +#: C/prev-conv.page:38(p) msgid "" "Empathy automatically saves all your text conversations you have " "with your contacts. You can search through all of " @@ -1097,7 +1039,7 @@ msgstr "" "todas sus conversaciones anteriores o buscar " "conversación anteriores por contacto y fecha." -#: C/prev-conv.page:54(p) +#: C/prev-conv.page:46(p) msgid "" "You do not need to be connected to the Internet to view and search your " "previous conversations." @@ -1105,11 +1047,11 @@ msgstr "" "No necesita estar conectado a Internet para ver y buscar en sus " "conversaciones anteriores." -#: C/prev-conv.page:61(title) +#: C/prev-conv.page:53(title) msgid "Search previous conversations" msgstr "Buscar conversaciones anteriores" -#: C/prev-conv.page:63(p) +#: C/prev-conv.page:55(p) msgid "" "You can perform a full-text search through all of your previous " "conversations." @@ -1117,7 +1059,7 @@ msgstr "" "Puede realizar una búsqueda de texto completo sobre todas sus conversaciones " "anteriores." -#: C/prev-conv.page:67(p) C/prev-conv.page:96(p) +#: C/prev-conv.page:59(p) C/prev-conv.page:87(p) msgid "" "From the Contact List window, choose ViewPrevious Conversations. Alternatively, press " @@ -1127,40 +1069,33 @@ msgstr "" "gui>Conversaciones anteriores. Alternativamente, pulse " "F3." -#: C/prev-conv.page:71(p) -msgid "Select the Search tab." -msgstr "Seleccione la pestaña Buscar." - -#: C/prev-conv.page:74(p) +#: C/prev-conv.page:63(p) msgid "" -"In the For field, type the text you want to search for. Click " -"Find or press Enter." +"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 "" -"En el campo Para escriba el texto que quiere buscar. Pulse " -"Buscar o pulse Intro." +"Seleccione una cuenta de la lista desplegable en la parte superior. Para esa " +"cuenta se mostrará debajo una lista de contactos y una sala de chat." -#: C/prev-conv.page:78(p) +#: C/prev-conv.page:67(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." +"Type the text you want to search for in the Search text field." msgstr "" -"Se mostrará en la lista bajo el campo de búsqueda cualquier conversación que " -"coincida con sus términos de búsqueda. Las conversaciones se ordenan por " -"fecha de forma predeterminada." +"Escriba el texto que quiere buscar en el cuadro de texto Buscar" -#: C/prev-conv.page:82(p) +#: C/prev-conv.page:71(p) msgid "" -"Click on a conversation to view it. Empathy will select the text " -"in the conversation that matched your search terms." +"Any conversations that matched your search terms will be shown. By default, " +"conversations are ordered by date." msgstr "" -"Pulse sobre una conversación para verla. Empathy seleccionará el " -"texto en la conversación que coincida con sus términos de búsqueda." +"Se mostrará cualquier conversación que coincida con sus términos de " +"búsqueda. Las conversaciones se ordenan por fecha de forma predeterminada." -#: C/prev-conv.page:89(title) +#: C/prev-conv.page:80(title) msgid "Browse previous conversations" msgstr "Examinar conversaciones anteriores" -#: C/prev-conv.page:91(p) +#: C/prev-conv.page:82(p) msgid "" "You can browse your previous conversations with your contacts or in chat " "rooms by date." @@ -1168,11 +1103,7 @@ msgstr "" "Puede examinar por fecha las conversaciones anteriores con sus contactos o " "en salas de chat." -#: C/prev-conv.page:100(p) -msgid "Select the Conversations tab." -msgstr "Seleccione la pestaña Conversaciones." - -#: C/prev-conv.page:103(p) +#: C/prev-conv.page:91(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." @@ -1181,7 +1112,7 @@ msgstr "" "izquierda. Para esa cuenta se mostrará debajo una lista de contactos y una " "sala de chat." -#: C/prev-conv.page:107(p) +#: C/prev-conv.page:95(p) msgid "" "Select a contact or chat room to view your previous conversations from. By " "default the most recent conversation will be shown." @@ -1189,7 +1120,7 @@ msgstr "" "Para ver sus conversaciones anteriores, seleccione un contacto o una sala de " "chat. De forma predeterminada se muestra la conversación más reciente." -#: C/prev-conv.page:111(p) +#: C/prev-conv.page:99(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 " @@ -1201,26 +1132,27 @@ msgstr "" "sobre una fecha para seleccionarla. Pulse las fechas junto al mes y año para " "examinar fechas anteriores." -#: C/prev-conv.page:117(p) +#: C/prev-conv.page:105(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." +"You can search for text in the conversations by typing into the search field " +"at the top. The matching conversations will be showed." msgstr "" "Puede buscar texto en las conversaciones mostradas escribiéndolo en el campo " -"de búsqueda en la parte superior. Se resaltará el texto coincidente." +"de búsqueda en la parte superior. Se resaltarán las conversaciones " +"coincidentes." -#: C/prev-conv.page:121(p) +#: C/prev-conv.page:111(p) msgid "" "You can quickly view the previous conversations with one of your contacts " "from the Contact List window. Simply right click the contact and " -"choose View Previous Conversations. The Previous " -"Conversations window will open with that contact already selected." +"choose Previous Conversations. The Previous Conversations window will open with that contact already selected." msgstr "" "Puede ver rápidamente las conversaciones anteriores con uno de sus contactos " "desde la ventana Lista de contactos. Simplemente pulse con el " "botón derecho del ratón sobre el contacto y seleccione Conversaciones " -"anteriores. Se abrirá la ventana Ver conversaciones previas " -"con el contacto seleccionado." +"anteriores. Se abrirá la ventana Conversaciones previas con " +"el contacto seleccionado." #: C/link-contacts.page:11(desc) msgid "Merge and separate different contacts into a single one." @@ -1516,6 +1448,7 @@ msgstr "" "usar para registrar su apodo." #: C/irc-nick-password.page:63(p) C/import-account.page:61(p) +#: C/add-account.page:74(p) msgid "Click Apply." msgstr "Pulse Aplicar." @@ -1529,15 +1462,15 @@ msgstr "" "en ciertas redes de IRC. Actualmente no es posible registrar un apodo IRC o " "cambiar la contraseña de su apodo con Empathy." -#: C/irc-manage.page:10(desc) +#: C/irc-manage.page:9(desc) msgid "How to use IRC with Empathy." msgstr "Cómo usar el IRC con Empathy." -#: C/irc-manage.page:35(title) +#: C/irc-manage.page:34(title) msgid "Internet Relay Chat (IRC)" msgstr "Internet Relay Chat (IRC)" -#: C/irc-manage.page:38(p) C/account-irc.page:39(p) +#: C/irc-manage.page:37(p) C/account-irc.page:39(p) msgid "" "You must have the telepathy-idle package installed to use IRC in " "Empathy." @@ -1545,23 +1478,23 @@ msgstr "" "Debe tener instalado el paquete telepathy-idle para poder usar el " "IRC en Empathy." -#: C/irc-manage.page:42(link) +#: C/irc-manage.page:41(link) msgid "Install telepathy-idle" msgstr "Instale telepathy-idle" -#: C/irc-manage.page:49(title) +#: C/irc-manage.page:48(title) msgid "IRC Chat Rooms and Conversations" msgstr "Salas de chat y conversaciones en el IRC" -#: C/irc-manage.page:51(title) +#: C/irc-manage.page:50(title) msgid "Chat Rooms and Conversations" msgstr "Salas de chat y conversaciones" -#: C/irc-manage.page:56(title) +#: C/irc-manage.page:55(title) msgid "Common IRC Problems" msgstr "Problemas comunes en el IRC" -#: C/irc-manage.page:58(title) C/index.page:55(title) +#: C/irc-manage.page:57(title) C/index.page:55(title) msgid "Common Problems" msgstr "Problemas comunes" @@ -2413,11 +2346,11 @@ msgid "Prevent Empathy from automatically logging in to an account." msgstr "" "Evitar que Empathy inicie sesión automáticamente en una cuenta." -#: C/disable-account.page:39(title) +#: C/disable-account.page:40(title) msgid "Disable an account" msgstr "Desactivar una cuenta" -#: C/disable-account.page:41(p) +#: C/disable-account.page:42(p) msgid "" "You can disable an account to prevent Empathy from logging in to " "it without removing the account entirely. You may wish to disable and re-" @@ -2430,7 +2363,7 @@ msgstr "" "cuenta de vez en cuando, pero sigue queriendo usar Empathy para " "otras cuentas." -#: C/disable-account.page:52(p) +#: C/disable-account.page:53(p) msgid "" "Select the account you wish to disable from the accounts list on the left " "side of the window." @@ -2438,21 +2371,13 @@ msgstr "" "Seleccione la cuenta que quiere desactivar desde la lista de cuentas en la " "parte izquierda de la ventana." -#: C/disable-account.page:56(p) -msgid "" -"Deselect Enabled on the right side of the " -"window." -msgstr "" -"Deseleccione Activada en la parte derecha de " -"la ventana." +#: C/disable-account.page:57(p) +msgid "On the right side of the window, switch it off." +msgstr "Desactívela en la parte derecha de la ventana," #: C/disable-account.page:62(p) -msgid "" -"To re-enable the account, simply select Enabled." -msgstr "" -"Para reactivar la cuenta simplemente seleccione Activada." +msgid "To re-enable the account, switch it on." +msgstr "Para reactivar la cuenta, actívela." #: C/create-account.page:9(desc) msgid "Register for an account with one of the supported messaging services." @@ -2673,11 +2598,11 @@ msgstr "Yahoo!" msgid "Change your status to advertise your availability to your contacts." msgstr "Cambie su estado para avisar de su disponibilidad a sus contactos." -#: C/change-status.page:34(title) +#: C/change-status.page:39(title) msgid "Change your status" msgstr "Cambiar su estado" -#: C/change-status.page:36(p) +#: C/change-status.page:41(p) msgid "" "You can set your status to indicate your availability to your contacts. " "Empathy allows you to select from a list of defined statuses." @@ -2685,30 +2610,30 @@ msgstr "" "Puede establecer su estado para indicar su disponibilidad a sus contactos. " "Empathy le permite seleccionar una lista de estados predefinidos." -#: C/change-status.page:41(p) +#: C/change-status.page:46(p) msgid "" "Click on the drop-down list at the top of the Contact List window." msgstr "" "Pulse en la lista desplegable en la parte superior de la ventana de la " "Lista de contactos." -#: C/change-status.page:46(p) +#: C/change-status.page:51(p) msgid "Select a status from the list." msgstr "Seleccione un estado de la lista." -#: C/change-status.page:52(p) +#: C/change-status.page:57(p) msgid "" "See for a list of the built-in statuses and " -"what they mean. You can also add custom " +"what they mean. You can also add custom " "status messages to provide more information about your availability " "to your contacts." msgstr "" "Consulte la para obtener una lista de los " "estados predefinidos y lo que significan. También puede añadir mensajes de estado personalizados para " +"custom-status\">añadir mensajes de estado personalizados para " "proporcionar a sus contactos más información acerca de su disponibilidad." -#: C/change-status.page:58(p) +#: C/change-status.page:63(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." @@ -3018,11 +2943,11 @@ msgstr "" msgid "Add a new account to Empathy." msgstr "Añadir una cuenta nueva en Empathy." -#: C/add-account.page:39(title) +#: C/add-account.page:40(title) msgid "Add a new account" msgstr "Añadir una cuenta nueva" -#: C/add-account.page:41(p) +#: C/add-account.page:42(p) msgid "" "You can add instant messaging accounts from any supported service to " "communicate with all of your contacts in Empathy. For some " @@ -3035,11 +2960,11 @@ msgstr "" "cuenta nueva. Para obtener más detalles consulte la ." -#: C/add-account.page:52(p) -msgid "Click Add." -msgstr "Pulse Añadir." +#: C/add-account.page:53(p) +msgid "Click +." +msgstr "Pulse +." -#: C/add-account.page:57(p) +#: C/add-account.page:58(p) msgid "" "From the Protocol drop-down list, select the type of account you " "wish to add." @@ -3047,7 +2972,7 @@ msgstr "" "Desde la lista desplegable Protocolo seleccione el tipo de cuenta " "que quiere añadir." -#: C/add-account.page:61(p) +#: C/add-account.page:62(p) msgid "" "If you do not already have a registered account, select Create a new " "account on the server. This feature is not available for all account " @@ -3059,22 +2984,18 @@ msgstr "" "tipos de cuentas y puede no funcionar con algunos proveedores de cuentas. " "Para obtener más información consulte la ." -#: C/add-account.page:66(p) +#: C/add-account.page:69(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 for more information." +"See for more information." msgstr "" "Introduzca la información requerida. Para la mayoría de cuentas sólo " "necesitará un ID de inicio de sesión y una contraseña. Algunas cuentas " "pueden requerir información adicional. Para obtener más información consulte " "la ." -#: C/add-account.page:71(p) -msgid "Click Log in." -msgstr "Pulse Iniciar sesión." - -#: C/add-account.page:78(p) +#: C/add-account.page:81(p) msgid "" "To change the name that identifies the account in the Accounts " "window, select the account from the list on the left and either click on the " @@ -3486,6 +3407,91 @@ msgstr "" msgid "translator-credits" msgstr "Jorge González , 2008-2010" +#~ msgid "Edit, remove and add a custom message" +#~ msgstr "Editar, quitar y añadir un mensaje personalizado" + +#~ msgid "" +#~ "To add a new custom message, from the Add New Preset section:" +#~ msgstr "" +#~ "Para añadir un mensaje personalizado nuevo, desde la sección Añadir " +#~ "estado guardado " + +#~ msgid "" +#~ "Click on the drop-down list to select the status you want to set a custom " +#~ "message to." +#~ msgstr "" +#~ "Pulse en la lista desplegable para seleccionar el estado en el que quiere " +#~ "establecer un mensaje personalizado." + +#~ msgid "Click on the text box, and type the new custom message." +#~ msgstr "Pulse en la caja de texto y escriba el mensaje personalizado nuevo." + +#~ msgid "Click on Add to add the new message to the presets ones." +#~ msgstr "" +#~ "Pulse Añadir para añadir un mensaje nuevo a los guardados." + +#~ msgid "Click on Remove." +#~ msgstr "Pulse Quitar." + +#~ msgid "" +#~ "Highlighting text is quirky: #593733. 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 "" +#~ "Resaltar texto es extraño: #593733. Si existe un resaltado " +#~ "actualmente, independiente de la selección (en amarillo, por ejemplo), se " +#~ "puede usar el término «resaltar». De otra forma se debe usar el término " +#~ "«seleccionado». Siga el progreso del error." + +#~ msgid "Select the Search tab." +#~ msgstr "Seleccione la pestaña Buscar." + +#~ msgid "" +#~ "In the For field, type the text you want to search for. Click " +#~ "Find or press Enter." +#~ msgstr "" +#~ "En el campo Para escriba el texto que quiere buscar. Pulse " +#~ "Buscar o pulse Intro." + +#~ msgid "" +#~ "Click on a conversation to view it. Empathy will select the " +#~ "text in the conversation that matched your search terms." +#~ msgstr "" +#~ "Pulse sobre una conversación para verla. Empathy seleccionará " +#~ "el texto en la conversación que coincida con sus términos de búsqueda." + +#~ msgid "Select the Conversations tab." +#~ msgstr "Seleccione la pestaña Conversaciones." + +#~ msgid "Click Log in." +#~ msgstr "Pulse Iniciar sesión." + +#~ msgid "" +#~ "Deselect the Enabled check-box next to the name of your " +#~ "account, and then select it again to try to reconnect to the service." +#~ msgstr "" +#~ "Deseleccione la casilla de verificación Activada junto al " +#~ "nombre de su cuenta y después selecciónela de nuevo para intentar " +#~ "reconectar con el servicio." + +#~ msgid "" +#~ "Check that the Enabled check-box is " +#~ "selected. If it is not, select the check-box to enable the account." +#~ msgstr "" +#~ "Compruebe que la casilla de verificación Activada está seleccionada. Si no lo está, marque la casilla de " +#~ "verificación para activar la cuenta." + +#~ msgid "" +#~ "Deselect Enabled on the right side of the " +#~ "window." +#~ msgstr "" +#~ "Deseleccione Activada en la parte derecha " +#~ "de la ventana." + #~ msgid "" #~ "In order to be able to share your desktop or to remotely use your " #~ "contacts desktop, it is necessary to have a remote desktop viewer " diff --git a/help/fr/fr.po b/help/fr/fr.po index c2b331c7..b5a54d6a 100644 --- a/help/fr/fr.po +++ b/help/fr/fr.po @@ -1,3530 +1,896 @@ -# French translation of empathy documentation. +# French translation of cheese documentation. # Copyright (C) 2008-2011 Free Software Foundation, Inc. -# This file is distributed under the same license as the empathy +# This file is distributed under the same license as the cheese # documentation package. # -# Marc Veillet , 2008. -# Bruno Brouard , 2008, 2011. -# Claude Paroz , 2008, 2010. -# Frédéric Peters , 2009. +# Bruno Brouard , 2008-2011 +# Claude Paroz , 2008-2010 +# Yannick Tailliez , 2008. +# Laurent Coudeur , 2009. +# Baptiste Mille-Matthias , 2009 (figures) +# Luc Pionchon , 2011 +# Luc Guillemin , 2011 # msgid "" msgstr "" -"Project-Id-Version: empathy help fr\n" -"POT-Creation-Date: 2011-10-01 17:42+0000\n" -"PO-Revision-Date: 2011-10-04 20:07+0200p\n" +"Project-Id-Version: cheese doc fr\n" +"POT-Creation-Date: 2012-01-01 18:48+0000\n" +"PO-Revision-Date: 2012-02-12 11:00+0100\n" "Last-Translator: Bruno Brouard \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/video-call.page:38(None) C/audio-video.page:70(None) -#: C/audio-call.page:36(None) -msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" -msgstr "" -"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" - -#: C/video-call.page:10(desc) -msgid "Start a video conversation with one of your contacts." -msgstr "Commencer une conversation vidéo avec un de vos contacts." - -#: 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) -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) -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 "Mise en place d'une conversation vidéo" - -#: 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 "" -"Si vous avez une webcam, vous pouvez appeler vos contacts et avoir une " -"conversation vidéo avec eux. Cette fonctionnalité n'est disponible qu'avec " -"certains types de comptes et votre contact doit utiliser une application qui " -"supporte les appels vidéos." - -#: C/video-call.page:37(p) -msgid "" -"From the Contact List window, click the video call icon " -"next to the name of the contact you wish to call and choose Video Call." -msgstr "" -"À partir de la fenêtre Liste des contacts, cliquez sur l'icône " -"Appel vidéo à côté du contact que vous souhaitez appeler et " -"choisissez Appel vidéo." - -#: 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 " -"Connected at the bottom of the window, along with the total " -"conversation time." -msgstr "" -"Une nouvelle fenêtre s'ouvre. Quand la connexion est établie, vous voyez " -"apparaître Connecté en bas de la fenêtre, ainsi que la durée " -"totale de la conversation." - -#: C/video-call.page:48(p) C/audio-call.page:48(p) -msgid "To end the conversation, click on Hang up." -msgstr "" -"Pour terminer la conversation, cliquez sur Raccrocher." - -# "Send video" pour transformer une conversation video en audio ? -#: C/video-call.page:54(p) -msgid "" -"To turn a video conversation into an audio conversation, choose VideoVideo Off." -msgstr "" -"Pour transformer une conversation vidéo en une conversation audio, " -"choisissez VidéoVidéo désactivée." - -#: C/video-call.page:60(title) -msgid "Start a video conversation with a meta-contact" -msgstr "Commencer une conversation vidéo avec un méta-contact" - -#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p) -msgid "" -"From the Contact List window, right-click on the meta-contact." -msgstr "" -"Dans la fenêtre Liste des contacts, faites un clic droit sur le " -"méta-contact." - -#: C/video-call.page:68(p) -msgid "" -"Select the contact you want to have the conversation, and from the menu " -"select Video Call." -msgstr "" -"Sélectionnez le contact avec lequel vous voulez discuter et choisissez Appel vidéo dans le menu." - -#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p) -msgid "" -"To recognize if a contact is a meta-contact, move your mouse on a " -"contact in the Contact List 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 "" -"Pour savoir si un contact est un méta-contact, placez votre souris " -"sur un contact dans la Liste des contacts et laissez-la immobile " -"pendant environ une seconde : une infobulle apparaît pour afficher le nombre " -"de contacts qui forment le méta-contact." - -#. 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" - -#: C/status-icons.page:7(desc) -msgid "Understanding the various statuses and status icons." -msgstr "Comprendre les différents états et les icônes d'état." - -#: 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) -msgid "Shaun McCance" -msgstr "Shaun McCance" - -#: C/status-icons.page:21(email) C/prev-conv.page:21(email) -#: C/import-account.page:28(email) C/disable-account.page:25(email) -#: C/add-account.page:25(email) C/accounts-window.page:19(email) -#: C/account-jabber.page:15(email) C/account-irc.page:17(email) -msgid "shaunm@gnome.org" -msgstr "shaunm@gnome.org" - -#: C/status-icons.page:35(title) -msgid "Status Types and Icons" -msgstr "Types et icônes d'états" - -#: C/status-icons.page:39(media) -msgid "Available icon" -msgstr "Icône « Disponible »" -#: C/status-icons.page:40(gui) -msgid "Available" -msgstr "Disponible" - -#: C/status-icons.page:41(p) -msgid "" -"Use the Available status when you are at your computer and able to " -"chat with your contacts. You can set a custom message for this status." -msgstr "" -"Utilisez l'état Disponible quand vous êtes à votre poste et que " -"vous pouvez discuter avec vos contacts. Vous pouvez créer un message " -"personnalisé pour cet état." - -#: C/status-icons.page:45(media) -msgid "Busy icon" -msgstr "Icône « Occupé »" - -#: C/status-icons.page:46(gui) -msgid "Busy" -msgstr "Occupé" - -#: C/status-icons.page:47(p) -msgid "" -"Use the Busy 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, Empathy will " -"not use notification bubbles and sounds when you are busy. You can set a " -"custom message for this status." -msgstr "" -"Utilisez l'état Occupé quand vous voulez indiquer à vos contacts " -"que vous ne voulez pas discuter pour le moment. Ils peuvent toujours prendre " -"contact avec vous, s'ils ont quelque chose d'urgent à vous dire par exemple. " -"Par défaut, Empathy n'utilise aucune alerte visuelle ou sonore " -"quand vous êtes occupé. Vous pouvez définir un message personnalisé pour cet " -"état." - -#: C/status-icons.page:53(media) -msgid "Away icon" -msgstr "Icône « Absent »" - -#: C/status-icons.page:54(gui) -msgid "Away" -msgstr "Absent" - -#: C/status-icons.page:55(p) -msgid "" -"Use the Away status when you are going away from your computer. " -"Empathy automatically sets your status to Away if you do not use " -"your computer for a while, or if your screensaver is on. By default, " -"Empathy will not use notification bubbles and sounds when you are " -"away. You can set a custom message for this status." -msgstr "" -"Utilisez l'état Absent quand vous vous absentez de votre " -"ordinateur. Empathy bascule automatiquement sur l'état « Absent » " -"si vous n'utilisez pas votre ordinateur pendant un certain temps, ou si " -"votre écran de veille se déclenche. Par défaut, Empathy n'utilise " -"aucune alerte visuelle ou sonore quand vous êtes absent. Vous pouvez définir " -"un message personnalisé pour cet état." - -#: C/status-icons.page:62(media) C/status-icons.page:69(media) -msgid "Offline icon" -msgstr "Icône « Déconnecté »" - -#: C/status-icons.page:63(gui) -msgid "Invisible" -msgstr "Invisible" - -#: C/status-icons.page:64(p) -msgid "" -"When you set your status to Invisible, 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 "" -"Quand vous utilisez le statut Invisible, vous apparaissez " -"déconnecté pour vos contacts. Vous restez connecté à vos comptes, vous " -"pouvez toujours voir le statut de vos contacts et démarrer une discussion " -"avec eux." - -#: C/status-icons.page:70(gui) -msgid "Offline" -msgstr "Déconnecté" - -#: C/status-icons.page:71(p) -msgid "" -"Setting your status to Offline disconnects you from all of your " -"accounts." +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" msgstr "" -"Passez au statut Déconnecté pour vous déconnecter de tous vos " -"comptes." - -#: C/share-desktop.page:7(desc) -msgid "Show your desktop to your contacts." -msgstr "Montrer son bureau à ses contacts." - -#: C/share-desktop.page:18(name) +"Bruno Brouard , 2008-2009,2012\n" +"Claude Paroz , 2008-2010\n" +"Yannick Tailliez , 2008\n" +"Laurent Coudeur , 2009\n" +"Luc Pionchon , 2011\n" +"Luc Guillemin , 2011" + +#. 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:26(media) +msgctxt "_" +msgid "" +"external ref='figures/cheese.png' md5='e801510f287b3db068beb2daf8989124'" +msgstr "" +"external ref='figures/cheese.png' md5='e801510f287b3db068beb2daf8989124'" + +#: C/index.page:7(info/title) +msgctxt "link" +msgid "Cheese Webcam Booth" +msgstr "Studio webcam Cheese" + +#: C/index.page:8(info/title) +msgctxt "text" +msgid "Cheese Webcam Booth" +msgstr "Studio webcam Cheese" + +#: C/index.page:11(credit/name) C/effects-apply.page:9(credit/name) +#: C/introduction.page:11(credit/name) C/mode-wide.page:10(credit/name) +#: C/photo-delete.page:10(credit/name) C/photo-save.page:10(credit/name) +#: C/photo-take.page:15(credit/name) C/photo-view.page:10(credit/name) +#: C/pref-burst-mode.page:10(credit/name) +#: C/pref-countdown.page:10(credit/name) C/pref-flash.page:9(credit/name) +#: C/pref-image-properties.page:10(credit/name) +#: C/pref-photo-resolution.page:10(credit/name) +#: C/video-record.page:10(credit/name) +msgid "Julita Inca" +msgstr "Julita Inca" + +#: C/index.page:13(credit/years) C/index.page:19(credit/years) +#: C/effects-apply.page:11(credit/years) C/introduction.page:13(credit/years) +#: C/mode-wide.page:12(credit/years) C/photo-delete.page:12(credit/years) +#: C/photo-save.page:12(credit/years) C/photo-take.page:17(credit/years) +#: C/photo-view.page:12(credit/years) C/pref-burst-mode.page:12(credit/years) +#: C/pref-countdown.page:12(credit/years) C/pref-flash.page:11(credit/years) +#: C/pref-image-properties.page:12(credit/years) +#: C/pref-photo-resolution.page:12(credit/years) +#: C/video-record.page:12(credit/years) +msgid "2011" +msgstr "2011" + +#: C/index.page:17(credit/name) C/effects-apply.page:14(credit/name) +#: C/introduction.page:16(credit/name) C/mode-wide.page:15(credit/name) +#: C/photo-delete.page:15(credit/name) C/photo-save.page:15(credit/name) +#: C/photo-take.page:20(credit/name) C/photo-view.page:15(credit/name) +#: C/pref-burst-mode.page:15(credit/name) +#: C/pref-countdown.page:15(credit/name) C/pref-flash.page:14(credit/name) +#: C/pref-image-properties.page:15(credit/name) +#: C/pref-photo-resolution.page:15(credit/name) +#: C/video-record.page:15(credit/name) msgid "Ekaterina Gerasimova" msgstr "Ekaterina Gerasimova" -#: C/share-desktop.page:19(email) -msgid "kittykat3756@gmail.com" -msgstr "kittykat3756@gmail.com" - -#: C/share-desktop.page:33(title) -msgid "Share your desktop" -msgstr "Partage du bureau" - -#: C/share-desktop.page:35(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." -msgstr "" -"Vous avez la possibilité de partager votre bureau avec certains de vos " -"contacts. Vous pouvez utiliser cette fonctionnalité pour montrer votre " -"bureau à vos contacts afin de, par exemple, leur demander de l'aide ou " -"encore les assister dans la résolution d'un problème." - -#: C/share-desktop.page:42(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. Vino, the " -"GNOME VNC server, has the required support." -msgstr "" -"Pour partager votre bureau vous avez besoin d'un serveur VNC qui prend en " -"charge cette fonctionnalité, installé sur votre système. Vino, le " -"serveur VNC de GNOME, a la configuration requise." - -#: C/share-desktop.page:51(p) -msgid "From the Contact List window, do one of the following:" -msgstr "" -"À partir de la fenêtre Liste des contacts, effectuez une des " -"actions suivantes :" - -#: C/share-desktop.page:56(p) -msgid "" -"Select the contact you want to share your desktop with and choose " -"EditContactShare My Desktop." -msgstr "" -"Sélectionnez le contact avec lequel vous voulez partager votre bureau, et " -"sélectionnez ÉditionContactPartager mon " -"bureau." - -#: C/share-desktop.page:63(p) -msgid "" -"Right-click on the name of the contact you want to share your desktop with " -"and select Share My Desktop." -msgstr "" -"Faites un clic droit sur le contact avec lequel vous voulez partager votre " -"bureau et sélectionnez Partager mon bureau." - -#: C/share-desktop.page:71(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 "" -"Une invitation va être envoyée aux contacts que vous avez sélectionnés. Pour " -"voir votre bureau, ils devront accepter l'invitation." - -#: C/share-desktop.page:77(p) -msgid "" -"You can disconnect the contact from your computer using your desktop sharing " -"application." -msgstr "" -"Vous pouvez déconnecter le contact de votre ordinateur en utilisant votre " -"application de partage de bureau." - -#: C/share-desktop.page:82(p) -msgid "" -"For more information about how to use the remote desktop sharing " -"application, refer to its help." -msgstr "" -"Pour plus de détails sur l'utilisation de l'application de contrôle à " -"distance, référez-vous à sa documentation." - -#: C/share-desktop.page:90(p) -msgid "" -"When you share your desktop with someone else, it is possible to experience " -"system performance slowdown and low Internet speed." -msgstr "" -"Quand vous partagez votre bureau avec un autre utilisateur, il est possible " -"que vous remarquiez une baisse des performances du système ainsi qu'un " -"ralentissement de la connexion internet." - -#: C/share-desktop.page:96(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 Empathy and a " -"compatible remote desktop viewer application installed in their system." -msgstr "" -"Certains de vos contacts ne prendront pas nécessairement en charge cette " -"fonctionnalité. Ils devront utiliser au minimum la version 2.28 " -"d'Empathy et installer une application de contrôle à distance " -"compatible." - -#: C/set-custom-status.page:9(desc) -msgid "Add, edit or delete personal messages for your status." -msgstr "" -"Ajouter, modifier ou supprimer les messages personnalisés pour votre état." - -#: C/set-custom-status.page:15(name) -msgid "Jim Campbell" -msgstr "Jim Campbell" - -#: C/set-custom-status.page:16(email) -msgid "jwcampbell@gmail.com" -msgstr "jwcampbell@gmail.com" - -#: C/set-custom-status.page:34(title) -msgid "Set a custom message" -msgstr "Paramétrage d'un message personnalisé" - -#: C/set-custom-status.page:36(p) +#: C/index.page:22(info/desc) 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." +"Cheese lets you take pictures and make videos using your webcam. You can " +"even add special effects!" msgstr "" -"Dans certains cas, vous voudrez paramétrer un message personnalisé pour " -"votre état, par exemple pour vous permettre d'indiquer à vos contacts que " -"vous êtes indisponible un certain temps." +"Cheese permet de prendre des photos et des vidéos en utilisant votre webcam. " +"Vous pouvez même ajouter des effets spéciaux !" -#: C/set-custom-status.page:40(p) +#: C/index.page:25(page/title) msgid "" -"It is possible to set a custom message based on the different statuses " -"available." +" Cheese Webcam Booth" msgstr "" -"Vous pouvez paramétrer un message personnalisé pour chaque état disponible." +" Studio webcam Cheese" -#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p) -msgid "" -"From the Contact List window, click on the drop-down list at the " -"top." -msgstr "" -"Cliquez sur la liste déroulante en haut de la fenêtre Liste des " -"contacts." - -#: C/set-custom-status.page:52(p) -msgid "" -"Select the status you want to add a custom message to. You have to select " -"the one identified with the label Custom Message." -msgstr "" -"Sélectionnez l'état auquel vous voulez ajouter un message personnalisé. Vous " -"devez sélectionner celui libellé Message personnalisé." - -#: C/set-custom-status.page:58(p) -msgid "" -"Enter your custom message in the text box at the top of the window, and " -"press Enter to set the message." -msgstr "" -"Saisissez votre message personnalisé dans la zone de texte en haut de la " -"fenêtre et appuyez sur Entrée pour définir le message." - -#: 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." -msgstr "" -"Si vous voulez paramétrer ce message personnalisé comme favori et " -"l'enregistrer pour le réutiliser plus tard, cliquez sur la petite étoile à " -"droite de la zone de texte où vous venez de saisir le message." - -#: 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 Empathy. It will be saved only for the current session." -msgstr "" -"Si vous ne le faites pas, le message personnalisé ne sera pas disponible la " -"prochaine fois que vous utiliserez Empathy. Il est enregistré " -"pour la session actuelle uniquement." - -#: C/set-custom-status.page:78(title) -msgid "Edit, remove and add a custom message" -msgstr "Modification, suppression ou ajout d'un message personnalisé" - -# Je ne trouve pas le menu en question dans l'ui -#: C/set-custom-status.page:88(p) -msgid "Select Edit Custom Message." -msgstr "Sélectionnez Édition des messages personnalisés." - -#: C/set-custom-status.page:95(p) -msgid "To edit a custom message:" -msgstr "Pour modifier un message personnalisé :" - -#: C/set-custom-status.page:100(p) -msgid "" -"From the Saved Presets box, select the status message you want to " -"edit and double-click on it." -msgstr "" -"Dans la zone de texte Messages prédéfinis enregistrés, " -"sélectionnez puis faites un double clic sur le message que vous voulez " -"modifier." - -#: C/set-custom-status.page:106(p) -msgid "Type the new custom message and press Enter to modify it." -msgstr "" -"Saisissez le nouveau message personnalisé et appuyez sur Entrée " -"pour le modifier." - -#: C/set-custom-status.page:113(p) -msgid "To remove a custom message:" -msgstr "Pour supprimer un message personnalisé :" - -#: C/set-custom-status.page:118(p) -msgid "" -"From the Saved Presets box, select the status message you want to " -"remove." -msgstr "" -"Dans la zone de texte Messages prédéfinis enregistrés, " -"sélectionnez le message que vous voulez supprimer." - -#: C/set-custom-status.page:124(p) -msgid "Click on the Remove button." -msgstr "Cliquez sur le bouton Supprimer." - -#: C/set-custom-status.page:131(p) -msgid "" -"To add a new custom message, from the Add New Preset section:" -msgstr "" -"Pour ajouter un nouveau message personnalisé, à partir de Ajouter " -"nouveau message prédéfini :" - -#: C/set-custom-status.page:136(p) -msgid "" -"Click on the drop-down list to select the status you want to set a custom " -"message to." -msgstr "" -"Cliquez sur la liste déroulante pour sélectionner l'état pour lequel vous " -"voulez saisir un message personnalisé." - -#: C/set-custom-status.page:142(p) -msgid "Click on the text box, and type the new custom message." -msgstr "" -"Cliquez dans le champ de saisie et saisissez le nouveau message personnalisé." - -#: C/set-custom-status.page:147(p) -msgid "Click on Add to add the new message to the presets ones." -msgstr "" -"Cliquez sur Ajouter pour ajouter le nouveau message aux messages " -"prédéfinis." - -#: C/set-custom-status.page:156(p) -msgid "When finished, click on Close." -msgstr "Cliquez sur Fermer quand vous avez terminé." - -#: C/set-custom-status.page:163(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 Contact List " -"window." -msgstr "" -"Quand vous modifiez ou créez un message personnalisé, il ne devient pas le " -"message du statut en cours. Vous devez le sélectionner dans la fenêtre " -"Liste des contacts." - -#: C/send-message.page:8(desc) -msgid "Send a message to one of your contacts." -msgstr "Envoyer un message à l'un de vos contacts." - -#: C/send-message.page:17(name) C/send-file.page:17(name) -#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name) -#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name) -#: C/change-status.page:19(name) C/add-contact.page:18(name) -msgid "Phil Bull" -msgstr "Phil Bull" - -#: C/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/index.page:32(section/title) +msgid "Main features" +msgstr "Principales fonctionnalités" -#: C/send-message.page:32(title) -msgid "Send a message to someone" -msgstr "Envoi d'un message à quelqu'un" +#: C/index.page:36(section/title) +msgid "Preferences" +msgstr "Préférences" -#: C/send-message.page:36(p) -msgid "" -"From the Contact List window, double-click the name of the " -"contact that you want to have a conversation with." -msgstr "" -"Dans la fenêtre Liste des contacts, double-cliquez sur le nom du " -"contact avec lequel vous voulez discuter." +#: C/index.page:40(section/title) +msgid "Common problems and questions" +msgstr "Problèmes et questions fréquents" -#: C/send-message.page:42(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/effects-apply.page:45(media) +msgctxt "_" msgid "" -"A new window will open. Type a message into the box at the bottom of the " -"window and press Enter to send it." +"external ref='figures/effects.png' md5='27139b3d1500c8caac548fab39e05c28'" msgstr "" -"Une nouvelle fenêtre s'ouvre. Saisissez votre message dans la zone de texte " -"en bas de la fenêtre et appuyez sur Entrée pour l'envoyer." +"external ref='figures/effects.png' md5='27139b3d1500c8caac548fab39e05c28'" -#: C/send-message.page:50(title) -msgid "Send a message to a meta-contact" -msgstr "Envoi d'un message à un méta-contact" - -#: C/send-message.page:58(p) +#: C/effects-apply.page:18(info/desc) msgid "" -"Select the contact you want to have the conversation, and from the menu " -"select Chat." -msgstr "" -"Sélectionnez le contact avec lequel vous voulez discuter et choisissez Discuter dans le menu." - -#: C/send-file.page:8(desc) -msgid "Send a file from your computer to one of your contacts." -msgstr "Envoyer un fichier de votre ordinateur à l'un de vos contacts." - -#: C/send-file.page:36(title) -msgid "Send files" -msgstr "Envoi de fichiers" - -#: C/send-file.page:40(p) C/favorite-rooms.page:66(p) -msgid "From the Contact List window, perform one of the following:" +"Add fun effects to your photos and videos, like turning yourself green or " +"distorting the picture like a funhouse mirror." msgstr "" -"À partir de la fenêtre Liste des contacts, effectuez une des " -"actions suivantes :" +"Ajouter des effets amusants à vos photos et vidéos, comme devenir tout vert " +"ou distordre l'image comme dans un miroir déformant." -#: C/send-file.page:45(p) -msgid "" -"Right click on the contact you want to send a file to, and choose Send " -"file." -msgstr "" -"Cliquez droit sur le nom du contact auquel vous voulez envoyer un fichier et " -"sélectionnez Envoyer un fichier." +#: C/effects-apply.page:22(page/title) +msgid "Apply effects to photos and videos" +msgstr "Ajout d'effets aux photos et aux vidéos" -#: C/send-file.page:50(p) -msgid "" -"Click on the contact you want to send a file, and choose EditContactSend file." -msgstr "" -"Cliquez sur le contact auquel vous voulez envoyer un fichier et sélectionnez " -"ÉditionContactEnvoyer un fichier." +#: C/effects-apply.page:24(page/p) +msgid "You can apply fun, interesting effects to your photos and videos:" +msgstr "Vous pouvez appliquer des effets amusants à vos photos et vos vidéos :" -#: C/send-file.page:58(p) -msgid "Select the file to send, and click on Send." -msgstr "Sélectionnez le fichier à envoyer et cliquez sur Envoyer." +#: C/effects-apply.page:26(item/p) +msgid "Click Effects." +msgstr "Cliquez sur Effets." -#: C/send-file.page:63(p) -msgid "The File Transfers window will appear." -msgstr "La fenêtre Transferts de fichiers apparaît." +#: C/effects-apply.page:28(item/p) +msgid "Select the effect you want to use by clicking one of the options." +msgstr "Sélectionnez les effets souhaités en cliquant sur une des options." -#: C/send-file.page:66(p) +#: C/effects-apply.page:29(item/p) msgid "" -"Wait for your contact to accept the file transfer, or click Stop " -"to halt the transfer." +"If you like, you can select multiple effects. For example, if you select " +"Hulk and Kung-Fu, the video will be altered to have a " +"green shade and will show a repeated image." msgstr "" -"Attendez que votre contact accepte le transfert de fichier ou cliquez sur " -"Arrêter pour arrêter le transfert." +"Si vous le souhaitez, vous pouvez sélectionner plusieurs effets. Par " +"exemple, si vous sélectionnez Hulk et Kung-Fu, la " +"vidéo va être transformée pour avoir un ton vert et afficher une image " +"répétée." -#: C/send-file.page:72(p) +#: C/effects-apply.page:34(item/p) msgid "" -"Once the transfer is finished, it is possible to close the File " -"Transfers window." +"Click Effects to hide the effects menu and return to the normal " +"view." msgstr "" -"À la fin du transfert, vous pouvez fermer la fenêtre Transferts de " -"fichiers." +"Cliquez sur Effets pour cacher le menu des effets et revenir à la " +"vue normale." -#: C/send-file.page:80(p) +#: C/effects-apply.page:39(page/p) msgid "" -"If you have multiple finished transfers listed in the window, click on " -"Clear to empty the list. This will only remove the files from the " -"list and will not delete them from your computer." +"Cheese offers 34 effects, of which only 9 are shown on the first " +"page. Click Next Effects and Previous Effects to " +"navigate to the other pages." msgstr "" -"Si plusieurs transferts apparaissent dans la fenêtre, vous pouvez les " -"supprimer en cliquant sur Effacer. Les fichiers disparaîtront de " -"la liste mais ne seront pas supprimés de votre ordinateur." +"Cheese fournit 34 effets. Seuls 9 d'entre eux sont affichés sur " +"la première page. Cliquez sur Effets suivants ou Effets " +"précédents pour naviguer parmi les autres pages." -#: C/send-file.page:87(p) -msgid "" -"It is possible to send files only using the following services: Jabber, Google Talk and People Nearby." -msgstr "" -"Le transfert de fichier n'est possible qu'avec les services suivants : " -"Jabber, Google Talk et Personnes à proximité." +#: C/effects-apply.page:44(figure/title) +msgid "Some of the effects, from left to right: Bulge, Edge and Mirror" +msgstr "Quelques effets, de gauche à droite : boursouflure, contours et miroir" -#: C/send-file.page:93(p) +#: C/effects-apply.page:48(note/p) msgid "" -"In order to send a file to someone, you need to be connected to the " -"Internet, or to a local area network." +"To deselect all effects, click Effects and select No Effect." msgstr "" -"Vous devez être connecté sur internet ou au réseau local pour pouvoir " -"envoyer des fichiers à quelqu'un." - -#: C/salut-protocol.page:8(desc) -msgid "Understanding the People Nearby feature." -msgstr "Comprendre la fonctionnalité « Personnes à proximité »." +"Pour enlever tous les effets, cliquez sur Effets et sélectionnez " +"Aucun effet." -#: C/salut-protocol.page:33(title) -msgid "What is People Nearby?" -msgstr "Fonctionnalité « Personnes à proximité » ?" +#: C/introduction.page:20(info/desc) +msgid "Introduction to the Cheese Webcam Booth." +msgstr "Introduction au Studio webcam Cheese." -#: C/salut-protocol.page:37(p) -msgid "I'd like to see this played up a bit more." -msgstr "J'aimerais bien que cela soit plus souvent utilisé." - -#: C/salut-protocol.page:40(p) -msgid "" -"The People Nearby service is a serverless communication service: you do not " -"need to connect and authenticate to a central server in order to use it." -msgstr "" -"Le service « Personnes à proximité » est un service de communication sans " -"serveur : il n'est pas nécessaire de se connecter et de s'identifier à un " -"serveur central pour l'utiliser." +#: C/introduction.page:23(page/title) +msgid "Introduction" +msgstr "Introduction" -#: C/salut-protocol.page:45(p) +#: C/introduction.page:25(page/p) msgid "" -"This kind of serverless messaging system is restricted to a local area " -"network and an active Internet connection is not necessary." +"Cheese is a fun webcam booth application which lets you take " +"photos and record videos using your webcam. By using Cheese, you " +"can make funny, original photos and videos that you can easily share with " +"others. It can take multiple photos in quick succession (using the Burst mode) and lets you apply effects that add a special, fancy or funny " +"touch to your photos and videos." msgstr "" -"Ce type de système de messagerie sans serveur est limité aux réseaux locaux " -"et l'activation d'une connexion à internet n'est pas nécessaire." +"Cheese est une application amusante pour votre webcam qui vous " +"permet de prendre des photos et de faire des vidéos avec votre webcam. En " +"utilisant Cheese, vous pouvez faire des photos et des vidéos " +"amusantes et originales que vous pouvez facilement partager avec les autres. " +"Elle permet de prendre de multiples photos les unes à la suite des autres " +"(en utilisant le mode rafale) et " +"vous permet d'utiliser des effets pour " +"ajouter une touche spéciale, fantaisiste ou amusante à vos photos et vidéos." -#: C/salut-protocol.page:49(p) +#: C/introduction.page:33(page/p) msgid "" -"The people that use this service inside the same local area network will be " -"auto-discovered, and it will be possible to send them messages and files as " -"with other services." +"By default, Cheese starts in Photo mode, ready to " +"take a photo. You need to switch to " +"Video mode to record a video " +"or switch to Burst mode to take " +"multiple photos at once." msgstr "" -"Les personnes qui utilisent ce service à l'intérieur du même réseau local " -"sont auto-identifiées et il est possible de leur envoyer des messages et des " -"fichiers comme avec les autres services." +"Par défaut, Cheese démarre en mode photo, prêt à prendre une photo. Vous devez basculer en " +"mode vidéo pour prendre une vidéo ou basculer en mode rafale pour prendre plusieurs photos d'un coup." -#: C/salut-protocol.page:54(p) +#: C/introduction.page:39(page/p) msgid "" -"All the modern local area networks should be able to support this kind of " -"service." +"Cheese works with most webcams, but if your particular make and " +"model does not seem to work properly, see Webcams for advice on getting it to work." msgstr "" -"Tous les réseaux locaux récents devraient être capable de prendre en charge " -"ce type de service." - -#: C/remove-account.page:8(desc) -msgid "Completely remove an account from Empathy." -msgstr "Supprimer complètement un compte dans Empathy." +"Cheese fonctionne avec la plupart des webcams, mais si la votre " +"n'a pas l'air de fonctionner normalement, consultez Webcams pour obtenir des conseils sur la manière dont vous " +"pourriez la faire fonctionner." -#: C/remove-account.page:33(title) -msgid "Remove an account" -msgstr "Suppression d'un compte" - -#: C/remove-account.page:35(p) +#: C/mode-wide.page:19(info/desc) msgid "" -"You can completely remove an account from Empathy if you no " -"longer wish to use the account. If you wish to use the account in " -"Empathy again in the future, you will have to add your account " -"details again." +"Change the position of the photo stream so that the webcam video feed is " +"larger." msgstr "" -"Vous pouvez supprimer un compte définitivement d'Empathy si vous " -"ne souhaitez plus l'utiliser. Si vous souhaitez réutiliser ce compte dans " -"Empathy, il faudra le créer de nouveau avec tous ses paramètres." +"Modifier la position du flux d'images pour que l'entrée vidéo de la webcam " +"soit plus grande." -#: 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) -msgid "" -"From the Contact List window, choose EditAccounts, or press F4." -msgstr "" -"À partir de la fenêtre Liste des contacts, sélectionnez " -"ÉditionComptes, ou appuyez sur " -"F4." +#: C/mode-wide.page:23(page/title) +msgid "Make the webcam video preview bigger" +msgstr "Agrandir la prévisualisation de la vidéo de la webcam" -#: C/remove-account.page:46(p) +#: C/mode-wide.page:25(page/p) msgid "" -"Select the account you wish to remove from the accounts list on the left " -"side of the window." +"The photo stream is where photos and videos appear after you have taken or " +"recorded them. By default, it is a horizontal strip at the bottom of the " +"Cheese window." msgstr "" -"Sélectionnez le compte que vous voulez supprimer dans la liste de comptes de " -"la partie gauche de la fenêtre." - -#: C/remove-account.page:50(p) -msgid "Click on Remove." -msgstr "Cliquez sur Supprimer." +"Le flux d'images est l'endroit où les photos et les vidéos apparaissent " +"après avoir été prises ou enregistrées. Par défaut, c'est une bande " +"horizontale en bas de la fenêtre Cheese." -#: C/remove-account.page:53(p) +#: C/mode-wide.page:29(page/p) msgid "" -"A dialog will be shown asking for confirmation. Click the Remove " -"button to permanently remove the account." +"You can make the photo stream appear as a vertical bar. This is useful if " +"you have a wide computer screen which is not very high; switching to a " +"vertical layout means that there is more room to display the video feed from " +"the webcam." msgstr "" -"Une boite de dialogue s'ouvre pour vous demander de confirmer la " -"suppression. Cliquez sur Supprimer pour supprimer le compte " -"définitivement." +"Vous pouvez afficher le flux d'images verticalement. C'est utile si vous " +"avez un écran large mais pas très haut ; le passage à un affichage vertical " +"laisse plus de place pour afficher l'entrée vidéo de la webcam." -#: C/remove-account.page:59(p) +#: C/mode-wide.page:34(page/p) msgid "" -"Even after removing an account, Empathy does not delete your " -"conversation history for that account." -msgstr "" -"Même après la suppression d'un compte, Empathy ne supprime pas " -"l'historique de ses conversations." - -#: C/prob-conn.page:7(desc) -msgid "Diagnose common problems connecting to an instant messaging service." +"To switch to a vertical layout, click Cheese Wide " +"Mode. To switch back to a horizontal layout, uncheck the " +"option." msgstr "" -"Diagnostique des problèmes courants de connexion à un service de messagerie " -"instantanée." +"Pour passer à un affichage vertical, cliquez sur Cheese " +"Mode large. Pour revenir à l'affichage horizontal, " +"décochez l'option." -#: C/prob-conn.page:29(title) -msgid "Problems connecting to an instant messaging service" -msgstr "Problèmes de connexion à un service de messagerie instantanée" - -#. 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/prob-conn-neterror.page:7(desc) +#: C/mode-wide.page:39(note/p) msgid "" -"An error message which says “Network error” appears in the main " -"window." +"Another way to increase the size of the webcam preview is to make " +"Cheese fullscreen. To do this, click CheeseFullscreen or press F11. To quit the " +"fullscreen mode, press F11." msgstr "" -"Un message d'erreur indiquant « Erreur réseau » apparaît dans la " -"fenêtre principale." +"Une autre façon d'agrandir le flux de la webcam est d'utiliser Cheese en mode plein écran. Pour cela, cliquez sur CheesePlein écran ou appuyez sur la touche F11. " +"Pour quitter le mode plein écran, appuyez sur F11." -#: C/prob-conn-neterror.page:33(title) -msgid "I get a message that says “Network error”" -msgstr "J'obtiens le message « Erreur réseau »" +#: C/photo-delete.page:19(info/desc) +msgid "Remove photos and videos that you no longer want to keep." +msgstr "Supprimer des photos et des vidéos que vous ne voulez plus garder." -#: C/prob-conn-neterror.page:36(cite) -msgid "shaunm" -msgstr "shaunm" - -#: C/prob-conn-neterror.page:37(p) -msgid "" -"Empathy no longer allows you to create an IRC account without a valid nick. " -"I've removed the guide link. Remove the text." -msgstr "" -"Empathy ne vous autorise plus à créer un compte IRC sans pseudo valide. J'ai " -"supprimé le lien du guide et supprimé le texte." +#: C/photo-delete.page:22(page/title) +msgid "Delete a photo or video" +msgstr "Suppression d'une photo ou d'une vidéo" -#: C/prob-conn-neterror.page:41(p) -msgid "" -"This kind of error happens when Empathy cannot communicate with " -"the instant messaging service for some reason." +#: C/photo-delete.page:24(page/p) +msgid "If you no longer want a photo or video, you can permanently delete it:" msgstr "" -"Ce type d'erreur se produit quand Empathy ne parvient pas à " -"communiquer avec le service de messagerie instantanée." +"Si vous ne voulez plus d'une photo ou d'une vidéo, vous pouvez la supprimer " +"définitivement :" -#: C/prob-conn-neterror.page:45(p) +#: C/photo-delete.page:28(item/p) msgid "" -"Also, this kind of error happens when you try to use an IRC account without " -"setting a nickname." +"Find the photo or video that you want to delete in the photo stream at the " +"bottom of the Cheese window." msgstr "" -"Ce type d'erreur se produit aussi quand vous essayez d'utiliser un compte " -"IRC sans paramétrer de pseudonyme." - -#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p) -#: C/prob-conn-acctdisabled.page:43(p) -msgid "" -"Make sure that you are connected to the Internet, or to a local area network." -msgstr "Assurez-vous d'être connecté à internet ou au réseau local." +"Trouvez la photo ou la vidéo que vous voulez supprimer dans le flux d'images " +"en bas de la fenêtre Cheese." -#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p) -#: C/prob-conn-auth.page:57(p) +#: C/photo-delete.page:32(item/p) msgid "" -"Click the edit icon in the error message." +"Right-click it and select Delete. Alternatively, click it once to " +"select it and press the Delete key." msgstr "" -"Cliquez sur l'icône Modifier dans le message d'erreur." +"Faites un clic droit et sélectionnez Supprimer. Vous pouvez aussi " +"cliquer une fois pour la sélectionner puis appuyer sur la touche Suppr." -#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p) +#: C/photo-delete.page:36(item/p) msgid "" -"Check in the Advanced section that all the details are correct. " -"You should be able to find these details from the website of the messaging " -"service." +"You will be asked if you want to permanently delete it. Confirm by clicking " +"Delete; you will not be able to recover the photo." msgstr "" -"Vérifiez dans la section Avancé si tous les paramètres sont " -"corrects.Vous devriez trouver ces paramètres sur le site internet de votre " -"service de messagerie." +"Il vous est demandé si vous souhaitez la supprimer définitivement. Confirmez " +"en cliquant sur Supprimer. Vous ne pourrez plus récupérer la " +"photo." -#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p) +#: C/photo-delete.page:41(page/p) msgid "" -"Deselect the Enabled, and then select it again to try to " -"reconnect to the service." +"If you are not sure whether you want to permanently delete the photo or " +"video, you can right click it and select Move to Trash instead. " +"This will move it to the computer's Trash folder." msgstr "" -"Décochez la case à cocher Activé et cochez-la de nouveau pour " -"essayer de vous reconnecter au service." +"Si vous n'êtes pas sûr de vouloir supprimer de manière définitive une photo " +"ou une vidéo, vous pouvez faire un clic droit dessus et sélectionner " +"Mettre à la corbeille à la place. La photo est alors déplacée " +"dans le dossier Corbeille de l'ordinateur." -#: C/prob-conn-neterror.page:90(title) -msgid "Proxy support" -msgstr "Prise en charge d'un service mandataire" - -#: C/prob-conn-neterror.page:91(p) +#: C/photo-delete.page:45(note/p) msgid "" -"At the moment Empathy can not be configured to work with a proxy." +"Cheese does not have its own Trash folder and you cannot access " +"your computer's Trash folder from within Cheese." msgstr "" -"Pour l'instant, Empathy ne peut pas être configuré pour " -"fonctionner avec un service mandataire." - -#: C/prob-conn-name.page:9(title) -msgid "“Name in use”" -msgstr "« Nom déjà utilisé »" +"Cheese ne possède pas de dossier Corbeille personnel et vous ne " +"pouvez pas accéder au dossier Corbeille à partir de Cheese." -#: C/prob-conn-name.page:10(desc) -msgid "" -"An error message which says “Name in use” appears in the main " -"window." -msgstr "" -"Un message d'erreur indiquant « Nom déjà utilisé » apparaît dans " -"la fenêtre principale." +#: C/photo-save.page:19(info/desc) +msgid "Save a photo or video in a different folder." +msgstr "Enregistrer une photo ou une vidéo dans un dossier différent." -#: C/prob-conn-name.page:32(title) -msgid "I get a message that says “Name in use”" -msgstr "J'obtiens le message « Nom déjà utilisé »" +#: C/photo-save.page:22(page/title) +msgid "Save a photo or video" +msgstr "Enregistrement d'une photo ou d'une vidéo" -#: C/prob-conn-name.page:34(p) +#: C/photo-save.page:24(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." +"By default, Cheese saves the photos and videos in the PicturesWebcam and VideosWebcam folders in your user folder." msgstr "" -"Ce type d'erreur se produit si vous tentez de vous connecter avec un compte " -"IRC et que vous utilisez un pseudonyme qui est déjà utilisé par quelqu'un " -"sur ce réseau." +"Par défaut, Cheese enregistre les photos et les vidéos dans les dossiers " +"ImagesWebcam et VidéosWebcam de votre dossier Personnel." -#: C/prob-conn-name.page:50(p) -msgid "In the Nickname text box, type a new nickname." -msgstr "" -"Dans la zone de texte Pseudonyme, saisissez un nouveau pseudonyme." - -#: C/prob-conn-name.page:55(p) +#: C/photo-save.page:29(page/p) msgid "" -"If you have registered that nickname within the network you are using, set " -"the password for that nickname. For more information, see ." +"To save an image to a different location, right-click the image in the photo " +"stream and click Save As. Then, choose where you want to save the " +"image." msgstr "" -"Si vous avez enregistré ce pseudonyme sur le réseau utilisé, saisissez le " -"mot de passe pour ce pseudonyme. Pour plus d'informations, consultez ." +"Pour enregistrer une image dans un autre dossier, faites un clic droit sur " +"la photo dans le flux d'images et cliquez sur Enregistrer sous " +"puis choisissez le dossier où vous voulez enregistrer l'image." -#: C/prob-conn-name.page:64(p) +#: C/photo-save.page:33(page/p) msgid "" -"Deselect the Enabled check-box next to the name of your account, " -"and then select it again to try to reconnect to the service." +"Alternatively, open the folder where you want to keep the image using the " +"file manager, then drag it from the photo stream into that folder." msgstr "" -"Décochez la case à cocher Activé à côté du nom du compte, et " -"cochez-la de nouveau pour essayer de vous reconnecter au service." +"Vous pouvez aussi utiliser le gestionnaire de fichiers pour ouvrir le " +"dossier où vous souhaitez enregistrer l'image, puis la glisser du flux " +"d'images vers le dossier." -# traduction du message d'erreur -#: C/prob-conn-auth.page:8(desc) +#: C/photo-save.page:36(page/p) msgid "" -"An error message which says “Authentication failed” appears in " -"the main window." +"A new copy of the image will be saved in the new location. The old version " +"will remain in the PicturesWebcam or " +"VideosWebcam folder." msgstr "" -"Un message d'erreur indiquant « L'authentification a échoué » " -"apparaît dans la fenêtre principale." +"Une nouvelle copie de l'image est enregistrée dans le nouvel emplacement. " +"L'ancienne version reste dans le dossier ImagesWebcam ou VidéosWebcam." -#: C/prob-conn-auth.page:36(title) -msgid "I get a message that says “Authentication failed”" -msgstr "J'obtiens le message « L'authentification a échoué »" +#: C/photo-take.page:24(info/desc) +msgid "Use your webcam to take photos instead of videos." +msgstr "Utiliser sa webcam pour faire des photos plutôt que des vidéos." -#: 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 "" -"Ce type d'erreur se produit quand votre service de messagerie instantanée ne " -"vous permet pas de vous connecter parce qu'il ne reconnaît pas votre nom " -"d'utilisateur ou votre mot de passe." +#: C/photo-take.page:27(page/title) +msgid "Take photos with the webcam" +msgstr "Prise de photos avec la webcam" -#: C/prob-conn-auth.page:50(p) +#: C/photo-take.page:29(page/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." +"Webcams can be used to take still photos, as well as videos. To take a photo:" msgstr "" -"Vérifiez que vous êtes inscrit au service auquel vous essayez de vous " -"connecter. Si vous n'avez pas de compte enregistré, la plupart des services " -"vous refusent la connexion." +"Les webcams permettent de prendre aussi bien des photos que des vidéos. Pour " +"prendre une photo :" -#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p) +#: C/photo-take.page:34(item/p) msgid "" -"Type your username and password again to make sure that they are correct." +"Make sure that you're in Photo mode. If you are, the button in " +"the main window will say Take a Photo." msgstr "" -"Saisissez votre nom d'utilisateur et votre mot de passe afin de vous assurer " -"qu'ils sont corrects." +"Vérifiez que vous êtes dans le Mode photo. Si c'est le cas, le " +"bouton de la fenêtre principale affiche Prendre une photo." -#: C/prob-conn-acctdisabled.page:7(desc) +#: C/photo-take.page:36(item/p) msgid "" -"The instant messaging account that you want to use is not enabled in the " -"list of accounts." +"To switch to Photo mode, click the small photo button in the " +"bottom left of the window or click Cheese Photo." msgstr "" -"Le compte que vous voulez utiliser n'est pas activé dans la liste des " -"comptes." +"Pour passer au mode photo, cliquez sur le bouton contenant une " +"petite photo en bas à gauche de la fenêtre ou cliquez sur " +"Cheese Photo." -#: C/prob-conn-acctdisabled.page:33(title) -msgid "My account is not enabled" -msgstr "Mon compte n'est pas activé" - -#: 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." +#: C/photo-take.page:41(item/p) +msgid "Click Take a Photo or press the spacebar." msgstr "" -"Si vous essayez de commencer une nouvelle conversation, ou de rejoindre un " -"groupe de discussion, et que le compte que vous souhaitez utiliser n'est pas " -"actif dans la liste déroulante, les détails de ce compte sont probablement " -"incorrects." +"Cliquez sur Prendre une photo ou appuyez sur la barre " +"d'espace." -#: C/prob-conn-acctdisabled.page:48(p) +#: C/photo-take.page:44(item/p) msgid "" -"Choose EditAccounts and select the " -"account that is not working." +"There will be a short countdown, followed by a flash, and then the photo " +"will appear in the photo stream at the bottom of the window." msgstr "" -"Sélectionnez ÉditionComptes et " -"sélectionnez le compte qui ne fonctionne pas." +"Un court retardateur est affiché, suivi d'un flash, puis la photo apparaît " +"dans le flux d'images en bas de la fenêtre." -#: C/prob-conn-acctdisabled.page:65(p) +#: C/photo-take.page:49(page/p) msgid "" -"Check that the Enabled check-box is selected. " -"If it is not, select the check-box to enable the account." +"The photos in the photo stream are automatically saved in the " +"PicturesWebcam folder in your user " +"folder. They are saved in the JPEG (.jpg) format." msgstr "" -"Vérifiez que la case Activé est bien cochée. " -"Si ce n'est pas le cas, cochez cette case pour activer le compte." +"Les photos du flux d'images sont automatiquement enregistrées dans le " +"dossier ImagesWebcam de votre dossier " +"personnel. Elles sont enregistrées dans le format JPEG (.jpg)." -#: C/prev-conv.page:8(desc) -msgid "Browse or search your previous conversations." -msgstr "Parcourir ou faire une recherche parmi vos conversations précédentes." - -#: C/prev-conv.page:35(title) -msgid "View previous conversations" -msgstr "Affichage des conversations précédentes" - -#: C/prev-conv.page:39(p) +#: C/photo-take.page:53(page/p) msgid "" -"Highlighting text is quirky: #593733. 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." +"To cancel taking a photo after you have clicked Take a Photo, " +"press Esc before the countdown finishes." msgstr "" -"La mise en surbrillance est étrange....#593733. NON TRADUIT VOLONTAIREMENT " -"CAR N'APPARAIT PAS DANS LA DOC !!!" +"Pour annuler la prise d'une photo après avoir cliqué sur Prendre une " +"photo, appuyez sur la touche Échap avant la fin du " +"retardateur." -#: C/prev-conv.page:46(p) +#: C/photo-take.page:57(note/p) msgid "" -"Empathy automatically saves all your text conversations you have " -"with your contacts. You can search through all of " -"your previous conversations or browse previous " -"conversations by contact and date." +"To take multiple photos in rapid succession, use Burst mode." msgstr "" -"Empathy enregistre automatiquement toutes les conversations " -"textuelles que vous avez eu avec vos contacts. Vous pouvez Rechercher parmi toutes vos conversations précédentes ou " -"Parcourir les conversations précédentes par " -"contact ou par date." +"Pour prendre plusieurs photos les unes à la suite des autres, utilisez le " +"mode rafale." -#: C/prev-conv.page:54(p) -msgid "" -"You do not need to be connected to the Internet to view and search your " -"previous conversations." +#: C/photo-view.page:19(info/desc) +msgid "Photos and videos will automatically appear in the photo stream." msgstr "" -"Vous n'avez pas besoin d'être connecté à internet pour consulter ou faire " -"des recherches dans vos anciennes conversations." - -#: C/prev-conv.page:61(title) -msgid "Search previous conversations" -msgstr "Recherche de conversations précédentes" +"Les photos et les vidéos apparaissent automatiquement dans le flux d'images." -#: C/prev-conv.page:63(p) -msgid "" -"You can perform a full-text search through all of your previous " -"conversations." -msgstr "" -"Vous pouvez faire une recherche de texte intégral à travers toutes vos " -"conversations précédentes." +#: C/photo-view.page:23(page/title) +msgid "View a photo or video that you took" +msgstr "Affichage d'une photo ou d'une vidéo que vous avez faite" -#: C/prev-conv.page:67(p) C/prev-conv.page:96(p) +#: C/photo-view.page:25(page/p) msgid "" -"From the Contact List window, choose ViewPrevious Conversations. Alternatively, press " -"F3." +"After you take a photo or record a video, it will appear in the photo stream " +"at the bottom of the window." msgstr "" -"À partir de la fenêtre Liste des contacts, sélectionnez " -"AffichageConversations précédentes. " -"Vous pouvez aussi appuyer sur F3." +"Après avoir pris une photo ou enregistré une vidéo, elle apparaît dans le " +"flux d'images en bas de la fenêtre." -#: C/prev-conv.page:71(p) -msgid "Select the Search tab." -msgstr "Sélectionnez l'onglet Rechercher." - -#: C/prev-conv.page:74(p) +#: C/photo-view.page:28(page/p) msgid "" -"In the For field, type the text you want to search for. Click " -"Find or press Enter." +"If you want to see a bigger version of a photo, or to play a video, double-" +"click it. This will open it in the default photo viewer or video player." msgstr "" -"Dans la zone de saisie ce terme, saisissez le texte que vous " -"voulez rechercher. Cliquez sur Rechercher ou appuyez sur " -"Entrée." +"Si vous souhaitez voir une version plus grande d'une photo ou lire une " +"vidéo, double-cliquez dessus. Elle est alors ouverte dans le visionneur de " +"photos ou le lecteur de vidéos par défaut." -#: C/prev-conv.page:78(p) +#: C/photo-view.page:31(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." +"All of the photos and videos in the photo stream are saved in the " +"PicturesWebcam or " +"VideosWebcam folders in your user " +"folder." msgstr "" -"Toutes les conversations correspondant aux termes que vous avez saisis " -"apparaissent dans la liste sous le champ de recherche. Par défaut, les " -"conversations sont classées par date." +"Toutes les photos et vidéos du flux d'images sont enregistrées dans les " +"dossiers ImagesWebcam ou " +"VidéosWebcam de votre dossier " +"personnel." -#: C/prev-conv.page:82(p) +#: C/pref-burst-mode.page:19(info/desc) msgid "" -"Click on a conversation to view it. Empathy will select the text " -"in the conversation that matched your search terms." +"Burst mode takes several photos rapidly. Change your pose in " +"between each shot!" msgstr "" -"Cliquez sur la conversation que vous voulez consulter. Empathy " -"sélectionne le texte qui correspond aux termes recherchés." +"Le mode rafale prend plusieurs photos rapidement. Changez de pose " +"entre chaque prise !" -#: C/prev-conv.page:89(title) -msgid "Browse previous conversations" -msgstr "Parcours de conversations précédentes" +#: C/pref-burst-mode.page:23(page/title) +msgid "Take multiple photos in quick succession" +msgstr "Prise de plusieurs photos les unes à la suite des autres" -#: C/prev-conv.page:91(p) +#: C/pref-burst-mode.page:25(page/p) msgid "" -"You can browse your previous conversations with your contacts or in chat " -"rooms by date." +"You can use Burst mode to automatically take several photos in " +"one go, with a short pause between shots. It is particularly fun if you " +"change your pose in between photos! To use Burst mode:" msgstr "" -"Vous pouvez parcourir vos précédentes conversations avec vos contacts ou " -"dans des salons de discussion, classées par date." - -#: C/prev-conv.page:100(p) -msgid "Select the Conversations tab." -msgstr "Sélectionnez l'onglet Conversations." +"Vous pouvez utiliser le mode rafale pour prendre plusieurs photos " +"d'un coup, avec un court temps de pause entre elles. C'est particulièrement " +"amusant si vous changez de pose entre les prises ! Pour utiliser le " +"mode rafale :" -#: C/prev-conv.page:103(p) +#: C/pref-burst-mode.page:31(item/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." +"Click Burst, the Take a Photo button will now say " +"Take Multiple Photos." msgstr "" -"Sélectionnez un compte dans la liste déroulante en haut à gauche. Une liste " -"de contacts et de salons de discussion apparaît en dessous." +"Cliquez sur Rafale. Le bouton Prendre une photo " +"devient Prendre plusieurs photos." -#: C/prev-conv.page:107(p) +#: C/pref-burst-mode.page:33(item/p) msgid "" -"Select a contact or chat room to view your previous conversations from. By " -"default the most recent conversation will be shown." +"Alternatively, click CheeseBurst." msgstr "" -"Sélectionnez le contact ou le salon de discussion pour consulter " -"l'historique des conversations. Par défaut la conversation la plus récente " -"est affichée." +"Vous pouvez aussi cliquer sur CheeseRafale." -#: C/prev-conv.page:111(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." +#: C/pref-burst-mode.page:36(item/p) +msgid "Click Take Multiple Photos or press the spacebar." msgstr "" -"Vous pouvez parcourir vos conversations par date. Vous verrez apparaître en " -"gras les jours pour lesquels vous avez eu une conversation avec le contact " -"sélectionné. Cliquez sur un jour pour le sélectionner et sur les flèches à " -"côté du mois et de l'année pour parcourir des dates plus anciennes." +"Cliquez sur Prendre plusieurs photos ou appuyez sur la barre " +"d'espace." -#: C/prev-conv.page:117(p) +#: C/pref-burst-mode.page:38(item/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." +"By default, four photos will be taken, with a three second delay and a " +"countdown between photos." msgstr "" -"Vous pouvez rechercher du texte dans la conversation actuelle en le " -"saisissant dans la zone de saisie en haut. Le texte correspondant sera mis " -"en surbrillance." +"Par défaut, quatre photos sont prises, avec, entre chaque photo, un délai de " +"trois secondes et un compte à rebours." -#: C/prev-conv.page:121(p) +#: C/pref-burst-mode.page:43(page/p) msgid "" -"You can quickly view the previous conversations with one of your contacts " -"from the Contact List window. Simply right click the contact and " -"choose View Previous Conversations. The Previous " -"Conversations window will open with that contact already selected." +"Press Esc if you want to stop Cheese from taking " +"photos at any point." msgstr "" -"Vous pouvez rapidement afficher vos conversations précédentes avec un de vos " -"contacts à partir de la fenêtre Liste des contacts. Faites tout " -"simplement un clic droit sur le contact et choisissez Afficher les " -"conversations précédentes. La fenêtre Conversations précédentes s'ouvre directement sur le contact sélectionné." +"Appuyez sur la touche Échap quand vous le souhaitez, si vous " +"voulez que Cheese arrête de prendre des photos." -#: C/link-contacts.page:11(desc) -msgid "Merge and separate different contacts into a single one." -msgstr "Fusionner et séparer différents contacts en un seul." +#: C/pref-burst-mode.page:47(section/title) +msgid "Change how many photos are taken and the delay between them" +msgstr "Modification du nombre de photos prises et du délai entre elles" -#: C/link-contacts.page:25(title) -msgid "Combine and separate contacts" -msgstr "Fusion et séparation de contacts" - -#: C/link-contacts.page:26(p) +#: C/pref-burst-mode.page:48(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." +"You can change how many photos will be taken in each burst and the length of " +"the delay between the photos:" msgstr "" -"Si un ou plusieurs de vos contacts possèdent de nombreux comptes avec " -"différents services de messagerie, vous pouvez fusionner ces contacts en un " -"seul." +"Vous pouvez changer le nombre de photos à prendre à chaque rafale et la " +"durée du délai entre les photos :" -#: C/link-contacts.page:30(p) -msgid "" -"The resulting contact is called a meta-contact: a contact composed " -"from different single contacts." -msgstr "" -"Le contact résultant est appelé un méta-contact : un contact " -"composé de différents contacts uniques." +#: C/pref-burst-mode.page:52(item/p) C/pref-image-properties.page:30(item/p) +#: C/pref-photo-resolution.page:36(item/p) +msgid "Click EditPreferences." +msgstr "Cliquez sur ÉditionPréférences." -#: C/link-contacts.page:34(p) +#: C/pref-burst-mode.page:55(item/p) msgid "" -"If you have a Jane Smith contact that is using three different messaging " -"services like:" +"Change the options under Burst mode and click Close." msgstr "" -"Si vous avez un contact appelée Jane Smith qui utilise trois différents " -"services de messagerie comme :" - -#: 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 "vous pouvez associer ces contacts dans une unique Jane Smith." - -#: C/link-contacts.page:60(title) -msgid "Combining contacts" -msgstr "Association de contacts" - -#: C/link-contacts.page:63(p) -msgid "" -"From the Contact List window, right-click one of the contact that " -"has different accounts, and select Link Contacts...Mode rafale et cliquez sur Fermer." -msgstr "" -"Dans la fenêtre Liste des contacts, faites un clic droit sur l'un " -"des contacts qui possède plusieurs comptes et sélectionnez Lier des contacts...." - -#: C/link-contacts.page:70(p) -msgid "" -"From the left pane in the Link Contacts window, select the " -"contacts you want to combine." -msgstr "" -"Dans le panneau de gauche de la fenêtre Lier des contacts, " -"sélectionnez les contacts que vous voulez associer." -#: C/link-contacts.page:76(p) -msgid "Click Link." -msgstr "Cliquez sur Lier." - -#: C/link-contacts.page:82(p) +#: C/pref-burst-mode.page:59(note/p) msgid "" -"When a meta-contact has been created, the default contact that will be used " -"to have a conversation with when you double-click on it, is the contact with " -"the highest presence on-line." +"The delay is between the last photo taken and the start of the countdown for " +"the next photo, not between two photos." msgstr "" -"Quand un méta-contact a été créé, le contact par défaut qui sera utilisé " -"comme interlocuteur lors d'un double-clic, est le contact qui est le plus " -"souvent présent en-ligne." - -#: C/link-contacts.page:91(title) -msgid "Separating contacts" -msgstr "Séparation de contacts" +"Le délai est celui entre la dernière prise de photo et le début du compte à " +"rebours pour la photo suivante et non pas celui entre deux photos." -#: C/link-contacts.page:94(p) -msgid "" -"From the Contact List, right-click the contact to separate, and " -"select Link Contacts...." +#: C/pref-countdown.page:19(info/desc) +msgid "Remove the countdown so that photos are taken instantly." msgstr "" -"Dans la fenêtre Liste des contacts, faites un clic droit sur le " -"contact à séparer et sélectionnez Lier des " -"contacts...." - -#: C/link-contacts.page:100(p) -msgid "Click Unlink." -msgstr "Cliquez sur Séparer." +"Enlever le compte à rebours pour que les photos soient prises instantanément." -#: C/license.page:8(desc) -msgid "Legal information." -msgstr "Informations légales." +#: C/pref-countdown.page:22(page/title) +msgid "Disable the Countdown before photos are taken" +msgstr "Désactivation du retardateur avant la prise des photos" -#: C/license.page:11(title) -msgid "License" -msgstr "Licence" - -#: C/license.page:12(p) +#: C/pref-countdown.page:24(page/p) msgid "" -"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 " -"Unported license." +"By default, Cheese counts down from three before taking a photo. " +"You can disable this feature by clicking Edit " +"Preferences and unchecking Countdown." msgstr "" -"Cette œuvre est distribuée sous licence Creative Commons Paternité-Partage " -"des Conditions Initiales à l'Identique 3.0 Unported." - -#: C/license.page:20(p) -msgid "You are free:" -msgstr "Vous êtes libre :" - -#: C/license.page:25(em) -msgid "To share" -msgstr "de partager" - -#: C/license.page:26(p) -msgid "To copy, distribute and transmit the work." -msgstr "de reproduire, distribuer et communiquer cette création," - -#: C/license.page:29(em) -msgid "To remix" -msgstr "de modifier" - -#: C/license.page:30(p) -msgid "To adapt the work." -msgstr "d'adapter cette création." - -#: C/license.page:33(p) -msgid "Under the following conditions:" -msgstr "selon les conditions suivantes :" - -#: C/license.page:38(em) -msgid "Attribution" -msgstr "Paternité" +"Par défaut, Cheese affiche un compte à rebours de trois secondes " +"avant de prendre une photo. Vous pouvez l'empêcher en cliquant sur " +"Édition Préférences et en décochant " +"Retardateur." -#: C/license.page:39(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 "" -"Vous devez citer le nom de l'auteur original de la manière indiquée par " -"l'auteur de l'œuvre ou le titulaire des droits qui vous confère cette " -"autorisation (mais pas d'une manière qui suggérerait qu'ils vous soutiennent " -"ou approuvent votre utilisation de l'œuvre)." +#: C/pref-flash.page:18(info/desc) +msgid "Stop the screen from flashing white when taking a photo." +msgstr "Enlever le flash de l'écran lors de la prise de photos." -#: C/license.page:46(em) -msgid "Share Alike" -msgstr "Partage des conditions initiales à l'identique" +#: C/pref-flash.page:21(page/title) +msgid "Disable the flash" +msgstr "Désactivation du flash" -#: C/license.page:47(p) +#: C/pref-flash.page:23(page/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." +"When you take a photo with Cheese, the computer screen briefly turns white. " +"This provides additional light." msgstr "" -"Si vous modifiez, transformez ou adaptez cette création, vous n'avez le " -"droit de distribuer la création qui en résulte que sous un contrat identique " -"à celui-ci." +"Quand vous prenez une photos avec Cheese, l'écran de l'ordinateur devient " +"blanc un court instant, ce qui augmente la lumière." -#: C/license.page:53(p) +#: C/pref-flash.page:26(page/p) msgid "" -"For the full text of the license, see the CreativeCommons website, or read the full Commons Deed." +"To disable this feature, click EditPreferences and uncheck Fire Flash." msgstr "" -"Pour prendre connaissance du texte complet de la licence, consultez le site Web " -"CreativeCommons ou lisez in extenso le contrat Commons." - -#: C/irc-start-conversation.page:8(desc) -msgid "Start a conversation with an IRC contact." -msgstr "Démarrer une conversation avec un contact IRC." - -#: C/irc-start-conversation.page:30(title) -msgid "Chat with somebody on IRC" -msgstr "Discussion avec quelqu'un sur IRC" +"Pour désactiver cette fonctionnalité, cliquez sur ÉditionPréférences et décochez Utiliser le flash." -#: C/irc-start-conversation.page:32(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/pref-image-properties.page:45(media) +msgctxt "_" 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:" +"external ref='figures/image-properties.png' " +"md5='70c32a1dd7c9a20dabef58d0789f2a5a'" msgstr "" -"Vous pouvez entretenir une conversation privée avec d'autres utilisateurs " -"IRC en dehors du salon de discussion IRC public. Pour démarrer une " -"conversation avec un autre utilisateur :" +"external ref='figures/image-properties.png' " +"md5='70c32a1dd7c9a20dabef58d0789f2a5a'" -#: C/irc-start-conversation.page:37(p) +#: C/pref-image-properties.page:19(info/desc) 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 Chat." +"Adjust the saturation, contrast, brightness and hue to make photos and " +"videos look better." msgstr "" -"Dans la liste des contacts des salons de discussion IRC, double-cliquez sur " -"le nom de l'utilisateur avec qui vous souhaitez discuter. Vous pouvez " -"également faire un clic droit sur le nom de l'utilisateur et choisir " -"Discuter." +"Ajuster la saturation, le contraste, la luminosité et la teinte pour " +"améliorer vos photos et vos vidéos." -#: C/irc-start-conversation.page:45(p) -msgid "" -"The IRC room contact list is not the same as Empathy contact " -"list. It contains a list of users in the IRC chat room you joined. Different " -"rooms can have different contacts listed." -msgstr "" -"La liste des contacts des salons de discussion IRC n'est pas la même que la " -"liste des contacts d'Empathy. Elle contient une liste des " -"utilisateurs dans le salon de discussion IRC que vous avez rejoint." +#: C/pref-image-properties.page:23(page/title) +msgid "My photos and videos look wrong" +msgstr "Mes photos et vidéos n'ont pas l'air normales" -#: C/irc-start-conversation.page:52(p) +#: C/pref-image-properties.page:25(page/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 ConversationShow Contact List." -msgstr "" -"La liste des contacts des salons de discussion IRC est située sur le côté " -"droit de la fenêtre du salon IRC. Si vous ne la voyez pas, choisissez " -"ConversationAfficher la liste des contacts." - -#: C/irc-send-file.page:9(desc) -msgid "Empathy does not currently support sending files using IRC." -msgstr "" -"Empathy ne prend pas actuellement en charge l'envoi de fichiers " -"en utilisant IRC." - -#: C/irc-send-file.page:31(title) -msgid "Send files over IRC" -msgstr "Envoi de fichiers sur IRC" - -#: C/irc-send-file.page:33(p) -msgid "It is not currently possible to send files using IRC." +"If your photos or videos are too dark or the colors seem to be wrong, try " +"adjusting their saturation, contrast, brightness and hue:" msgstr "" -"Il n'est actuellement pas possible d'envoyer des fichiers en utilisant IRC." +"Si vos photos ou vos vidéos sont trop sombres ou si les couleurs ont l'air " +"fausses, essayez d'ajuster la saturation, le contraste, la luminosité et la " +"teinte :" -#: C/irc-nick-password.page:10(desc) -msgid "Protect your nickname to prevent other IRC users from using it." -msgstr "" -"Protéger votre pseudonyme pour empêcher son utilisation par d'autres " -"utilisateurs IRC." - -#: C/irc-nick-password.page:33(title) -msgid "Use a nickname password on IRC" -msgstr "Utilisation d'un mot de passe pour pseudonyme sur IRC" - -#: C/irc-nick-password.page:35(p) +#: C/pref-image-properties.page:33(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." +"Under Image properties, change the sliders to find the best " +"settings for your webcam." msgstr "" -"Sur certains réseaux IRC, vous pouvez inscrire votre pseudonyme à un service " -"appelé NickServ. En envoyant des messages particuliers à NickServ, vous " -"pouvez définir votre mot de passe et vous identifier. Certains salons de " -"discussion interdisent leur accès si votre pseudonyme n'est pas inscrit." +"Sous Propriétés de l'image, modifiez les positions des glissières " +"pour trouver les meilleurs réglages pour votre webcam." -#: C/irc-nick-password.page:40(p) +#: C/pref-image-properties.page:37(item/p) msgid "" -"Empathy does not currently support nickname registration. Some " -"IRC networks, however, will automatically forward a server password " -"to NickServ. On these networks, you can use the IRC password in " -"Empathy to identify yourself to NickServ. The popular freenode " -"network is known to have this feature." -msgstr "" -"Empathy ne prend pas en charge actuellement l'inscription des " -"pseudonymes. Cependant, certains réseaux IRC vont faire suivre " -"automatiquement un mot de passe serveur à NickServ. Sur ces " -"réseaux, vous pouvez utiliser le mot de passe IRC dans Empathy " -"pour vous identifier à NickServ. Le célèbre réseau freeNode est connu pour " -"avoir cette fonctionnalité." - -#: C/irc-nick-password.page:46(p) -msgid "To set an IRC server password:" -msgstr "Pour paramétrer un mot de passe de serveur IRC :" - -#: C/irc-nick-password.page:54(p) -msgid "Select the IRC account from the list on the left of the dialog." +"Click Close and check to see if the photos and videos look better." msgstr "" -"Sélectionnez le compte IRC dans la liste sur la gauche de la boîte de " -"dialogue." +"Cliquez sur Fermer et vérifiez que les photos et les vidéos sont " +"meilleures." -#: C/irc-nick-password.page:57(p) +#: C/pref-image-properties.page:43(figure/title) msgid "" -"In the Password field, type the password you used to register " -"your nikcname." +"Different options under Image properties (left to right): " +"applying brightness, contrast, hue and saturation" msgstr "" -"Dans le champ Mot de passe, saisissez le mot de passe que vous " -"avez utilisé pour inscrire votre pseudonyme." +"Différentes options dans Propriétés de l'image (de gauche à " +"droite) : modification de la luminosité, du contraste, de la teinte et de la " +"saturation" -#: C/irc-nick-password.page:63(p) C/import-account.page:61(p) -msgid "Click Apply." -msgstr "Cliquez sur Appliquer." +#: C/pref-image-properties.page:50(item/title) +msgid "Brightness" +msgstr "Luminosité" -#: C/irc-nick-password.page:69(p) +#: C/pref-image-properties.page:51(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 Empathy." +"Increasing the brightness will make the photos and videos lighter. However, " +"if you are in a dark room, increasing the brightness might make the image " +"look more noisy." msgstr "" -"Ces instructions ne vous permettent d'utiliser un pseudonyme protégé par mot " -"de passe que sur certains réseaux. Il n'est actuellement pas possible " -"d'inscrire un pseudonyme IRC ou de modifier le mot de passe de votre " -"pseudonyme en utilisant Empathy." +"Augmenter la luminosité rend la photo et la vidéo plus lumineuse. Cependant, " +"si vous êtes dans une pièce sombre, augmenter la luminosité augmente le " +"grain de l'image." -#: C/irc-manage.page:10(desc) -msgid "How to use IRC with Empathy." -msgstr "Comment utiliser IRC avec Empathy." +#: C/pref-image-properties.page:54(item/title) +msgid "Contrast" +msgstr "Contraste" -#: C/irc-manage.page:35(title) -msgid "Internet Relay Chat (IRC)" -msgstr "« Internet Relay Chat » (IRC)" - -#: C/irc-manage.page:38(p) C/account-irc.page:39(p) +#: C/pref-image-properties.page:55(item/p) msgid "" -"You must have the telepathy-idle package installed to use IRC in " -"Empathy." +"Setting a higher contrast will increase the difference between darker and " +"lighter colors. If the image looks washed out, try increasing the contrast." msgstr "" -"Le paquet telepathy-idle doit être installé pour utiliser IRC " -"avec Empathy." - -#: C/irc-manage.page:42(link) -msgid "Install telepathy-idle" -msgstr "Installer telepathy-idle" - -#: C/irc-manage.page:49(title) -msgid "IRC Chat Rooms and Conversations" -msgstr "Salon de discussion et conversations IRC" - -#: C/irc-manage.page:51(title) -msgid "Chat Rooms and Conversations" -msgstr "Salon de discussion et conversations" - -#: C/irc-manage.page:56(title) -msgid "Common IRC Problems" -msgstr "Problèmes IRC courants" - -#: C/irc-manage.page:58(title) C/index.page:55(title) -msgid "Common Problems" -msgstr "Problèmes courants" +"Utiliser un fort contraste augmente la différence entre les couleurs sombres " +"et claires. Si l'image a l'air délavée, essayez d'augmenter le contraste." -#: C/irc-join-room.page:8(desc) -msgid "Join an IRC channel." -msgstr "Rejoindre un canal IRC." +#: C/pref-image-properties.page:58(item/title) +msgid "Hue" +msgstr "Teinte" -#: C/irc-join-room.page:31(title) -msgid "Join an IRC chat room" -msgstr "Connexion à un salon de discussion IRC" - -#: C/irc-join-room.page:33(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 and ." -msgstr "" -"Vous pouvez rejoindre un salon de discussion IRC (également connus sous le " -"nom de canaux IRC) sur n'importe quel réseau IRC auquel vous êtes connecté. " -"Pour se connecter à un réseau IRC, consultez et " -"." - -#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p) -#: C/group-conversations.page:122(p) +#: C/pref-image-properties.page:59(item/p) msgid "" -"From the Contact List window, choose RoomJoin." +"Changing the hue of the image will add a tint to it. If image seems to be " +"the wrong color (for example, too yellow), try changing the hue." msgstr "" -"À partir de la fenêtre Liste des contacts, sélectionnez " -"SalonRejoindre." +"Modifier la teinte de l'image lui ajoute une couleur particulière. Si les " +"couleurs de l'image semblent fausses (par exemple, trop de jaune), essayez " +"de changer la teinte." -#: C/irc-join-room.page:45(p) -msgid "" -"From the Account drop-down list, select the IRC account that " -"corresponds to the network you want to use." -msgstr "" -"Dans la liste déroulante Compte, sélectionnez le compte IRC qui " -"correspond au réseau que vous voulez utiliser." +#: C/pref-image-properties.page:62(item/title) +msgid "Saturation" +msgstr "Saturation" -#: C/irc-join-room.page:51(p) +#: C/pref-image-properties.page:63(item/p) msgid "" -"In the Room text box, type the name of the channel you want to " -"join. IRC channel names start with the hash character (#)." +"Reducing the saturation makes the image less colorful. If colors seem too " +"harsh, reduce the saturation." msgstr "" -"Dans la zone de texte Salon, saisissez le nom du canal que vous " -"voulez rejoindre. Les noms de canal IRC commencent par le caractère dièse " -"(#)." +"Réduire la saturation rend l'image moins colorée. Si les couleurs semblent " +"trop accentuées, réduisez la saturation." -#: C/irc-join-room.page:57(p) -msgid "Click Join to enter the room." -msgstr "Cliquez sur Rejoindre pour entrer dans le salon." - -#: C/irc-join-room.page:64(p) +#: C/pref-photo-resolution.page:19(info/desc) msgid "" -"To join multiple rooms, you need to repeat the steps above for each room." +"The resolution of a video or photo determines how much detail you can see in " +"it, changing it will affect the file size." msgstr "" -"Pour rejoindre plusieurs salons, vous devez répéter les étapes précédentes " -"pour chaque salon." - -#: C/irc-join-pwd.page:9(desc) -msgid "Enter password-protected IRC chat rooms." -msgstr "Se connecter à un salon de discussion IRC protégé." +"La résolution d'une vidéo ou d'une photo détermine la quantité de détails " +"qu'elle contient ; la modifier affecte la taille du fichier." -#: C/irc-join-pwd.page:25(title) -msgid "Join a protected IRC chat room" -msgstr "Connexion à un salon de discussion IRC protégé" +#: C/pref-photo-resolution.page:24(page/title) +msgid "Change the capture resolution of your webcam" +msgstr "Modification de la résolution de capture de votre webcam" -#: C/irc-join-pwd.page:27(p) +#: C/pref-photo-resolution.page:26(page/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:" +"Higher resolution generally means better quality images, but photos and " +"videos with higher resolution take up more space on your hard disk. High " +"resolution videos, in particular, take up a lot of space." msgstr "" -"Sur certains réseaux IRC, des salons de discussion IRC privés sont protégés " -"par un mot de passe. Si vous le connaissez, utilisez les étapes suivantes " -"pour les rejoindre :" +"Une plus haute résolution permet généralement d'obtenir des images de " +"meilleure qualité, mais les photos et les vidéos avec une plus haute " +"résolution prennent plus de place sur le disque dur, particulièrement pour " +"les vidéos." -#: C/irc-join-pwd.page:33(p) -msgid "Join the room as normal." -msgstr "" -"Rejoignez le salon comme d'habitude." - -#: C/irc-join-pwd.page:38(p) +#: C/pref-photo-resolution.page:30(page/p) msgid "" -"Empathy will prompt you for a password. Enter the password for the IRC chat " -"room and click Join." +"If you want your images to take up less disk space, reduce the resolution of " +"your webcam. If you want better quality images, increase the resolution. To " +"change the webcam resolution:" msgstr "" -"Empathy vous demandera un mot de passe. Saisissez le mot de passe pour le " -"salon de discussion IRC et cliquez sur Rejoindre." - -#: C/irc-commands.page:7(desc) -msgid "The supported IRC commands." -msgstr "Les commandes IRC prises en charge." - -#: C/irc-commands.page:18(title) -msgid "Supported IRC commands" -msgstr "Commandes IRC prises en charge" +"Si vous voulez que vos photos prennent moins de place sur le disque, " +"réduisez la résolution de votre webcam. Si vous voulez des images de " +"meilleur qualité, augmentez la résolution. Pour modifier la résolution de la " +"webcam :" -#: C/irc-commands.page:19(p) +#: C/pref-photo-resolution.page:39(item/p) msgid "" -"To see the list of the supported IRC commands, in a chat room type /" -"help and press Enter." +"Choose a different resolution from the drop-down list. Some webcams only " +"support one resolution, so you may not have a choice." msgstr "" -"Pour afficher la liste des commandes IRC prises en charge dans un salon de " -"discussion, saisissez /help et appuyez sur Entrée." +"Choisissez une résolution différente dans la liste déroulante. Certaines " +"webcams ne prennent en charge qu'une seule résolution, il est donc possible " +"que vous n'ayez pas le choix." -#: C/irc-commands.page:24(p) -msgid "All commands available have a small description on their usage." -msgstr "L'usage de toutes les commandes disponibles est décrit succinctement." +#: C/pref-photo-resolution.page:43(item/p) +msgid "Click Close." +msgstr "Cliquez sur Fermer." -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/introduction.page:41(None) -msgid "" -"@@image: 'figures/empathy-main-window.png'; " -"md5=54908dcb2588beddb15ef0968d2c2582" +#: C/video-record.page:19(info/desc) +msgid "Use your webcam to record short movies for sharing with friends." msgstr "" -"@@image: 'figures/empathy-main-window.png'; " -"md5=54908dcb2588beddb15ef0968d2c2582" - -#: C/introduction.page:9(desc) -msgid "Introduction to the Empathy instant messenger." -msgstr "Introduction à la messagerie instantanée Empathy." - -#: C/introduction.page:21(title) -msgid "Introduction" -msgstr "Introduction" +"Utiliser sa webcam pour enregistrer des films courts pour les partager avec " +"des amis." -#: C/introduction.page:23(p) -msgid "" -"Empathy 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 "" -"Empathy est une application de messagerie instantanée pour le " -"bureau GNOME. Elle prend en charge les messages textuels, les appels audio " -"& vidéo, le transfert de fichiers et la plupart des systèmes de " -"messagerie les plus utilisés tels que MSN et Google Talk." +#: C/video-record.page:22(page/title) +msgid "Record a video" +msgstr "Enregistrement d'une vidéo" -#: C/introduction.page:28(p) -msgid "" -"Empathy includes features that help you better collaborate while " -"at work, and that let you easily keep in touch with your friends." -msgstr "" -"Empathy inclut des fonctionnalités qui vous aident à mieux " -"collaborer dans le cadre du travail et à rester facilement en contact avec " -"vos amis." +#: C/video-record.page:24(page/p) +msgid "To record a video using your webcam:" +msgstr "Pour enregistrer une vidéo à l'aide de votre webcam :" -#: C/introduction.page:32(p) +#: C/video-record.page:28(item/p) msgid "" -"Using Empathy, 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." +"Make sure that you are in Video mode. If you are, the button in " +"the middle of the window will say Start Recording." msgstr "" -"En utilisant Empathy, vous pouvez regrouper toutes les " -"conversations dans une seule fenêtre ou avoir plusieurs fenêtres pour chaque " -"type de conversation, faire des recherches dans vos conversations " -"précédentes et partager votre bureau en quelques clics." - -#: C/introduction.page:39(title) -msgid "Contact List window" -msgstr "Fenêtre Liste des contacts" - -#: C/introduction.page:40(desc) -msgid "Empathy main window" -msgstr "Fenêtre principale d'Empathy" - -#: C/introduction.page:42(p) -msgid "Empathy main window." -msgstr "Fenêtre principale d'Empathy." +"Vérifiez que vous êtes dans le Mode vidéo. Si c'est le cas, le " +"bouton de la fenêtre principale affiche Enregistrer une vidéo." -#. 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/video-record.page:30(item/p) msgid "" -"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2" +"You can switch to Video mode by clicking the button in the main " +"window or by clicking CheeseVideo." msgstr "" -"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2" - -#: C/index.page:7(title) C/index.page:8(title) -msgid "Empathy Internet Messenger" -msgstr "Messagerie internet Empathy" +"Vous pouvez passer au mode vidéo en cliquant sur le bouton de la " +"fenêtre principale ou en cliquant sur CheeseVidéo." -#: C/index.page:27(title) +#: C/video-record.page:34(item/p) msgid "" -" " -"Empathy Internet Messenger logo Empathy Internet Messenger" -msgstr "" -"Logo de Messagerie internet Empathy Messagerie internet Empathy" - -#: C/index.page:35(title) -msgid "Account Management" -msgstr "Gestion des comptes" - -#: C/index.page:39(title) -msgid "Contact Management" -msgstr "Gestion des contacts" - -#: C/index.page:43(title) -msgid "Text Conversations" -msgstr "Conversations texte" - -#: C/index.page:47(title) -msgid "Audio and Video Conversations" -msgstr "Conversations audio et vidéo" - -#: C/index.page:51(title) -msgid "Advanced Actions" -msgstr "Actions avancées" - -#: C/import-account.page:10(desc) -msgid "Import an account from another instant messaging application." +"Click Start Recording, or press the spacebar. " +"Cheese will start recording from your webcam." msgstr "" -"Importation de compte en provenance d'une autre application de messagerie " -"instantanée." - -#: C/import-account.page:19(name) -msgid "Peter Haslam" -msgstr "Peter Haslam" - -#: C/import-account.page:20(email) -msgid "peter.haslam@freenet.de" -msgstr "peter.haslam@freenet.de" - -#: C/import-account.page:42(title) -msgid "Import an existing account" -msgstr "Importation d'un compte existant" +"Cliquez sur Enregistrer une vidéo ou appuyez sur la barre " +"d'espace. Cheese démarre l'enregistrement avec votre webcam." -#: C/import-account.page:44(p) +#: C/video-record.page:38(item/p) msgid "" -"The first time you run Empathy, it will offer to import your " -"accounts from other instant messaging applications. Currently, the only " -"supported application is Pidgin." +"To stop recording, click Stop Recording or press Esc." msgstr "" -"À la première utilisation d'Empathy, il vous est proposé " -"d'importer vos comptes à partir d'autres applications de messagerie " -"instantanée. Actuellement la seule application prise en charge est " -"Pidgin." +"Pour arrêter l'enregistrement, cliquez sur Arrêter l'enregistrement ou appuyez sur Échap." -#: C/import-account.page:50(p) -msgid "" -"Run Empathy for the first time. An assistant will offer you a " -"number of options to create new accounts." +#: C/video-record.page:43(page/p) +msgid "Videos are saved in the Ogg Theora (.ogv) format." msgstr "" -"Lancer Empathy pour la première fois. Un assistant vous propose " -"un choix d'options pour créer de nouveaux comptes." +"Les vidéos sont enregistrées dans le format Ogg Theora (.ogv)." -#: C/import-account.page:54(p) +#: C/video-record.page:45(page/p) msgid "" -"Select Yes, import my account details from and click " -"Forward." +"After you have stopped recording, the video will automatically appear in the " +"photo stream at the bottom of the Cheese window. From there, you " +"can play back the video, upload it to a " +"social network, post it on your blog or YouTube channel, or share it with " +"friends by email." msgstr "" -"Choisissez Oui, importer les détails de mon compte à partir de et " -"cliquez sur Suivant." - -#: C/import-account.page:58(p) -msgid "Select the check box next to each account you wish to import." -msgstr "Cochez la case en face de chaque compte que vous souhaitez importer." +"Après avoir arrêté l'enregistrement, la vidéo apparaît automatiquement dans " +"le flux d'images en bas de la fenêtre de Cheese. À partir de " +"celui-ci, vous pouvez lire la vidéo, " +"l'envoyer vers un réseau social, la poster sur votre blog ou sur une chaîne " +"YouTube ou la partager avec des amis par courriel." -#: C/import-account.page:66(p) +#: C/video-record.page:51(page/p) msgid "" -"It is not currently possible to import accounts after you have completed the " -"first-run assistant." -msgstr "" -"Il n'est actuellement pas possible d'importer des comptes après avoir " -"terminé l'assistant de premier lancement." - -#: C/hide-contacts.page:8(desc) -msgid "Hide the offline contacts from your Contact List." -msgstr "" -"Masquer les contacts hors ligne de votre Liste des contacts." - -#: C/hide-contacts.page:19(title) -msgid "Hide offline contacts" -msgstr "Masquage des contacts hors ligne" - -#: C/hide-contacts.page:21(p) -msgid "" -"Normally, Empathy shows all your contacts: those that are online, " -"with which you can have a conversation, and also those that are offline." -msgstr "" -"Normalement, Empathy affiche tous vos contacts : ceux qui sont en " -"ligne, avec lesquels vous pouvez avoir une conversation mais aussi ceux qui " -"sont hors ligne." - -#: C/hide-contacts.page:25(p) -msgid "To hide the contacts that are offline:" -msgstr "Pour masquer les contacts qui sont hors ligne :" - -#: C/hide-contacts.page:31(p) -msgid "" -"From the Contact List window, choose ViewOffline Contacts, or press CtrlH." -msgstr "" -"À partir de la fenêtre Liste des contacts, sélectionnez " -"AffichageContacts déconnectés, ou " -"appuyez sur CtrlH." - -#: C/hide-contacts.page:36(p) -msgid "To show the offline contacts again, repeat the same procedure above." -msgstr "" -"Pour afficher à nouveau les contacts hors ligne, répétez la procédure " -"précédente." - -#: C/group-conversations.page:8(desc) -msgid "Start or join a group conversation with your contacts." -msgstr "Commencer ou rejoindre une conversation de groupe avec vos contacts." - -#: C/group-conversations.page:34(title) -msgid "Group conversations" -msgstr "Conversations de groupe" - -#: C/group-conversations.page:36(p) -msgid "" -"Group conversations permits you to have text conversations with more than " -"one contact at the same time." -msgstr "" -"Les conversations de groupe vous permettent d'avoir des conversations " -"textuelles avec plus d'un contact à la fois." - -#: C/group-conversations.page:40(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 "" -"Pour avoir une conversation de groupe, vous devez posséder un compte Jabber " -"ou Google Talk ou un compte Personnes à proximité." - -#: C/group-conversations.page:46(p) -msgid "" -"You can have a group conversation only with the contacts that are using the " -"same service as yours." -msgstr "" -"Vous ne pouvez avoir de conversation de groupe qu'avec des contacts qui " -"utilisent le même service que vous." - -#: C/group-conversations.page:54(title) -msgid "Start a group conversation" -msgstr "Démarrage d'une conversation de groupe" - -#: C/group-conversations.page:63(p) -msgid "" -"From the Account drop-down list, select the account you want to " -"use for the group conversation." -msgstr "" -"Dans la liste déroulante Compte, sélectionnez le compte que vous " -"voulez utiliser pour la conversation de groupe." - -#: C/group-conversations.page:69(p) -msgid "" -"In the Server text box, type the name of server in which the " -"conversation will be hosted." -msgstr "" -"Dans la zone de texte Serveur, saisissez le nom du serveur qui " -"hébergera la conversation." - -#: C/group-conversations.page:73(p) -msgid "Leave it empty if it will be on the current server." -msgstr "Laissez-la vide, s'il s'agit du serveur actuel." - -#: C/group-conversations.page:78(p) -msgid "" -"In the Room text box, type the name you want to give to the " -"conversation." -msgstr "" -"Dans la zone de texte Salon, saisissez le nom que vous souhaitez " -"donner à la conversation." - -#: C/group-conversations.page:82(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 " -"to create a private room." -msgstr "" -"C'est le nom du salon dans lequel vous allez avoir une conversation. Ce nom " -"sera rendu public pour que d'autres personnes le rejoignent. Il n'est pas " -"possible de créer un salon privé." - -#: C/group-conversations.page:90(p) -msgid "" -"To invite other contacts to join the group conversation, from the " -"Contact List window, select the contact you want to invite, and " -"perform one of the following:" -msgstr "" -"Pour inviter d'autres contacts à rejoindre la conversation de groupe, " -"sélectionnez dans la fenêtre Liste des contacts le contact que " -"vous souhaitez inviter et effectuez une des actions suivantes :" - -#: C/group-conversations.page:97(p) -msgid "Right-click on the contact and choose Invite to chatroom." -msgstr "" -"Cliquez droit sur le contact et choisissez Inviter à un salon de " -"discussion." - -#: C/group-conversations.page:102(p) -msgid "" -"Choose EditContactInvite to chatroom." -msgstr "" -"Choisissez ÉditionContactInviter à un " -"salon de discussion." - -#: C/group-conversations.page:107(p) -msgid "" -"If you have more than one group conversation open, select the one you want " -"to invite your contacts." -msgstr "" -"Si plusieurs conversations de groupe sont ouvertes, choisissez celle à " -"laquelle vous invitez vos contacts." - -#: C/group-conversations.page:118(title) -msgid "Join a group conversation" -msgstr "Connexion à une conversation de groupe" - -#: C/group-conversations.page:128(p) -msgid "Expand the Room List section to see all the existing rooms." -msgstr "" -"Agrandir la section liste des salons pour afficher tous les " -"salons existants." - -#: C/group-conversations.page:133(p) -msgid "Double-click on the name of a room to join it." -msgstr "Double-cliquez sur le nom d'un salon pour le rejoindre." - -#: C/group-conversations.page:139(p) -msgid "" -"It is not possible to join all existing rooms. Some of the rooms might " -"require a password, or might be invitation only. Empathy does not " -"support these kind of rooms." -msgstr "" -"Il n'est pas possible de rejoindre tous les salons existants. Il se peut que " -"certains salons demandent un mot de passe ou ne soient accessibles que sur " -"invitation. Empathy ne prend pas en charge ces types de salons." - -#: C/geolocation-what-is.page:9(desc) -msgid "Understanding geolocation." -msgstr "Comprendre la géolocalisation." - -#: C/geolocation-what-is.page:33(title) -msgid "What is geolocation" -msgstr "À propos de la géolocalisation" - -#: C/geolocation-what-is.page:35(p) -msgid "" -"Geolocation allows you to identify the real geographical location of a " -"computer or a device connected to the Internet." -msgstr "" -"La géolocalisation vous permet d'identifier la vraie position géographique " -"d'un ordinateur ou d'un appareil connecté à internet." - -#: C/geolocation-what-is.page:37(p) -msgid "With geolocation in Empathy you can:" -msgstr "Avec la géolocalisation dans Empathy vous pouvez :" - -#: C/geolocation-what-is.page:42(p) -msgid "Publish your geographical location to your contacts." -msgstr "Publier votre position géographique pour vos contacts." - -#: C/geolocation-what-is.page:47(p) -msgid "See your contacts’ geographical location and quickly contact them." -msgstr "" -"Voir la position géographique de vos contacts et les contacter rapidement." - -#: C/geolocation-what-is.page:52(p) -msgid "" -"Set the accuracy of your location and the device used to discover your " -"location." -msgstr "" -"Paramétrer la précision de votre localisation et le périphérique à utiliser " -"pour retrouver votre position." - -#: C/geolocation-what-is.page:60(p) -msgid "" -"In order to see your contacts’ geographical locations, they need to use a " -"service and an application that supports geolocation." -msgstr "" -"Afin de pouvoir voir la position géographique de vos contacts, ils doivent " -"utiliser un service et une application qui prend en charge la " -"géolocalisation." - -#: C/geolocation-turn.page:9(desc) -msgid "How to activate and deactivate geolocation in Empathy." -msgstr "" -"Comment activer ou désactiver la géolocalisation dans Empathy." - -#: C/geolocation-turn.page:33(title) -msgid "Activate/Deactivate geolocation" -msgstr "Activation/désactivation de la géolocalisation" - -#: C/geolocation-turn.page:37(p) -msgid "Choose EditPreferences." -msgstr "Choisissez ÉditionPréférences." - -#: C/geolocation-turn.page:42(p) -msgid "Select the Location tab." -msgstr "Sélectionnez l'onglet Position." - -#: C/geolocation-turn.page:47(p) -msgid "" -"Select Publish location to my contacts to activate geolocation." -msgstr "" -"Sélectionnez Publier ma position pour mes contacts pour activer " -"la géolocalisation." - -#: C/geolocation-turn.page:50(p) -msgid "To deactivate geolocation, deselect it." -msgstr "Pour désactiver la géolocalisation, désélectionnez-le." - -#: C/geolocation-turn.page:55(p) -msgid "" -"To increase the accuracy of your position, deselect Reduce location " -"accuracy." -msgstr "" -"Pour augmenter la précision de votre position, décocher Réduire la " -"précision de la position." - -#: C/geolocation-turn.page:61(p) -msgid "" -"If you have an external device like a GPS or want to send a more accurate " -"position, select the appropriate option in the Location sources " -"section." -msgstr "" -"Si vous disposez d'un périphérique externe comme un GPS ou que vous vouliez " -"envoyer une position plus précise, choisissez l'option appropriée dans la " -"section Sources de positionnement." - -#: C/geolocation-supported.page:7(desc) -msgid "Services that supports geolocation and compatibility." -msgstr "Services prenant en charge la géolocalisation et compatibilité." - -#: C/geolocation-supported.page:31(title) -msgid "Supported services" -msgstr "Services pris en charge" - -#: C/geolocation-supported.page:33(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." -msgstr "" -"La fonction de géolocalisation n'est pour le moment compatible qu'avec le " -"service Jabber. Afin de l'utiliser, vous et votre contact doivent avoir un " -"compte Jabber." - -#: C/geolocation-supported.page:39(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." -msgstr "" -"Il est aussi nécessaire que le serveur que vous utilisez actuellement prenne " -"en charge la fonction de géolocalisation. La plupart des serveurs Jabber le " -"font. Consultez la documentation sur le site Web concernant les services " -"pour plus d'informations." - -#: C/geolocation-supported.page:47(title) -msgid "Compatibility" -msgstr "Compatibilité" - -#: C/geolocation-supported.page:49(p) -msgid "" -"Empathy geolocation feature is not compatible with other " -"geographical position services such as Google Latitude, Yahoo " -"Fire Eagle or Brightkite." -msgstr "" -"La fonction de géolocalisation Empathy n'est pas compatible avec " -"d'autres services de positionnement géographique tels que Google " -"Latitude, Yahoo Fire Eagle ou Brightkite." - -#: C/geolocation-privacy.page:8(desc) -msgid "What information are sent and to who." -msgstr "Quelles informations sont envoyées et à qui." - -#: C/geolocation-privacy.page:32(title) -msgid "Geolocation Privacy" -msgstr "Confidentialité de la géolocalisation" - -#: C/geolocation-privacy.page:35(title) -msgid "What information is sent" -msgstr "Informations envoyées" - -#: C/geolocation-privacy.page:36(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." -msgstr "" -"Il est possible d'envoyer votre pays, département, ville, quartier, rue, " -"bâtiment, étage, numéro d'appartement et code postal, votre longitude, " -"latitude et altitude, votre vitesse et allure." - -#: 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 "" -"La précision et la quantité d'information sur votre position géographique " -"sont basées sur le logiciel ou l'infrastructure utilisé pour découvrir votre " -"position." - -#: C/geolocation-privacy.page:44(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." -msgstr "" -"Il se peut que différents types de réseaux possèdent des réglages de " -"précision différents et envoient des informations différentes. L'utilisation " -"de périphériques externes type GPS ou téléphone mobile augmente la précision " -"et la quantité des informations envoyées." - -#: C/geolocation-privacy.page:49(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." -msgstr "" -"Lorsque le mode confidentiel est activé, seule votre ville sera envoyée même " -"si vous utilisez un périphérique externe." - -#: C/geolocation-privacy.page:56(title) -msgid "Who can see the information sent" -msgstr "Qui peut voir les informations envoyées" - -#: C/geolocation-privacy.page:57(p) -msgid "Only your contacts can see your geographical position." -msgstr "Seul vos contacts peuvent voir votre position géographique." - -#: C/geolocation-privacy.page:63(title) -msgid "What is the privacy mode" -msgstr "Qu'est-ce que le mode confidentiel" - -#: C/geolocation-privacy.page:64(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." -msgstr "" -"Le mode confidentiel, activé par défaut, est un mode de précision réduite " -"qui va réduire la précision de la position géographique envoyée à vos " -"contacts." - -#: C/geolocation-privacy.page:71(title) -msgid "Privacy overview" -msgstr "Résumé sur la confidentialité" - -#: C/geolocation-privacy.page:72(p) -msgid "" -"Overview of the various geolocation privacy settings in Empathy." -msgstr "" -"Résumé sur les différents réglages de confidentialité de la géolocalisation " -"dans Empathy." - -#: C/geolocation-privacy.page:77(p) -msgid "Geolocation is not enabled by default." -msgstr "La géolocalisation n'est pas activée par défaut." - -#: C/geolocation-privacy.page:82(p) -msgid "Privacy mode is enabled by default." -msgstr "Le mode confidentiel est activé par défaut." - -#: C/geolocation-privacy.page:87(p) -msgid "" -"Privacy mode prevails even when using external and more precise devices." -msgstr "" -"Le mode confidentiel prévaut même en cas d'utilisation de périphériques " -"externes plus précis." - -#: C/geolocation-privacy.page:92(p) -msgid "Only your contacts can see your position." -msgstr "Seul vos contacts peuvent voir votre position." - -#: C/geolocation-not-showing.page:8(desc) -msgid "Empathy does not publish my geographical position." -msgstr "Empathy ne publie pas ma position géographique." - -#: C/geolocation-not-showing.page:32(title) -msgid "Geographical position not published" -msgstr "Position géographique non publiée" - -#: C/geolocation-not-showing.page:34(p) -msgid "" -"If your contacts cannot see your location, Empathy might not be " -"able to discover with a good margin of precision your geographical position." -msgstr "" -"Si vos contacts ne peuvent voir votre position, il est possible que " -"Empathy ne puisse pas trouver avec une bonne marge de précision " -"votre position géographique." - -#: C/geolocation-not-showing.page:38(p) -msgid "" -"In this case, your position will not be published, but you are still able to " -"see the location of your contacts." -msgstr "" -"Dans ce cas, votre position ne sera pas publiée, mais vous êtes toujours " -"capable de voir la position de vos contacts." - -#: C/geolocation-not-showing.page:42(p) -msgid "" -"If you want to publish your geographical position, you can try to use an " -"external device such as a GPS." -msgstr "" -"Si vous voulez publier votre position géographique, vous pouvez essayer " -"d'utiliser un périphérique externe tel qu'un GPS." - -#: C/geolocation-not-showing.page:48(p) -msgid "" -"In order to publish your geographical location, your Jabber server needs to " -"support the Personal Eventing Protocal (PEP). A list of servers which support " -"PEP is maintained online. Google Talk does not support this feature " -"at this time." -msgstr "" -"Afin de pouvoir publier votre position géographique, votre service Jabber " -"doit prendre en charge le protocole Personal Eventing Protocal (PEP). Une " -"liste de serveurs prenant en charge le PEP est conservée en ligne. Google " -"Talk ne prend pas actuellement en charge cette fonctionnalité." - -#: C/geolocation.page:8(desc) -msgid "Use and understand geolocation in Empathy." -msgstr "" -"Utilisation et compréhension de la géolocalisation dans Empathy." - -#: C/geolocation.page:32(title) -msgid "Geographical position" -msgstr "Position géographique" - -#: C/geolocation.page:35(title) -msgid "Geolocation" -msgstr "Géolocalisation " - -#: C/geolocation.page:39(title) -msgid "Fix common problems" -msgstr "Résolution des problèmes courants" - -#: C/favorite-rooms.page:10(desc) -msgid "Set, join and manage favorite rooms." -msgstr "Paramétrer, rejoindre et gérer vos salons favoris." - -#: C/favorite-rooms.page:29(title) -msgid "Favorite rooms" -msgstr "Salons favoris." - -#: C/favorite-rooms.page:32(title) -msgid "Set a room as a favorite" -msgstr "Paramétrage de salons favoris" - -#: C/favorite-rooms.page:35(p) -msgid "Join a room." -msgstr "Rejoignez un salon." - -#: C/favorite-rooms.page:40(p) -msgid "" -"See for more information on how to join an " -"IRC room." -msgstr "" -"Consultez pour plus d'informations sur la " -"manière de rejoindre un salon IRC." - -#: C/favorite-rooms.page:46(p) -msgid "" -"See for more information on how to " -"start or join a group conversation." -msgstr "" -"Consultez pour plus d'informations sur " -"la manière de démarrer ou rejoindre une conversation de groupe." - -#: C/favorite-rooms.page:54(p) -msgid "" -"From the conversation window, choose ConversationFavorite Chat Room." -msgstr "" -"Dans la fenêtre conversation, choisissez ConversationSalons de discussion favoris." - -#: C/favorite-rooms.page:63(title) -msgid "Join favorite rooms" -msgstr "Accès aux salons favoris" - -#: C/favorite-rooms.page:71(p) -msgid "Press F5." -msgstr "Appuyez sur F5." - -#: C/favorite-rooms.page:76(p) -msgid "" -"Choose RoomJoin Favorites, to join " -"all your favorite rooms." -msgstr "" -"Choisissez SalonJoindre les favoris, " -"pour joindre tous vos salons favoris." - -#: C/favorite-rooms.page:82(p) -msgid "Choose Room, and select the favorite room you want to join." -msgstr "" -"Choisissez Salon et sélectionnez le salon favori que vous voulez " -"joindre." - -#: 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 "" -"Pour joindre un salon favori, vous devez être connecté à internet et à votre " -"compte." - -#: C/favorite-rooms.page:98(title) -msgid "Manage favorite rooms" -msgstr "Gestion de vos salons favoris" - -#: C/favorite-rooms.page:101(p) -msgid "" -"From the Contact List window, choose RoomManage Favorites." -msgstr "" -"À partir de la fenêtre Liste des contacts, choisissez " -"SalonGérer les salons favoris." - -#: C/favorite-rooms.page:107(p) -msgid "" -"From the Account drop-down list, select the account you want to " -"manage the favorite rooms of." -msgstr "" -"Dans la liste déroulante Compte, sélectionnez le compte pour " -"lequel vous voulez gérer les salons favoris." - -#: C/favorite-rooms.page:111(p) -msgid "Select All to see all you favorite rooms." -msgstr "Sélectionnez Tous pour afficher tous vos salons favoris." - -#: C/favorite-rooms.page:116(p) -msgid "Select the favorite room you want to manage:" -msgstr "Sélectionnez le salon favori que vous voulez gérer :" - -#: C/favorite-rooms.page:121(p) -msgid "" -"Select the Auto-Connect check-box in order to automatically join " -"that room when you connect to your account." -msgstr "" -"Cochez la case Connexion automatique afin de joindre " -"automatiquement ce salon lorsque vous vous connectez à votre compte." - -#: C/favorite-rooms.page:127(p) -msgid "Click on Remove to remove the room from your favorites." -msgstr "" -"Cliquez sur Supprimer pour supprimer le salon de vos favoris." - -#: C/favorite-rooms.page:134(p) -msgid "When done, click Close." -msgstr "Lorsque vous avez terminé, cliquez sur Fermer." - -#: C/disable-account.page:9(desc) -msgid "Prevent Empathy from automatically logging in to an account." -msgstr "" -"Empêcher Empathy de se connecter automatiquement sur un compte." - -#: C/disable-account.page:39(title) -msgid "Disable an account" -msgstr "Désactivation d'un compte" - -#: C/disable-account.page:41(p) -msgid "" -"You can disable an account to prevent Empathy 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 Empathy for other accounts." -msgstr "" -"Vous pouvez désactiver un compte pour empêcher Empathy de se " -"connecter sur celui-ci sans supprimer le compte complètement. Il se peut que " -"vous vouliez désactiver et activer un compte si vous ne voulez être connecté " -"sur ce compte qu'à certain instant, mais tout en utilisant Empathy pour d'autres comptes." - -#: C/disable-account.page:52(p) -msgid "" -"Select the account you wish to disable from the accounts list on the left " -"side of the window." -msgstr "" -"Sélectionnez le compte que vous souhaitez désactiver dans la liste des " -"comptes dans la partie gauche de la fenêtre." - -#: C/disable-account.page:56(p) -msgid "" -"Deselect Enabled on the right side of the " -"window." -msgstr "" -"Décochez Activé sur le côté droit de la " -"fenêtre." - -#: C/disable-account.page:62(p) -msgid "" -"To re-enable the account, simply select Enabled." -msgstr "" -"Pour réactiver le compte, cochez tout simplement Activé." - -#: C/create-account.page:9(desc) -msgid "Register for an account with one of the supported messaging services." -msgstr "" -"S'inscrire à un compte avec l'un des services de messagerie pris en charge." - -#: C/create-account.page:34(title) -msgid "Register for a new account" -msgstr "Inscription à un nouveau compte" - -#: C/create-account.page:36(p) -msgid "" -"Most account types require you to create an account with a account provider " -"before you can connect using instant messaging applications like " -"Empathy. With some account providers, you can use Empathy to register for a new account, using the same steps as you would to " -"add an account." -msgstr "" -"Pour la plupart des comptes, il est nécessaire de créer un compte avec un " -"fournisseur de compte avant de pouvoir se connecter en utilisant des " -"applications de messagerie instantanée comme Empathy. Avec " -"certains fournisseurs de compte, vous pouvez utiliser Empathy " -"pour enregistrer un nouveau compte en utilisant les mêmes étapes que celles " -"pour Ajouter un compte." - -#: C/create-account.page:42(p) -msgid "" -"This page provides information on creating a new account for various types " -"of accounts. Your account provider should give you a login ID and a " -"password, as well as any additional information you need to connect using " -"Empathy." -msgstr "" -"Cette page fournit des informations sur la façon de créer un nouveau compte " -"pour divers types de comptes. Votre fournisseur de compte devrait vous " -"fournir un identifiant de connexion et un mot de passe ainsi que d'autres " -"informations qui peuvent être nécessaires pour se connecter en utilisant " -"Empathy." - -#: C/create-account.page:47(title) -msgid "Facebook" -msgstr "Facebook" - -#: C/create-account.page:48(p) -msgid "" -"Facebook is one of the most-used social networks. It allows users to create " -"their own profile and to communicate with their friends." -msgstr "" -"Facebook est l'un des réseaux sociaux le plus utilisé. Il permet aux " -"utilisateurs de créer leur propre profil et de communiquer avec leurs amis." - -#: C/create-account.page:52(p) -msgid "" -"To use Facebook to communicate with your friends, you will need to create a " -"new account from the website: www." -"facebook.com." -msgstr "" -"Pour utiliser Facebook pour communiquer avec vos amis, vous devez créer un " -"nouveau compte sur le site Web : www." -"facebook.com." - -#: C/create-account.page:60(title) C/audio-video.page:170(p) -msgid "Jabber" -msgstr "Jabber" - -#: C/create-account.page:62(p) -msgid "" -"Jabber is an open instant messaging system. Like email, Jabber allows you to " -"choose your account provider and communicate with all other Jabber users, " -"regardless of their account provider." -msgstr "" -"Jabber est un système de messagerie instantanée ouvert. Tout comme les " -"courriels, Jabber vous permet de choisir votre fournisseur de compte et de " -"communiquer avec tous les autres utilisateurs de Jabber, indépendamment de " -"leur fournisseur de compte." - -#: C/create-account.page:66(p) -msgid "" -"You will need to create a new account with a Jabber provider. There are many " -"free providers; one popular provider is Jabber.org." -msgstr "" -"Vous devez créer un nouveau compte avec un fournisseur Jabber. Il y a de " -"nombreux fournisseurs gratuits ; un fournisseur célèbre est Jabber.org." - -#: C/create-account.page:71(p) -msgid "" -"If you use Google Mail or Google Talk, you already have a Jabber account. " -"Google Talk is a Jabber service. Simply use your Google Mail address and " -"password in Empathy to connect." -msgstr "" -"Si vous utilisez Google Mail ou Google Talk, vous avez déjà un compte " -"Jabber. Google Talk est un service Jabber. Utilisez tout simplement votre " -"adresse électronique Google Mail et votre mot de passe dans Empathy pour vous connecter." - -#: C/create-account.page:78(title) C/audio-video.page:190(p) -msgid "People Nearby" -msgstr "Personnes à proximité" - -#: 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." -msgstr "" -"Vous n'avez pas à créer de compte avec un fournisseur de service pour " -"utiliser cette fonctionnalité. Ce service fonctionne dès l'instant où vous " -"êtes connecté à réseau local tel qu'une zone de connexion WiFi. Il recherche " -"automatiquement tous les autres utilisateurs sur le réseau qui utilisent " -"également ce service." - -#: C/create-account.page:85(p) -msgid "For more information, see ." -msgstr "Pour plus d'informations, consultez ." - -#: C/create-account.page:89(title) C/audio-video.page:205(p) -msgid "SIP" -msgstr "SIP" - -#: C/create-account.page:91(p) -msgid "" -"SIP is an open system which allows users to have audio and video " -"conversations over the Internet. You need to create an account with a SIP " -"provider. You can communicate with all other SIP users, regardless of which " -"SIP provider they use." -msgstr "" -"SIP est un système libre qui permet aux utilisateurs d'avoir des " -"conversations audio et vidéo sur internet. Vous devez créer un compte avec " -"un fournisseur SIP. Vous pouvez communiquer avec tous les autres " -"utilisateurs, quel que soit le fournisseur SIP qu'ils utilisent." - -#: C/create-account.page:97(p) -msgid "" -"Due to technical differences, the free Ekiga.net service does not currently work " -"with Empathy." -msgstr "" -"En raison de différences techniques, le service gratuit Ekiga.net ne fonctionne " -"actuellement pas avec Empathy." - -#: C/create-account.page:102(p) -msgid "" -"Some SIP providers allow you to call normal phones from your computer. " -"Generally, you will need to subscribe to a paid service for this feature." -msgstr "" -"Certains fournisseurs SIP vous autorisent à passer des appels téléphoniques " -"normaux à partir de votre ordinateur. En général, vous devez souscrire à un " -"service payant pour cette fonctionnalité." - -#: C/create-account.page:107(title) C/audio-video.page:165(p) -msgid "IRC" -msgstr "IRC" - -#: C/create-account.page:109(p) -msgid "" -"You do not need to register for an account to use IRC. Although you specify " -"a nickname when you add an IRC account to Empathy, 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 "" -"Il n'est pas nécessaire de s'inscrire à un compte pour utiliser IRC. Bien " -"que vous deviez indiquer un pseudonyme lorsque vous ajoutez un compte IRC " -"dans Empathy, ce pseudo n'est en vigueur que lorsque vous vous " -"connectez. Si un autre utilisateur est en train d'utiliser le pseudo, vous " -"devez en choisir un nouveau." - -#: C/create-account.page:114(p) -msgid "" -"Some IRC networks use a service called NickServ to allow users to protect " -"their nicknames. See for more information." -msgstr "" -"Certains réseaux IRC utilisent un service appelé NickServ pour permettre aux " -"utilisateurs de protéger leur pseudonyme. Consultez pour plus d'informations." - -#: C/create-account.page:117(p) -msgid "" -"Some IRC servers are password protected. You will need to know the password " -"to connect to these servers. Generally, these are private IRC networks." -msgstr "" -"Certains serveurs IRC sont protégés par mot de passe. Vous devez connaître " -"le mot de passe pour vous connecter à ces serveurs. En général, ce sont des " -"réseaux IRC privés." - -#: C/create-account.page:122(title) -msgid "Proprietary Services" -msgstr "Services propriétaires" - -#: C/create-account.page:124(p) -msgid "" -"There are many proprietary instant messaging services that have been " -"developed by different companies or organizations. Empathy 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 "" -"Il y a de nombreux services de messagerie instantanée propriétaires qui ont " -"été développés par différentes compagnies ou organisations. Empathy vous permet de vous connecter à un compte existant pour la plupart des " -"services populaires. Pour créer un nouveau compte avec l'un de ces services, " -"vous devez visiter le site Web du service et accepter les conditions " -"d'utilisation." - -#: C/create-account.page:133(link) C/audio-video.page:135(p) -msgid "AIM" -msgstr "AIM" - -#: C/create-account.page:138(link) C/audio-video.page:160(p) -msgid "ICQ" -msgstr "ICQ" - -#: C/create-account.page:143(link) C/audio-video.page:175(p) -msgid "MSN" -msgstr "MSN" - -#: C/create-account.page:148(link) C/audio-video.page:210(p) -msgid "Yahoo!" -msgstr "Yahoo!" - -#: C/change-status.page:9(desc) -msgid "Change your status to advertise your availability to your contacts." -msgstr "Modifier son statut pour prévenir vos contacts de votre disponibilité." - -#: C/change-status.page:34(title) -msgid "Change your status" -msgstr "Modification de votre statut" - -#: C/change-status.page:36(p) -msgid "" -"You can set your status to indicate your availability to your contacts. " -"Empathy allows you to select from a list of defined statuses." -msgstr "" -"Vous pouvez modifier votre statut pour indiquer à vos contacts votre " -"disponibilité. Empathy vous permet de choisir dans une liste de " -"statuts définis." - -#: C/change-status.page:41(p) -msgid "" -"Click on the drop-down list at the top of the Contact List window." -msgstr "" -"Cliquez sur la liste déroulante au sommet de la fenêtre Liste des " -"contacts." - -#: C/change-status.page:46(p) -msgid "Select a status from the list." -msgstr "Choisissez un statut dans la liste." - -# Bruno : Ce lien ne fonctionne pas dans la doc anglaise ! -#: C/change-status.page:52(p) -msgid "" -"See for a list of the built-in statuses and " -"what they mean. You can also add custom " -"status messages to provide more information about your availability " -"to your contacts." -msgstr "" -"Consultez pour obtenir la liste des statuts " -"prédéfinis et leur signification. Vous pouvez également ajouter des messages de statut personnalisé pour " -"donner plus d'informations à vos contacts sur votre disponibilité." - -#: C/change-status.page:58(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." -msgstr "" -"Si vous n'utilisez pas votre ordinateur pendant un certain temps ou si " -"l'économiseur d'écran est en marche, le statut sera automatiquement " -"paramétré à Absent." - -#. 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) -msgid "" -"@@image: 'figures/audio-input-microphone.png'; " -"md5=8d89026b66a263a3bc5b1f0665948567" -msgstr "" -"@@image: 'figures/audio-input-microphone.png'; " -"md5=8d89026b66a263a3bc5b1f0665948567" - -#: C/audio-video.page:8(desc) -msgid "" -"Information on when it is possible to have an audio or video conversation." -msgstr "" -"Informations sur les possibilités d'avoir une conversation audio ou vidéo." - -#: C/audio-video.page:32(title) -msgid "Audio and video support" -msgstr "Prise en charge de l'audio et de la vidéo" - -#: C/audio-video.page:34(p) -msgid "" -"You can only have audio and video conversation with contacts who are using " -"an application which also supports this feature. When your contacts support " -"audio or video conversations, you will see the following icons next to their " -"names in the contact list:" -msgstr "" -"Vous ne pouvez avoir des conversations audio et vidéo avec des contacts qui " -"utilisent une application qui prend également en charge cette fonction. " -"Lorsque vos contacts prennent en charge les conversations audio ou vidéo, " -"les icônes suivantes apparaissent à côté de leur nom dans la liste des " -"contacts :" - -#: C/audio-video.page:43(p) -msgid "Icon" -msgstr "Icône" - -#: C/audio-video.page:48(p) -msgid "Description" -msgstr "Description" - -#: C/audio-video.page:58(media) -msgid "Icon for audio conversation" -msgstr "Icône pour une conversation audio" - -#: C/audio-video.page:64(p) -msgid "The contact is able to have an audio conversation." -msgstr "Le contact est capable d'avoir une conversation audio." - -#: C/audio-video.page:70(media) -msgid "Icon for video conversation" -msgstr "Icône pour une conversation vidéo" - -#: C/audio-video.page:76(p) -msgid "The contact is able to have a video conversation." -msgstr "Le contact est capable d'avoir une conversation vidéo." - -#: C/audio-video.page:83(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." -msgstr "" -"Afin d'avoir une conversation audio, vous devez posséder une carte son prise " -"en charge par votre système d'exploitation et un microphone qui fonctionne." - -#: C/audio-video.page:87(p) -msgid "" -"In order to have a video conversation, you need to have a webcam that is " -"supported by your operating system, and a working microphone." -msgstr "" -"Afin d'avoir une conversation vidéo, vous devez posséder une webcam prise en " -"charge par votre système d'exploitation et un microphone qui fonctionne." - -#: C/audio-video.page:95(title) -msgid "Supported Account Types" -msgstr "Types de comptes pris en charge" - -#: C/audio-video.page:97(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." -msgstr "" -"Vous ne pouvez avoir des conversations audio et vidéo qu'en utilisant les " -"comptes de certains services pris en charge. Le tableau suivant indique si " -"l'audio et la vidéo sont pris en charge pour chaque type de compte." - -#: C/audio-video.page:102(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." -msgstr "" -"Les types de comptes sont fournis par des greffons. Il se peut que votre " -"système n'ait pas tous les types disponibles ou que certains types ne soient " -"pas listés ici. Des greffons mis à jour peuvent rendre possible les " -"conversations audio ou vidéo avec des types de comptes qui sont affichés " -"comme ne les prenant pas en charge ici." - -#: C/audio-video.page:110(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 asked the " -"accessibility team for input." -msgstr "" -"J'aimerais faire un tableau comme cela en utilisant rien pour Non et ✔ pour " -"Oui mais il faut que nous regardions l'impact sur l'accessibilité. J'ai " -" posé la question à l'équipe d'accessibilité pour " -"avoir des infos." - -#: C/audio-video.page:118(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 "" -"Il y a des travaux récents sur telepathy-butterfly et papyon pour prendre en " -"charge l'audio et la vidéo pour MSN. Il se peut qu'ils soient prêts à temps " -"pour 2.28 mais comme cela ne suit pas le planning de réalisation de GNOME, " -"je ne peux être sûr. Si cela a l'air d'être mis en place, alors marquons Oui." - -#: C/audio-video.page:128(p) -msgid "Service" -msgstr "Service" - -#: C/audio-video.page:129(p) -msgid "Audio" -msgstr "Audio" - -#: C/audio-video.page:130(p) -msgid "Video" -msgstr "Vidéo" - -#: 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 "Non" - -#: C/audio-video.page:140(p) -msgid "Facebook Chat" -msgstr "Conversation Facebook" - -#: C/audio-video.page:145(p) -msgid "gadugadu" -msgstr "gadugadu" - -#: C/audio-video.page:150(p) -msgid "Google Talk" -msgstr "Google Talk" - -#: 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 "Oui" - -#: C/audio-video.page:155(p) -msgid "Groupwise" -msgstr "Groupwise" - -#: C/audio-video.page:180(p) -msgid "myspace" -msgstr "myspace" - -#: C/audio-video.page:185(p) -msgid "qq" -msgstr "qq" - -#: C/audio-video.page:195(p) -msgid "sametime" -msgstr "sametime" - -#: C/audio-video.page:200(p) -msgid "silc" -msgstr "silc" - -#: C/audio-video.page:215(p) -msgid "zephyr" -msgstr "zephyr" - -#: C/audio-call.page:9(desc) -msgid "Call your contacts over the Internet." -msgstr "Appeler vos contacts sur internet." - -#: C/audio-call.page:27(title) -msgid "Start an audio conversation" -msgstr "Lancement d'une conversation audio" - -#: 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 "" -"Vous pouvez appeler vos contacts et avoir des conversations audio avec eux. " -"Cette fonctionnalité ne fonctionne qu'avec certains types de comptes et il " -"est nécessaire pour l'autre personne d'avoir une application qui prend en " -"charge les appels audio." - -#: C/audio-call.page:34(p) -msgid "" -"From the Contact List window, click the video call icon " -"next to the name of the contact you wish to call and choose Audio Call." -msgstr "" -"À partir de la fenêtre Liste des contacts, cliquez sur l'icône " -"Appel vidéo à côté du contact que vous souhaitez appeler et " -"choisissez Appel audio." - -#: C/audio-call.page:55(p) -msgid "" -"To turn an audio conversation into a video conversation, choose VideoVideo On." -msgstr "" -"Pour transformer un appel audio en conversation vidéo, choisissez " -"VidéoVidéo " -"activée." - -#: C/audio-call.page:63(title) -msgid "Start an audio conversation with a meta-contact" -msgstr "Lancement d'une conversation audio avec un méta-contact" - -#: C/audio-call.page:71(p) -msgid "" -"Select the contact you want to have the conversation, and from the menu " -"select Audio Call." -msgstr "" -"Sélectionnez le contact avec lequel vous voulez discuter et choisissez Appel audio dans le menu." - -#: C/add-contact.page:9(desc) -msgid "Add someone to the contact list." -msgstr "Ajouter quelqu'un à la liste des contacts." - -#: C/add-contact.page:33(title) -msgid "Add someone to your list of contacts" -msgstr "Ajout d'une personne à votre liste de contacts" - -#: C/add-contact.page:37(p) -msgid "Choose ChatAdd Contact." -msgstr "" -"Choisissez DiscussionAjouter un contact." - -#: C/add-contact.page:40(p) -msgid "" -"From the Account 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 "" -"À partir de la liste déroulante Compte, choisissez le compte que " -"vous souhaitez utiliser pour contacter votre contact. Votre contact devra " -"utiliser le même service que le compte sélectionné." - -#: C/add-contact.page:45(p) -msgid "" -"In the Identifier field, enter your contact’s login ID, username, " -"screen name, or other appropriate identifier for the service type." -msgstr "" -"Dans le champ Identifiant, saisissez l'identifiant de connexion " -"de votre contact, son nom d'utilisateur, son nom d'écran ou d'autres " -"identifiants appropriés pour le type de service." - -#: C/add-contact.page:49(p) -msgid "" -"In the Alias field, type your contact’s name as you would like it " -"to appear in your contact list." -msgstr "" -"Dans le champ Alias, saisissez le nom de votre contact comme vous " -"souhaitez le voir apparaître dans votre liste des contacts." - -#: C/add-contact.page:53(p) -msgid "Click Add to add the person to your list of contacts." -msgstr "" -"Cliquez sur Ajouter pour ajouter la personne dans votre liste de " -"contacts." - -#: C/add-contact.page:61(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 "" -"Pour ajouter une nouvelle personne à votre liste de contacts, vous devez " -"être connecté à internet et à votre compte." - -#: C/add-account.page:9(desc) -msgid "Add a new account to Empathy." -msgstr "Ajouter un nouveau compte à Empathy." - -#: C/add-account.page:39(title) -msgid "Add a new account" -msgstr "Ajout d'un nouveau compte" - -#: C/add-account.page:41(p) -msgid "" -"You can add instant messaging accounts from any supported service to " -"communicate with all of your contacts in Empathy. For some " -"account providers, these steps will also allow you to register for a new " -"account. For more details, see ." -msgstr "" -"Vous pouvez ajouter des comptes de messagerie instantanée de n'importe quel " -"service pris en charge pour communiquer avec tous vos contacts dans " -"Empathy. Pour certains fournisseurs de compte, ces étapes vous " -"permettront également de vous inscrire sur un nouveau compte. Pour plus de " -"détails, consultez ." - -#: C/add-account.page:52(p) -msgid "Click Add." -msgstr "Cliquez sur Ajouter." - -#: C/add-account.page:57(p) -msgid "" -"From the Protocol drop-down list, select the type of account you " -"wish to add." -msgstr "" -"Dans la liste déroulante Protocole, sélectionnez le type de " -"compte que vous voulez ajouter." - -#: C/add-account.page:61(p) -msgid "" -"If you do not already have a registered account, select Create a new " -"account on the server. This feature is not available for all account " -"types, and may not work with some account providers. See for more information." -msgstr "" -"Si vous ne vous êtes pas déjà inscrit sur un compte, choisissez Créer " -"un nouveau compte sur le serveur. Cette fonctionnalité n'est pas " -"disponible pour tous les types de compte et il se peut que cela ne " -"fonctionne pas avec certains fournisseurs de compte. Consultez pour plus d'informations." - -#: C/add-account.page:66(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 for more information." -msgstr "" -"Saisissez les informations requises. Pour la plupart des comptes, vous " -"n'aurez besoin que d'un identifiant de connexion et d'un mot de passe. Il se " -"peut que certains comptes requièrent plus d'informations. Consultez pour plus d'informations." - -#: C/add-account.page:71(p) -msgid "Click Log in." -msgstr "Cliquez sur Se connecter." - -#: C/add-account.page:78(p) -msgid "" -"To change the name that identifies the account in the Accounts " -"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 Enter when you’re finished." -msgstr "" -"Pour modifier le nom qui identifie le compte dans la fenêtre Comptes, sélectionnez le compte dans la liste sur la gauche et soit vous " -"cliquez sur le nom, soit vous appuyez sur la barre d'espace. Modifiez le nom " -"du compte et appuyez sur Entrée lorsque vous avez terminé." - -#: C/accounts-window.page:11(desc) -msgid "Add, modify, and delete accounts." -msgstr "Ajouter, modifier et supprimer des comptes." - -#: C/accounts-window.page:33(title) -msgid "Accounts Window" -msgstr "Fenêtre Comptes" - -#: C/accounts-window.page:35(p) -msgid "" -"The Accounts window allows you to add, modify, and delete " -"accounts." -msgstr "" -"La fenêtre Comptes vous permet d'ajouter, de modifier et de " -"supprimer des comptes." - -#: C/accounts-window.page:43(title) -msgid "Account Details" -msgstr "Détails de compte" - -#: C/accounts-window.page:44(p) -msgid "" -"For most types of accounts, you can simply enter a login ID and a password. " -"Certain accounts or account types, however, may require additional " -"information." -msgstr "" -"Pour la plupart des comptes, vous pouvez simplement saisir un identifiant de " -"compte et un mot de passe. Il se peut que certains comptes ou types de " -"compte requièrent cependant des informations supplémentaires." - -#: C/account-jabber.page:7(desc) -msgid "Advanced options for Jabber and Google Talk accounts." -msgstr "Options avancées pour les comptes Jabber et Google Talk." - -#: C/account-jabber.page:29(title) -msgid "Jabber account details" -msgstr "Détails de compte Jabber" - -#: C/account-jabber.page:31(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 Advanced section. Normally, you " -"will not need to use the advanced options below. For general instructions on " -"adding an account, see ." -msgstr "" -"La plupart des comptes Jabber ne requiert qu'un identifiant de connexion et " -"un mot de passe pour se connecter. Pour certains comptes ou certains types " -"de réseau, il se peut que vous deviez saisir des informations " -"supplémentaires dans la section Avancé. Normalement vous ne " -"devriez pas avoir à utiliser les options avancées ci-dessous. Pour obtenir " -"des instructions générales sur l'ajout d'un compte, consultez ." - -#: C/account-jabber.page:39(p) -msgid "" -"Google Talk is a type of Jabber account. These instructions hold for Google " -"Talk accounts as well." -msgstr "" -"Google Talk est un compte de type Jabber. Ces instructions valent donc " -"également pour les comptes Google Talk." - -#: C/account-jabber.page:45(gui) -msgid "Encryption required (TLS/SSL)" -msgstr "Chiffrement requis (TLS/SSL)" - -#: C/account-jabber.page:46(gui) -msgid "Ignore SSL certificate errors" -msgstr "Ignorer les erreurs de certificat SSL" - -#: C/account-jabber.page:47(p) -msgid "" -"Whenever possible, communication between Empathy and the Jabber " -"server is encrypted. If encrypted communication is not possible, messages " -"may be sent unencrypted. Select Encryption required to prevent " -"Empathy from communicating with the Jabber server when encryption " -"is not possible." -msgstr "" -"Lorsque c'est possible, la communication entre Empathy et le " -"serveur Jabber est chiffrée. Si la communication chiffrée n'est pas " -"possible, il se peut que les messages ne soient pas chiffrées. Sélectionnez " -"Chiffrement requis pour empêcher Empathy de " -"communiquer avec le serveur Jabber lorsque le chiffrement n'est pas possible." - -#: C/account-jabber.page:52(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 Ignore SSL certificate errors to " -"allow encrypted communication with invalid certificates." -msgstr "" -"Il se peut que certains serveurs Jabber chiffrent les données en utilisant " -"des certificats non valides ou en utilisant des certificats d'autorités " -"inconnues. Si vous faites confiance dans le serveur auquel vous êtes " -"connectés, vous pouvez sélectionner Ignorer les erreurs de certificat " -"SSL pour autoriser la communication chiffrée avec des certificats non " -"valides." - -#: C/account-jabber.page:59(gui) -msgid "Resource" -msgstr "Ressource" - -#: C/account-jabber.page:60(gui) -msgid "Priority" -msgstr "Priorité" - -#: C/account-jabber.page:61(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, Empathy will use " -"Telepathy as the resource." -msgstr "" -"Si plusieurs applications (par exemple, sur des ordinateurs différents) sont " -"connectées à votre compte en même temps, vous pouvez définir une ressource " -"pour identifier chacun d'eux de manière unique. Par défaut, Empathy utilise Telepathy comme ressource." - -#: C/account-jabber.page:65(p) -msgid "" -"You can set the priority to specify which application should receive " -"incoming messages from your contacts. New messages will be sent to the " -"application with the highest priority." -msgstr "" -"Vous pouvez définir une priorité pour indiquer quelles applications doit " -"recevoir les messages entrants de vos contacts. Les nouveaux messages seront " -"envoyés à l'application qui possède la plus haute priorité." - -#: C/account-jabber.page:70(gui) -msgid "Override server settings" -msgstr "Neutralisation des réglages de serveur " - -#: C/account-jabber.page:71(p) -msgid "" -"Empathy 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 "" -"Empathy utilise les paramètres par défaut pour se connecter au " -"serveur Jabber en fonction de votre identifiant de connexion. Pour certains " -"serveurs Jabber, vous devez saisir des paramètres de serveur personnalisés " -"manuellement. Ces réglages vous sont fournis par votre fournisseur Jabber." - -#. 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" - -#. 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/account-irc.page:8(desc) -msgid "Additional information necessary for connecting to IRC networks." -msgstr "Informations supplémentaires utiles pour se connecter aux réseaux IRC." - -#: C/account-irc.page:31(title) -msgid "IRC account details" -msgstr "Détails de comptes IRC" - -#: C/account-irc.page:33(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 "" -"Les comptes IRC ont besoin d'informations différentes des autres types de " -"comptes. Pour créer un compte IRC, vous devez indiquer au moins un réseau " -"IRC et un pseudonyme. Cette page détaille les informations que vous pouvez " -"fournir pour un compte IRC." - -#: C/account-irc.page:45(gui) C/account-irc.page:120(gui) -msgid "Network" -msgstr "Réseau" - -#: C/account-irc.page:46(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. Empathy " -"lists the most popular networks in the Network drop-down list. " -"You can add additional networks. See below." -msgstr "" -"IRC est un système ouvert qui permet aux gens de lancer des réseaux " -"IRC distincts. Chaque réseau est différent et possède ses propres " -"utilisateurs et salons de discussion. Empathy affiche les réseaux " -"les plus populaires dans la liste déroulante Réseau. Vous pouvez " -"ajouter d'autres réseaux. Consultez ci-dessous." - -#: C/account-irc.page:53(gui) -msgid "Nickname" -msgstr "Pseudonyme" - -#: C/account-irc.page:54(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 " -" you will need to change " -"your nickname." -msgstr "" -"Votre pseudonyme est un nom unique sur le réseau IRC. Seul une personne sur " -"un réseau peut utiliser un pseudonyme donné. Si vous obtenez un message " -"d'erreur qui indique , " -"vous devez modifier votre pseudonyme." - -#: C/account-irc.page:60(gui) -msgid "Password" -msgstr "Mot de passe" - -#: C/account-irc.page:61(p) -msgid "" -"Some servers, particularly those on private networks, require a password to " -"connect. If you are authorized to use the network, the network " -"administrators should provide you with a password." -msgstr "" -"Certains serveurs, plus particulièrement ceux des réseaux privés, exigent un " -"mot de passe pour se connecter. Si vous êtes autorisé à utiliser le réseau, " -"les administrateurs du réseau doivent vous fournir un mot de passe." - -#: C/account-irc.page:65(title) -msgid "NickServ Passwords" -msgstr "Mots de passe NickServ" - -#: C/account-irc.page:66(p) -msgid "" -"On some networks, nicknames can be registered using a service known as " -"NickServ. Empathy 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 for " -"more details." -msgstr "" -"Sur certains réseaux, les pseudonymes peuvent être inscrits en utilisant un " -"service connu sous le nom de NickServ. Empathy ne prend pas " -"directement en charge les mots de passe de pseudonyme. Sur certains réseaux, " -"dont le populaire réseau freeNode, les mots de passe de serveur sont " -"automatiquement envoyés à NickServ ce qui vous permet de paramétrer ce champ " -"pour vous identifier avec NickServ. Consultez pour plus de détails." - -#: C/account-irc.page:76(gui) -msgid "Real name" -msgstr "Nom réel" - -#: C/account-irc.page:77(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 "" -"Vous pouvez fournir votre véritable nom en plus de votre pseudonyme. Les " -"autres utilisateurs seront capables de le voir lorsqu'ils consultent vos " -"informations." - -#: C/account-irc.page:81(gui) -msgid "Quit message" -msgstr "Message de départ" - -#: C/account-irc.page:82(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 "" -"Lorsque vous quittez le réseau, un message de départ est envoyé à tout le " -"salon de discussion dans lequel vous êtes et à tous les utilisateurs avec " -"qui vous avez une conversation privée. Utilisez ce champ pour fournir un " -"message de départ personnalisé." - -#: C/account-irc.page:94(title) -msgid "IRC Networks" -msgstr "Réseaux IRC" - -#: C/account-irc.page:97(title) -msgid "Networks" -msgstr "Réseaux" - -#: C/account-irc.page:99(p) -msgid "" -"Empathy 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 "" -"Empathy est fourni avec une liste des réseaux IRC populaires. Si " -"vous désirez un autre réseau IRC, vous pouvez l'ajouter à la liste. Vous " -"pouvez également modifier les réseaux et les supprimer de la liste." - -#: C/account-irc.page:104(p) -msgid "" -"To add a network to the list, click Add." -msgstr "" -"Pour ajouter un réseau à la liste, cliquez sur Ajouter." - -#: C/account-irc.page:107(p) -msgid "" -"To modify a network in the list, select the network and click Edit." -msgstr "" -"Pour modifier un réseau de la liste, sélectionnez le réseau et cliquez sur " -"Modifier." - -#: C/account-irc.page:110(p) -msgid "" -"To remove a network from the list, select the network and click Remove." -msgstr "" -"Pour supprimer un réseau de la liste, sélectionnez le réseau et cliquez sur " -"Supprimer." - -#: C/account-irc.page:115(p) -msgid "" -"When adding or modifying a network, you can enter the following information:" -msgstr "" -"Lorsque vous ajoutez ou modifiez un réseau, vous pouvez fournir les " -"informations suivantes :" - -#: C/account-irc.page:121(p) -msgid "" -"This is the name of the network as you want it to appear in the list of " -"networks." -msgstr "" -"C'est le nom du réseau tel que vous souhaitez qu'il apparaisse dans la liste " -"des réseaux." - -#: C/account-irc.page:125(gui) -msgid "Charset" -msgstr "Jeu de caractères" - -#: C/account-irc.page:126(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." -msgstr "" -"Cela spécifie le codage de caractères qui est typiquement utilisé sur ce " -"réseau. Un codage de caractères est une méthode spécifique pour enregistrer " -"les caractères de manière interne dans l'ordinateur. Il y a de nombreux " -"codages de caractères et vous devez utiliser le même codage de caractères " -"que les autres utilisateurs pour lire leurs messages correctement." - -#. Translators: Recommend character encodings that are common -#. for your language. -#: C/account-irc.page:135(p) -msgid "" -"By default, Empathy 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 "" -"Par défaut, Empathy utilise UTF-8, un codage de caractère moderne " -"qui peut gérer du texte de la plupart des langues du monde. Un autre codage " -"courant pour les anglais et certaines autres langues de l'Europe de l'Ouest " -"est l'ISO-8859-1." - -#: C/account-irc.page:141(gui) -msgid "Servers" -msgstr "Serveurs" - -#: C/account-irc.page:142(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 Add and Remove buttons." -msgstr "" -"Un réseau IRC peut posséder de nombreux serveurs auxquels vous pouvez vous " -"connecter. Lorsque vous êtes connecté à un serveur sur un réseau " -"particulier, vous pouvez communiquer avec tous les utilisateurs de tous les " -"autres serveurs de ce réseau. Vous pouvez ajouter ou supprimer des serveurs " -"pour ce réseau en utilisant les boutons Ajouter et " -"Supprimer." - -#: C/account-irc.page:147(p) -msgid "" -"When a server is selected, click the field under Server or " -"Port to edit it. Alternatively, use the left and right arrow keys " -"to focus the field, and press the space bar to begin editing." -msgstr "" -"Lorsqu'un serveur est sélectionné, cliquez sur le champ en dessous de " -"Serveur ou Port pour le modifier. Vous pouvez " -"également utiliser les touches fléchées gauche et droite pour donner le " -"focus au champ et appuyer sur la barre d'espace pour commencer à saisir." - -#: C/account-irc.page:151(p) -msgid "" -"Select the check box in the SSL 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 "" -"Cochez la case dans la colonne SSL pour chiffrer toutes les " -"communications avec un serveur. Remarquez bien que cela n'empêche pas les " -"autres utilisateurs sur le réseau de voir ce que vous écrivez dans les " -"salons de discussion publics." - -#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: C/index.page:0(None) -msgid "translator-credits" +"If you have problems sharing a video with people using other operating " +"systems (like Windows or Mac OS), you may need to convert it to a different format." msgstr "" -"Claude Paroz , 2006-2007,2010\n" -"Jonathan Ernst , 2007\n" -"Robert-André Mauchin , 2007\n" -"Bruno Brouard , 2007,2011\n" -"Frédéric Péters , 2008\n" -"Rémi Peixoto , 2009" +"Si vous n'arrivez pas à partager une vidéo avec des personnes utilisant " +"d'autres systèmes d'exploitation (comme Windows ou Mac OS), vous pouvez " +"avoir besoin de les convertir " +"dans un autre format." diff --git a/help/gl/gl.po b/help/gl/gl.po index c2f0f98c..9d3405ae 100644 --- a/help/gl/gl.po +++ b/help/gl/gl.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the tomboy package. # FIRST AUTHOR , YEAR. # Fran Diéguez , 2011. -# Fran Dieguez , 2011. +# Fran Dieguez , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: tomboy gnome-2-28\n" -"POT-Creation-Date: 2011-09-08 06:13+0000\n" -"PO-Revision-Date: 2011-09-09 14:54+0200\n" +"POT-Creation-Date: 2011-12-19 21:11+0000\n" +"PO-Revision-Date: 2012-01-16 23:06+0100\n" "Last-Translator: Fran Dieguez \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" @@ -19,11 +19,8 @@ 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/video-call.page:38(None) C/audio-video.page:70(None) +#: C/video-call.page:39(None) C/audio-video.page:70(None) #: C/audio-call.page:36(None) -#| msgid "" -#| "@@image: 'figures/add-to-notebook.png'; " -#| "md5=03469ddb5137f525ac4f8318caed5532" msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" msgstr "" "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" @@ -32,12 +29,12 @@ msgstr "" msgid "Start a video conversation with one of your contacts." msgstr "Comezar unha conversa de vídeo con un dos seus contactos." -#: C/video-call.page:21(name) C/status-icons.page:16(name) +#: C/video-call.page:22(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/remove-account.page:19(name) C/prob-conn-neterror.page:19(name) +#: C/prob-conn-name.page:18(name) C/prob-conn-auth.page:21(name) +#: C/prob-conn-acctdisabled.page:19(name) C/prev-conv.page:17(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) @@ -48,18 +45,18 @@ msgstr "Comezar unha conversa de vídeo con un dos seus contactos." #: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name) #: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name) #: C/geolocation.page:17(name) C/favorite-rooms.page:14(name) -#: C/disable-account.page:20(name) C/create-account.page:19(name) +#: C/disable-account.page:21(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/add-account.page:21(name) msgid "Milo Casagrande" msgstr "Milo Casagrande" -#: C/video-call.page:22(email) C/status-icons.page:17(email) +#: C/video-call.page:23(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/remove-account.page:20(email) C/prob-conn-neterror.page:20(email) +#: C/prob-conn-name.page:19(email) C/prob-conn-auth.page:22(email) +#: C/prob-conn-acctdisabled.page:20(email) C/prev-conv.page:18(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) @@ -70,19 +67,19 @@ msgstr "Milo Casagrande" #: 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/favorite-rooms.page:15(email) C/disable-account.page:22(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) +#: C/audio-call.page:20(email) C/add-account.page:22(email) msgid "milo@ubuntu.com" msgstr "milo@ubuntu.com" -#: C/video-call.page:25(p) C/status-icons.page:24(p) +#: C/video-call.page:26(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/salut-protocol.page:22(p) C/remove-account.page:23(p) +#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:23(p) +#: C/prob-conn-name.page:22(p) C/prob-conn-auth.page:25(p) +#: C/prob-conn-acctdisabled.page:23(p) C/prev-conv.page:25(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) @@ -92,31 +89,36 @@ msgstr "milo@ubuntu.com" #: 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/favorite-rooms.page:18(p) C/disable-account.page:29(p) +#: C/create-account.page:23(p) C/change-status.page:28(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/add-account.page:29(p) C/accounts-window.page:22(p) #: C/account-jabber.page:18(p) C/account-irc.page:20(p) msgid "Creative Commons Share Alike 3.0" msgstr "Creative Commons Compartir Igual 3.0" -#: C/video-call.page:28(title) +#: C/video-call.page:29(title) msgid "Start a video conversation" msgstr "Comezar unha conversa de vídeo" -#: C/video-call.page:30(p) +#: C/video-call.page:31(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." 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 " +"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 "" -"Se ten unha cámara web poderá facer chamadas aos seus contactos e ter unha " -"conversa con vídeo con eles. Estas funcionalidades só funcionarán con certos " -"tipos de contas, e require que outra persoa teña un aplicativo que admita as " +"Se ten unha cámara web poderá facer chamadas aos seus contactos e ter unha " +"conversa con vídeo con eles. Estas funcionalidades só funcionan en certos " +"tipos de contas, e require que outra persoa teña un aplicativo que admita as " "videochamadas." -#: C/video-call.page:37(p) +#: C/video-call.page:38(p) msgid "" "From the Contact List window, click the video call icon " @@ -128,7 +130,7 @@ msgstr "" "media> ao lado do nome do contacto ao que quere chamar e seleccione Videochamada." -#: C/video-call.page:43(p) C/audio-call.page:42(p) +#: C/video-call.page:44(p) C/audio-call.page:42(p) msgid "" "A new window will open. When the connection is established, you will see " "Connected at the bottom of the window, along with the total " @@ -138,11 +140,11 @@ msgstr "" " na parte inferior da xanela, ao carón do tempo de conversa " "total." -#: C/video-call.page:48(p) C/audio-call.page:48(p) +#: C/video-call.page:49(p) C/audio-call.page:48(p) msgid "To end the conversation, click on Hang up." msgstr "Para rematar a conversa, prema sobre " -#: C/video-call.page:54(p) +#: C/video-call.page:55(p) msgid "" "To turn a video conversation into an audio conversation, choose VideoVideo Off." @@ -151,18 +153,18 @@ msgstr "" "VídeoDesactivar " "vídeo." -#: C/video-call.page:60(title) +#: C/video-call.page:61(title) msgid "Start a video conversation with a meta-contact" msgstr "Comezar unha conversa de vídeo con un metacontacto." -#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p) +#: C/video-call.page:64(p) C/send-message.page:53(p) C/audio-call.page:66(p) msgid "" "From the Contact List window, right-click on the meta-contact." msgstr "" "Desde a xanela Lista de contactos, prema co botón dereito sobre " "un metacontacto." -#: C/video-call.page:68(p) +#: C/video-call.page:69(p) msgid "" "Select the contact you want to have the conversation, and from the menu " "select Video Call." @@ -170,7 +172,7 @@ msgstr "" "Seleccione o contacto co que desexe ter unha conversa e desde o menú " "seleccione Vídeochamada." -#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p) +#: C/video-call.page:76(p) C/send-message.page:65(p) C/audio-call.page:78(p) msgid "" "To recognize if a contact is a meta-contact, move your mouse on a " "contact in the Contact List window, and stop over it for a " @@ -185,16 +187,12 @@ msgstr "" #. When image changes, this message will be marked fuzzy or untranslated for you. #. It doesn't matter what you translate it to: it's not used at all. #: C/status-icons.page:39(None) -#| msgid "" -#| "@@image: 'figures/note-template.png'; md5=49ee364d7e060de4e7a583e49a2f7db7" 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/tomboy-panel.png'; md5=37fb8231c5dece7539e3471b76ec0d00" msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a" msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a" @@ -207,8 +205,6 @@ 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/tomboy-panel.png'; md5=37fb8231c5dece7539e3471b76ec0d00" msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964" msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964" @@ -217,17 +213,17 @@ msgid "Understanding the various statuses and status icons." msgstr "Entendendo os diferentes estados e iconas de estado." #: 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/prev-conv.page:21(name) C/import-account.page:27(name) +#: C/disable-account.page:25(name) C/audio-video.page:109(cite) +#: C/audio-video.page:117(cite) C/add-account.page:25(name) +#: C/accounts-window.page:18(name) C/account-jabber.page:14(name) +#: C/account-irc.page:16(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/status-icons.page:21(email) C/prev-conv.page:22(email) +#: C/import-account.page:28(email) C/disable-account.page:26(email) +#: C/add-account.page:26(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" @@ -333,12 +329,10 @@ msgid "Ekaterina Gerasimova" msgstr "Ekaterina Gerasimova" #: C/share-desktop.page:19(email) -#| msgid "btimothy@gmail.com" msgid "kittykat3756@gmail.com" msgstr "kittykat3756@gmail.com" #: C/share-desktop.page:33(title) -#| msgid "Synchronize your notes" msgid "Share your desktop" msgstr "Compartir o seu escritorio" @@ -586,17 +580,16 @@ msgid "Send a message to one of your contacts." msgstr "Enviar unha mensaxe a un dos seus contactos." #: 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) +#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:15(name) +#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:15(name) +#: C/change-status.page:24(name) C/add-contact.page:18(name) msgid "Phil Bull" msgstr "Phil Bull" #: 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 "btimothy@gmail.com" +#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:16(email) +#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:16(email) +#: C/change-status.page:25(email) C/add-contact.page:19(email) msgid "philbull@gmail.com" msgstr "philbull@gmail.com" @@ -764,11 +757,11 @@ msgstr "" msgid "Completely remove an account from Empathy." msgstr "Quitar completamente unha conta en Empathy." -#: C/remove-account.page:33(title) +#: C/remove-account.page:34(title) msgid "Remove an account" msgstr "Eliminar unha conta" -#: C/remove-account.page:35(p) +#: C/remove-account.page:36(p) msgid "" "You can completely remove an account from Empathy if you no " "longer wish to use the account. If you wish to use the account in " @@ -779,8 +772,8 @@ msgstr "" "seguir usándoa. Se quere usar de novo a conta en Empathy no " "futuro, deberá engadir os detalles da conta de novo." -#: 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/remove-account.page:43(p) C/irc-nick-password.page:50(p) +#: C/disable-account.page:49(p) C/add-account.page:49(p) msgid "" "From the Contact List window, choose EditAccounts, or press F4." @@ -788,7 +781,7 @@ msgstr "" "Desde a xanela Lista de contactos seleccione EditarContas ou prema F4." -#: C/remove-account.page:46(p) +#: C/remove-account.page:47(p) msgid "" "Select the account you wish to remove from the accounts list on the left " "side of the window." @@ -796,11 +789,12 @@ msgstr "" "Seleccione a conta que desexa eliminar desde a lista de contas na parte " "esquerda da xanela." -#: C/remove-account.page:50(p) -msgid "Click on Remove." -msgstr "Prema Quitar." +#: C/remove-account.page:51(p) +#| msgid "Click Add." +msgid "Click -." +msgstr "Prema -." -#: C/remove-account.page:53(p) +#: C/remove-account.page:54(p) msgid "" "A dialog will be shown asking for confirmation. Click the Remove " "button to permanently remove the account." @@ -808,7 +802,7 @@ msgstr "" "Mostrarase un diálogo preguntando por unha confirmación. Prema no botón " "Eliminar para quitar a conta permanentemente." -#: C/remove-account.page:59(p) +#: C/remove-account.page:60(p) msgid "" "Even after removing an account, Empathy does not delete your " "conversation history for that account." @@ -828,10 +822,8 @@ msgstr "Problemas ao conectarse a un servizo de mensaxaría instantánea" #. 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-neterror.page:59(None) C/prob-conn-name.page:44(None) #: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None) -#| msgid "" -#| "@@image: 'figures/note-template.png'; md5=49ee364d7e060de4e7a583e49a2f7db7" msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" @@ -842,15 +834,15 @@ msgid "" msgstr "" "Aparecerá a mensaxe de erro «Erro de rede» na xanela principal." -#: C/prob-conn-neterror.page:33(title) +#: C/prob-conn-neterror.page:34(title) msgid "I get a message that says “Network error”" msgstr "Obteño unha mensaxe que mostra «Erro de rede»" -#: C/prob-conn-neterror.page:36(cite) +#: C/prob-conn-neterror.page:37(cite) msgid "shaunm" msgstr "shaunm" -#: C/prob-conn-neterror.page:37(p) +#: C/prob-conn-neterror.page:38(p) msgid "" "Empathy no longer allows you to create an IRC account without a valid nick. " "I've removed the guide link. Remove the text." @@ -858,7 +850,7 @@ msgstr "" "Empathy xa non lle permite crear unha conta de IRC sen un alcume válido. " "Quitouse a ligazón da guía. Quitar o texto." -#: C/prob-conn-neterror.page:41(p) +#: C/prob-conn-neterror.page:42(p) msgid "" "This kind of error happens when Empathy cannot communicate with " "the instant messaging service for some reason." @@ -866,7 +858,7 @@ msgstr "" "Este tipo de mensaxe sucede cando Empathy non se pode comunicar " "co servizo de mensaxaría instantánea por algunha razón." -#: C/prob-conn-neterror.page:45(p) +#: C/prob-conn-neterror.page:46(p) msgid "" "Also, this kind of error happens when you try to use an IRC account without " "setting a nickname." @@ -874,14 +866,14 @@ msgstr "" "Este tipo de erro tamén sucede cando intenta usar unha conta de IRC sen ter " "configurado o alcume" -#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p) -#: C/prob-conn-acctdisabled.page:43(p) +#: C/prob-conn-neterror.page:53(p) C/prob-conn-auth.page:45(p) +#: C/prob-conn-acctdisabled.page:44(p) msgid "" "Make sure that you are connected to the Internet, or to a local area network." msgstr "" "Asegúrese de que está conectado a Internet ou a unha rede de área local." -#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p) +#: C/prob-conn-neterror.page:58(p) C/prob-conn-name.page:43(p) #: C/prob-conn-auth.page:57(p) msgid "" "Click the Logotipo da mensaxaría instantánea EmpathyMensaxaría instantánea " "Empathy" -#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p) +#: C/prob-conn-neterror.page:64(p) C/prob-conn-acctdisabled.page:60(p) msgid "" "Check in the Advanced section that all the details are correct. " "You should be able to find these details from the website of the messaging " @@ -901,19 +893,22 @@ msgstr "" "Vostede poderá encontrar estes detalles no sitio web do seu servizo de " "mensaxería." -#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p) +#: C/prob-conn-neterror.page:79(p) C/prob-conn-name.page:65(p) +#| msgid "" +#| "Deselect the Enabled, and then select it again to try to " +#| "reconnect to the service." msgid "" -"Deselect the Enabled, and then select it again to try to " -"reconnect to the service." +"Switch the account off, and then switch it on to try to reconnect to the " +"service." msgstr "" -"Deseleccione , e seleccióneo de novo para tentar " -"reconectarse ao servizo." +"Deseleccione a conta, e selecciónea de novo para tentar reconectarse ao " +"servizo." -#: C/prob-conn-neterror.page:90(title) +#: C/prob-conn-neterror.page:87(title) msgid "Proxy support" msgstr "Compatibilidade de proxy" -#: C/prob-conn-neterror.page:91(p) +#: C/prob-conn-neterror.page:88(p) msgid "" "At the moment Empathy can not be configured to work with a proxy." msgstr "" @@ -932,11 +927,11 @@ msgstr "" "Aparecen na xanela principal unha mensaxe de erro que dice «Nome en " "uso»" -#: C/prob-conn-name.page:32(title) +#: C/prob-conn-name.page:33(title) msgid "I get a message that says “Name in use”" msgstr "Obteño unha mensaxe de erro que mostra «Nome en uso»" -#: C/prob-conn-name.page:34(p) +#: C/prob-conn-name.page:35(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 " @@ -945,11 +940,11 @@ msgstr "" "Este tipo de erro sucede cando tenta conectarse á súa conta de IRC e está " "usando un alcume que xa está usando outra persoa nesa rede en particular." -#: C/prob-conn-name.page:50(p) +#: C/prob-conn-name.page:51(p) msgid "In the Nickname text box, type a new nickname." msgstr "Na caixa de texto Alcume escriba un alcume novo." -#: C/prob-conn-name.page:55(p) +#: C/prob-conn-name.page:56(p) msgid "" "If you have registered that nickname within the network you are using, set " "the password for that nickname. For more information, see ." -#: C/prob-conn-name.page:64(p) -msgid "" -"Deselect the Enabled check-box next to the name of your account, " -"and then select it again to try to reconnect to the service." -msgstr "" -"Deseleccione , e seleccióneo de novo para tentar " -"reconectarse ao servizo." - #: C/prob-conn-auth.page:8(desc) msgid "" "An error message which says “Authentication failed” appears in " @@ -999,13 +986,21 @@ msgstr "" "conectarse. Se non ten unha conta a maioría dos servizos non lle permitirán " "que se conecte." -#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p) +#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:55(p) msgid "" "Type your username and password again to make sure that they are correct." msgstr "" "Escriba o seu nome de usuario e contrasinal de novo e asegúrese de que son " "correctos." +#: C/prob-conn-auth.page:68(p) +msgid "" +"Deselect the Enabled, and then select it again to try to " +"reconnect to the service." +msgstr "" +"Deseleccione , e seleccióneo de novo para tentar " +"reconectarse ao servizo." + #: C/prob-conn-acctdisabled.page:7(desc) msgid "" "The instant messaging account that you want to use is not enabled in the " @@ -1014,11 +1009,11 @@ msgstr "" "A conta de mensaxaría instantánea que quere usar non está activada na lista " "de contas." -#: C/prob-conn-acctdisabled.page:33(title) +#: C/prob-conn-acctdisabled.page:34(title) msgid "My account is not enabled" msgstr "A miña conta non está activada" -#: C/prob-conn-acctdisabled.page:35(p) +#: C/prob-conn-acctdisabled.page:36(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 " @@ -1028,7 +1023,7 @@ msgstr "" "lista despregábel de contas, cando tenta iniciar unha conversa nova ou " "unirse a unha charla, pode que os detalles da súa conta non sexa correctos." -#: C/prob-conn-acctdisabled.page:48(p) +#: C/prob-conn-acctdisabled.page:49(p) msgid "" "Choose EditAccounts and select the " "account that is not working." @@ -1036,37 +1031,19 @@ msgstr "" "Elixa EditarContas e seleccione a " "conta que non está funcionando." -#: C/prob-conn-acctdisabled.page:65(p) -msgid "" -"Check that the Enabled check-box is selected. " -"If it is not, select the check-box to enable the account." -msgstr "" -"Comprobe que a casilla de verificación Activada está seleccionada. Se non o está marque a casilla de verificación para " -"activar a conta." +#: C/prob-conn-acctdisabled.page:66(p) +msgid "Check that the account is switched on." +msgstr "Comprobe que a conta está activada." #: C/prev-conv.page:8(desc) msgid "Browse or search your previous conversations." msgstr "Explorar ou buscar nas súas mensaxes anteriores." -#: C/prev-conv.page:35(title) +#: C/prev-conv.page:36(title) msgid "View previous conversations" msgstr "Ver as conversas anteriores" -#: C/prev-conv.page:39(p) -msgid "" -"Highlighting text is quirky: #593733. 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 "" -"Resaltar texto é estraño #59733. Se existe un resaltado actualmente, independente " -"da selección (en amarelo, por exemplo), pódese usar o termo «resaltar». De " -"outra forma débese usar o termo «seleccionado». Siga o proceso do erro." - -#: C/prev-conv.page:46(p) +#: C/prev-conv.page:38(p) msgid "" "Empathy automatically saves all your text conversations you have " "with your contacts. You can search through all of " @@ -1078,7 +1055,7 @@ msgstr "" "súas conversas anteriores ou buscar conversas " "anteriores por contacto e data." -#: C/prev-conv.page:54(p) +#: C/prev-conv.page:46(p) msgid "" "You do not need to be connected to the Internet to view and search your " "previous conversations." @@ -1086,11 +1063,11 @@ msgstr "" "Non necesita estar conectado a Internet para ver e buscar nas súas conversas " "anteriores." -#: C/prev-conv.page:61(title) +#: C/prev-conv.page:53(title) msgid "Search previous conversations" msgstr "Buscar conversas anteriores" -#: C/prev-conv.page:63(p) +#: C/prev-conv.page:55(p) msgid "" "You can perform a full-text search through all of your previous " "conversations." @@ -1098,7 +1075,7 @@ msgstr "" "Pode realizar unha busca de texto completo sobre todas as súas conversas " "anteriores." -#: C/prev-conv.page:67(p) C/prev-conv.page:96(p) +#: C/prev-conv.page:59(p) C/prev-conv.page:87(p) msgid "" "From the Contact List window, choose ViewPrevious Conversations. Alternatively, press " @@ -1108,40 +1085,39 @@ msgstr "" "gui>Conversas previas. De forma alternativa prema " "F3." -#: C/prev-conv.page:71(p) -msgid "Select the Search tab." -msgstr "Seleccione o separador Buscar." - -#: C/prev-conv.page:74(p) +#: C/prev-conv.page:63(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." msgid "" -"In the For field, type the text you want to search for. Click " -"Find or press Enter." +"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 "" -"No campo Para escriba o texto que quere buscar. Prema " -"Buscar ou prema Intro." +"Seleccione unha conta desde a lista despregábel na parte superior. " +"Mostrarase unha lista de contactos e salas de conversa para dita conta." -#: C/prev-conv.page:78(p) +#: C/prev-conv.page:67(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 "" -"Mostrarase na lista baixo o campo de busca calquera conversa que coincida " -"cos seus termos de busca. As conversas ordénanse por data de forma " -"predefinida." +"Type the text you want to search for in the Search text field." +msgstr "Escriba o texto que quere buscar no campo de texto Buscar." -#: C/prev-conv.page:82(p) +#: C/prev-conv.page:71(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." msgid "" -"Click on a conversation to view it. Empathy will select the text " -"in the conversation that matched your search terms." +"Any conversations that matched your search terms will be shown. By default, " +"conversations are ordered by date." msgstr "" -"Prema sobre unha conversa para vela. Empathy seleccionará o texto " -"na conversa que coincida cos seus termos de busca." +"Mostrarase calquera conversa que coincida cos seus termos de busca. Por " +"omisión, as conversas ordénanse por data." -#: C/prev-conv.page:89(title) +#: C/prev-conv.page:80(title) msgid "Browse previous conversations" msgstr "Explorar as conversas anteriores" -#: C/prev-conv.page:91(p) +#: C/prev-conv.page:82(p) msgid "" "You can browse your previous conversations with your contacts or in chat " "rooms by date." @@ -1149,11 +1125,7 @@ msgstr "" "Pode examinar por data as conversas previas cos seus contactos ou en salas " "de conversa." -#: C/prev-conv.page:100(p) -msgid "Select the Conversations tab." -msgstr "Seleccione o separador Conversas." - -#: C/prev-conv.page:103(p) +#: C/prev-conv.page:91(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." @@ -1161,7 +1133,7 @@ msgstr "" "Seleccione unha conta desde a lista despregábel na parte superior esquerda. " "Mostrarase unha lista de contactos e salas de conversa para dita conta." -#: C/prev-conv.page:107(p) +#: C/prev-conv.page:95(p) msgid "" "Select a contact or chat room to view your previous conversations from. By " "default the most recent conversation will be shown." @@ -1169,7 +1141,7 @@ msgstr "" "Seleccione un contacto ou sala de conversa desde a que ver as anteriores " "conversas. Por omisión mostrarase a conversa máis recente." -#: C/prev-conv.page:111(p) +#: C/prev-conv.page:99(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 " @@ -1181,25 +1153,33 @@ msgstr "" "para seleccionala e prema nas frechas ao lado do mes e ano para explorar as " "datas máis cercanas." -#: C/prev-conv.page:117(p) +#: C/prev-conv.page:105(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." 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." +"You can search for text in the conversations by typing into the search field " +"at the top. The matching conversations will be showed." msgstr "" -"Pode buscar dentro do texto das conversas mostradas escribindo na caixa de " +"Pode buscar dentro do texto das conversas escribindo no campo de texto de " "busca na parte superior. O texto coincidente resaltarase." -#: C/prev-conv.page:121(p) +#: C/prev-conv.page:111(p) +#| msgid "" +#| "You can quickly view the previous conversations with one of your contacts " +#| "from the Contact List window. Simply right click the contact " +#| "and choose View Previous Conversations. The Previous " +#| "Conversations window will open with that contact already selected." msgid "" "You can quickly view the previous conversations with one of your contacts " "from the Contact List window. Simply right click the contact and " -"choose View Previous Conversations. The Previous " -"Conversations window will open with that contact already selected." +"choose Previous Conversations. The Previous Conversations window will open with that contact already selected." msgstr "" "Pode ver rapidamente as conversas anteriores con un dos seus contactos desde " -"a xanela Lista de contactos. Simplemente prema co botón dereito " +"a xanela Lista de contactos. Simplemente prema co botón dereito " "do rato sobre o contacto e seleccione Conversas anteriores. " -"Abrirase a xanela Ver conversas previas co contacto seleccionado." +"Abrirase a xanela Conversas anteriores co contacto seleccionado." #: C/link-contacts.page:11(desc) msgid "Merge and separate different contacts into a single one." @@ -1286,7 +1266,6 @@ msgstr "" "presencia en liña máis alta." #: C/link-contacts.page:91(title) -#| msgid "Creating Notes" msgid "Separating contacts" msgstr "Separar contactos" @@ -1344,7 +1323,6 @@ msgid "Under the following conditions:" msgstr "Baixo as seguintes condicións:" #: C/license.page:38(em) -#| msgid "Introduction" msgid "Attribution" msgstr "Atribución" @@ -1491,6 +1469,7 @@ msgstr "" "usar para rexistrar o seu alcume." #: C/irc-nick-password.page:63(p) C/import-account.page:61(p) +#: C/add-account.page:74(p) msgid "Click Apply." msgstr "Prema Aplicar." @@ -1645,9 +1624,6 @@ 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/introduction.page:41(None) -#| msgid "" -#| "@@image: 'figures/tomboy-main-menu.png'; " -#| "md5=420af676a38a074abd5431e7a07d1fec" msgid "" "@@image: 'figures/empathy-main-window.png'; " "md5=54908dcb2588beddb15ef0968d2c2582" @@ -1711,9 +1687,6 @@ msgstr "Xanela principal de Empathy." #. When image changes, this message will be marked fuzzy or untranslated for you. #. It doesn't matter what you translate it to: it's not used at all. #: C/index.page:28(None) -#| msgid "" -#| "@@image: 'figures/delete-notebook.png'; " -#| "md5=f1b41a9034715d6314ee36b66389c897" msgid "" "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2" msgstr "" @@ -1959,7 +1932,6 @@ msgstr "" "existentes." #: C/group-conversations.page:133(p) -#| msgid "Double-click on a note." msgid "Double-click on the name of a room to join it." msgstr "Prema dúas veces sobre o nome dunha sala á que queira unirse." @@ -2163,7 +2135,6 @@ msgid "Only your contacts can see your geographical position." msgstr "Só os seus contactos poden ver a súa posición xeográfica." #: C/geolocation-privacy.page:63(title) -#| msgid "What links here?" msgid "What is the privacy mode" msgstr "Que é o modo de privacidade" @@ -2313,7 +2284,6 @@ msgid "Join favorite rooms" msgstr "Unirse ás salas favoritas" #: C/favorite-rooms.page:71(p) -#| msgid "Press the Tab key." msgid "Press F5." msgstr "Prema F5." @@ -2384,11 +2354,11 @@ msgstr "Cando remate prema ." msgid "Prevent Empathy from automatically logging in to an account." msgstr "Evitar que Empathy inicie sesión automaticamente na conta." -#: C/disable-account.page:39(title) +#: C/disable-account.page:40(title) msgid "Disable an account" msgstr "Desactivar unha conta" -#: C/disable-account.page:41(p) +#: C/disable-account.page:42(p) msgid "" "You can disable an account to prevent Empathy from logging in to " "it without removing the account entirely. You may wish to disable and re-" @@ -2400,7 +2370,7 @@ msgstr "" "conta e reactivala se só quere iniciar sesión na conta de vez en cando, pero " "segue querendo usar Empathy para outras contas." -#: C/disable-account.page:52(p) +#: C/disable-account.page:53(p) msgid "" "Select the account you wish to disable from the accounts list on the left " "side of the window." @@ -2408,19 +2378,16 @@ msgstr "" "Seleccione a conta que quere desactivar desde a lista de contas na parte " "esquerda da xanela." -#: C/disable-account.page:56(p) -msgid "" -"Deselect Enabled on the right side of the " -"window." -msgstr "" -"Deseleccione Activada na parte dereita da " -"xanela." +#: C/disable-account.page:57(p) +msgid "On the right side of the window, switch it off." +msgstr "Na parte dereita da xanela, desactíveo." #: C/disable-account.page:62(p) -msgid "" -"To re-enable the account, simply select Enabled." -msgstr "Para reactivar a conta simplemente seleccione ." +#| msgid "" +#| "To re-enable the account, simply select Enabled." +msgid "To re-enable the account, switch it on." +msgstr "Para reactivar a conta simplemente actíveo." #: C/create-account.page:9(desc) msgid "Register for an account with one of the supported messaging services." @@ -2642,11 +2609,11 @@ msgid "Change your status to advertise your availability to your contacts." msgstr "" "Cambie o seu estado para avisar da súa dispoñibilidade aos seus contactos." -#: C/change-status.page:34(title) +#: C/change-status.page:39(title) msgid "Change your status" msgstr "Cambiar o seu estado" -#: C/change-status.page:36(p) +#: C/change-status.page:41(p) msgid "" "You can set your status to indicate your availability to your contacts. " "Empathy allows you to select from a list of defined statuses." @@ -2655,30 +2622,35 @@ msgstr "" "contactos Empathy permítelle seleccionar unha lista de estados " "predefinidos." -#: C/change-status.page:41(p) +#: C/change-status.page:46(p) msgid "" "Click on the drop-down list at the top of the Contact List window." msgstr "" "Prema na lista despregábel na parte superior da xanela da Lista de " "contactos." -#: C/change-status.page:46(p) +#: C/change-status.page:51(p) msgid "Select a status from the list." msgstr "Seleccione o estado desde a lista." -#: C/change-status.page:52(p) +#: C/change-status.page:57(p) +#| msgid "" +#| "See for a list of the built-in statuses and " +#| "what they mean. You can also add custom " +#| "status messages to provide more information about your " +#| "availability to your contacts." msgid "" "See for a list of the built-in statuses and " -"what they mean. You can also add custom " +"what they mean. You can also add custom " "status messages to provide more information about your availability " "to your contacts." msgstr "" "Consulte a para obter unha lista de estados " -"predefinidos e o que significan. Tamén pode engadir mensaxes de estado personalizados para fornecerlle aos " -"seus contactos máis información sobre a súa dispoñibilidade." +"predefinidos e o que significan. Tamén pode engadir mensaxes de estado personalizados para fornecerlle aos " +"seus contactos maís información sobre a sú dispoñibilidade." -#: C/change-status.page:58(p) +#: C/change-status.page:63(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." @@ -2808,7 +2780,6 @@ msgstr "" "que vai dar tempo incluirase." #: C/audio-video.page:128(p) -#| msgid "Search" msgid "Service" msgstr "Servizo" @@ -2987,11 +2958,11 @@ msgstr "" msgid "Add a new account to Empathy." msgstr "Engadir unha nova conta en Empathy." -#: C/add-account.page:39(title) +#: C/add-account.page:40(title) msgid "Add a new account" msgstr "Engadir unha nova conta" -#: C/add-account.page:41(p) +#: C/add-account.page:42(p) msgid "" "You can add instant messaging accounts from any supported service to " "communicate with all of your contacts in Empathy. For some " @@ -3004,11 +2975,12 @@ msgstr "" "conta. Para obter máis información consulte a ." -#: C/add-account.page:52(p) -msgid "Click Add." -msgstr "Prema Engadir." +#: C/add-account.page:53(p) +#| msgid "Click Add." +msgid "Click +." +msgstr "Prema +." -#: C/add-account.page:57(p) +#: C/add-account.page:58(p) msgid "" "From the Protocol drop-down list, select the type of account you " "wish to add." @@ -3016,7 +2988,7 @@ msgstr "" "Desde a lista despregábel Protocoloseleccione o tipo de conta que " "quere engadir." -#: C/add-account.page:61(p) +#: C/add-account.page:62(p) msgid "" "If you do not already have a registered account, select Create a new " "account on the server. This feature is not available for all account " @@ -3028,22 +3000,23 @@ msgstr "" "tipos de contas e pode non funcionar con algúns fornecedores de contas. Para " "obter máis información consulte a ." -#: C/add-account.page:66(p) +#: C/add-account.page:69(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 for more " +#| "information." 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 for more information." +"See for more information." msgstr "" -"Introduza a información requirida. Para a maioría das contas só necesitará " -"un ID de inicio de sesión e un contrasinal. Algunhas contas poden requirir " -"información adicional. Para obter máis información consulte a ." -#: C/add-account.page:71(p) -msgid "Click Log in." -msgstr "Prema Iniciar sesión." - -#: C/add-account.page:78(p) +#: C/add-account.page:81(p) msgid "" "To change the name that identifies the account in the Accounts " "window, select the account from the list on the left and either click on the " @@ -3154,7 +3127,6 @@ msgid "Resource" msgstr "Recurso" #: C/account-jabber.page:60(gui) -#| msgid "Print" msgid "Priority" msgstr "Prioridad" @@ -3199,17 +3171,12 @@ 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/account-irc.page:106(None) -#| msgid "" -#| "@@image: 'figures/add-to-notebook.png'; " -#| "md5=03469ddb5137f525ac4f8318caed5532" msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d" msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d" #. 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/new-notebook.png'; md5=b5645185d7fed6183b550c0dab7b72cb" msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6" msgstr "" "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6" @@ -3458,6 +3425,67 @@ msgstr "" msgid "translator-credits" msgstr "Fran Dieguez , 2011." +#~ msgid "Click on Remove." +#~ msgstr "Prema Quitar." + +#~ msgid "" +#~ "Deselect the Enabled check-box next to the name of your " +#~ "account, and then select it again to try to reconnect to the service." +#~ msgstr "" +#~ "Deseleccione , e seleccióneo de novo para tentar " +#~ "reconectarse ao servizo." + +#~ msgid "" +#~ "Check that the Enabled check-box is " +#~ "selected. If it is not, select the check-box to enable the account." +#~ msgstr "" +#~ "Comprobe que a casilla de verificación Activada está seleccionada. Se non o está marque a casilla de verificación " +#~ "para activar a conta." + +#~ msgid "" +#~ "Highlighting text is quirky: #593733. 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 "" +#~ "Resaltar texto é estraño #59733. Se existe un resaltado actualmente, " +#~ "independente da selección (en amarelo, por exemplo), pódese usar o termo " +#~ "«resaltar». De outra forma débese usar o termo «seleccionado». Siga o " +#~ "proceso do erro." + +#~ msgid "Select the Search tab." +#~ msgstr "Seleccione o separador Buscar." + +#~ msgid "" +#~ "In the For field, type the text you want to search for. Click " +#~ "Find or press Enter." +#~ msgstr "" +#~ "No campo Para escriba o texto que quere buscar. Prema " +#~ "Buscar ou prema Intro." + +#~ msgid "" +#~ "Click on a conversation to view it. Empathy will select the " +#~ "text in the conversation that matched your search terms." +#~ msgstr "" +#~ "Prema sobre unha conversa para vela. Empathy seleccionará o " +#~ "texto na conversa que coincida cos seus termos de busca." + +#~ msgid "Select the Conversations tab." +#~ msgstr "Seleccione o separador Conversas." + +#~ msgid "" +#~ "Deselect Enabled on the right side of the " +#~ "window." +#~ msgstr "" +#~ "Deseleccione Activada na parte dereita da " +#~ "xanela." + +#~ msgid "Click Log in." +#~ msgstr "Prema Iniciar sesión." + #~ msgid "" #~ "@@image: 'figures/tomboy-new-note.png'; " #~ "md5=ba337ad3ae256f3fdf79afeef82d7883" diff --git a/help/it/it.po b/help/it/it.po index 4f3b1369..b1fdecba 100644 --- a/help/it/it.po +++ b/help/it/it.po @@ -1,19 +1,20 @@ # Italian translation of empathy help. -# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This package is distributed under the same license as the empathy package. +# Milo Casagrande , 2008, 2009, 2010, 2011. # -# Milo Casagrande , 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: empathy help\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-09-29 11:54+0000\n" -"PO-Revision-Date: 2010-10-02 10:42+0200\n" +"PO-Revision-Date: 2011-12-15 22:20+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #. When image changes, this message will be marked fuzzy or untranslated for you. #. It doesn't matter what you translate it to: it's not used at all. @@ -131,7 +132,7 @@ msgstr "" "Dalla finestra Elenco contatti, fare clic sull'icona della chiamata " "video a fianco del nome del contatto da chiamare e scegliere Chiamata video." +"style=\"menuitem\">Chiamata video." #: C/video-call.page:43(p) C/audio-call.page:42(p) msgid "" @@ -749,8 +750,8 @@ 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." msgstr "" -"Il servizio «Persone nelle vicinanze» è un servizio di comunicazione privo di " -"server centrale: non è necessario connettersi e autenticarsi a un server " +"Il servizio «Persone nelle vicinanze» è un servizio di comunicazione privo " +"di server centrale: non è necessario connettersi e autenticarsi a un server " "centrale per poterlo utilizzare." #: C/salut-protocol.page:45(p) @@ -3422,11 +3423,12 @@ msgid "" "more details." msgstr "" "All'interno di alcune reti è possibile registrare i soprannomi utilizzando " -"un servizio chiamato «NickServ». Empathy non supporta direttamente " -"le password per i soprannomi, ma con alcune reti, compresa la molto diffusa " -"FreeNode, le password relative al server vengono inoltrare al «NickServ», " -"consentendo di usare questo campo per identificarsi con il «NickServ». Per " -"maggiori informazioni, consultare ." +"un servizio chiamato «NickServ». Empathy non supporta " +"direttamente le password per i soprannomi, ma con alcune reti, compresa la " +"molto diffusa FreeNode, le password relative al server vengono inoltrare al " +"«NickServ», consentendo di usare questo campo per identificarsi con il " +"«NickServ». Per maggiori informazioni, consultare ." #: C/account-irc.page:76(gui) msgid "Real name" @@ -3480,8 +3482,8 @@ msgid "" "src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add." msgstr "" "Per aggiungere una rete all'elenco, fare clic su Aggiungi." +"\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=" +"\"16\">Aggiungi." #: C/account-irc.page:107(p) msgid "" diff --git a/help/pl/pl.po b/help/pl/pl.po index 9d13261b..342520d1 100644 --- a/help/pl/pl.po +++ b/help/pl/pl.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" -"POT-Creation-Date: 2011-10-28 13:54+0000\n" +"POT-Creation-Date: 2011-12-18 15:36+0000\n" "PO-Revision-Date: 2010-03-15 21:39+0100\n" "Last-Translator: Aleksander Łukasiewicz \n" "Language-Team: Polish \n" -"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Polish\n" @@ -22,7 +22,7 @@ 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/video-call.page:38(None) C/audio-video.page:70(None) +#: C/video-call.page:39(None) C/audio-video.page:70(None) #: C/audio-call.page:36(None) msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" msgstr "" @@ -32,12 +32,12 @@ msgstr "" msgid "Start a video conversation with one of your contacts." msgstr "Rozpoczęcie wideorozmowy z jednym z kontaktów." -#: C/video-call.page:21(name) C/status-icons.page:16(name) +#: C/video-call.page:22(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/remove-account.page:18(name) C/prob-conn-neterror.page:19(name) +#: C/prob-conn-name.page:18(name) C/prob-conn-auth.page:21(name) +#: C/prob-conn-acctdisabled.page:19(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) @@ -48,18 +48,18 @@ msgstr "Rozpoczęcie wideorozmowy z jednym z kontaktów." #: 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/disable-account.page:21(name) C/create-account.page:19(name) #: C/audio-video.page:17(name) C/audio-call.page:19(name) #: C/add-account.page:20(name) msgid "Milo Casagrande" msgstr "Milo Casagrande" -#: C/video-call.page:22(email) C/status-icons.page:17(email) +#: C/video-call.page:23(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/remove-account.page:19(email) C/prob-conn-neterror.page:20(email) +#: C/prob-conn-name.page:19(email) C/prob-conn-auth.page:22(email) +#: C/prob-conn-acctdisabled.page:20(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) @@ -70,19 +70,19 @@ msgstr "Milo Casagrande" #: 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/favorite-rooms.page:15(email) C/disable-account.page:22(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/video-call.page:26(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/prob-conn.page:18(p) C/prob-conn-neterror.page:23(p) +#: C/prob-conn-name.page:22(p) C/prob-conn-auth.page:25(p) +#: C/prob-conn-acctdisabled.page:23(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) @@ -92,23 +92,23 @@ msgstr "milo@ubuntu.com" #: 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/favorite-rooms.page:18(p) C/disable-account.page:29(p) +#: C/create-account.page:23(p) C/change-status.page:28(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) msgid "Creative Commons Share Alike 3.0" msgstr "Creative Commons Na tych samych warunkach 3.0" -#: C/video-call.page:28(title) +#: C/video-call.page:29(title) msgid "Start a video conversation" msgstr "Rozpoczęcie wideorozmowy" -#: C/video-call.page:30(p) +#: C/video-call.page:31(p) #, fuzzy 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 " +"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 "" @@ -117,7 +117,7 @@ msgstr "" "rodzajami kont i wymaga, aby inna osoba posiadała program obsługujący " "wideorozmowy." -#: C/video-call.page:37(p) +#: C/video-call.page:38(p) #, fuzzy msgid "" "From the Contact List window, click the Wideorozmowa. Można również nacisnąć " "kontakt prawym przyciskiem myszy i wybrać Wideorozmowa." -#: C/video-call.page:43(p) C/audio-call.page:42(p) +#: C/video-call.page:44(p) C/audio-call.page:42(p) msgid "" "A new window will open. When the connection is established, you will see " "Connected at the bottom of the window, along with the total " @@ -140,14 +140,14 @@ msgstr "" "Zostanie otworzone nowe okno. Po ustanowieniu połączenia, na dole okna " "pojawi się komunikat Połączony wraz z czasem rozmowy." -#: C/video-call.page:48(p) C/audio-call.page:48(p) +#: C/video-call.page:49(p) C/audio-call.page:48(p) #, fuzzy msgid "To end the conversation, click on Hang up." msgstr "" "Aby zakończyć rozmowę, należy wybrać ZadzwońRozłącz." -#: C/video-call.page:54(p) +#: C/video-call.page:55(p) #, fuzzy msgid "" "To turn a video conversation into an audio conversation, choose ZadzwońRozłącz." -#: C/video-call.page:60(title) +#: C/video-call.page:61(title) #, fuzzy msgid "Start a video conversation with a meta-contact" msgstr "Rozpoczęcie wideorozmowy z jednym z kontaktów." -#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p) +#: C/video-call.page:64(p) C/send-message.page:53(p) C/audio-call.page:66(p) #, fuzzy msgid "" "From the Contact List window, right-click on the meta-contact." msgstr "" "W oknie Lista kontaktów należy kliknąć w rozwijaną listę na górze." -#: C/video-call.page:68(p) +#: C/video-call.page:69(p) #, fuzzy msgid "" "Select the contact you want to have the conversation, and from the menu " @@ -177,7 +177,7 @@ msgstr "" "Kliknąć prawym przyciskiem myszy w nazwę kontaktu, z którym chcemy nawiązać " "rozmowę i wybrać Rozmowa" -#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p) +#: C/video-call.page:76(p) C/send-message.page:65(p) C/audio-call.page:78(p) msgid "" "To recognize if a contact is a meta-contact, move your mouse on a " "contact in the Contact List window, and stop over it for a " @@ -215,7 +215,7 @@ msgstr "Znaczenie różnych stanów dostępności i ikon tych stanów." #: 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/import-account.page:27(name) C/disable-account.page:25(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) @@ -223,7 +223,7 @@ 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/import-account.page:28(email) C/disable-account.page:26(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" @@ -586,16 +586,16 @@ msgid "Send a message to one of your contacts." msgstr "Wysyłanie wiadomości do jednego z kontaktów." #: 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) +#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:15(name) +#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:15(name) +#: C/change-status.page:24(name) C/add-contact.page:18(name) msgid "Phil Bull" msgstr "Phil Bull" #: 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) +#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:16(email) +#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:16(email) +#: C/change-status.page:25(email) C/add-contact.page:19(email) msgid "philbull@gmail.com" msgstr "philbull@gmail.com" @@ -776,7 +776,7 @@ msgstr "" "danych konta." #: 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/disable-account.page:49(p) C/add-account.page:48(p) msgid "" "From the Contact List window, choose EditAccounts, or press F4." @@ -824,7 +824,7 @@ msgstr "Problemy z połączeniem z usługami komunikatora" #. 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-neterror.page:59(None) C/prob-conn-name.page:44(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" @@ -836,15 +836,15 @@ msgid "" msgstr "" "Komunikat błędu \"Błąd sieci\" wyświetlany jest w oknie głównym." -#: C/prob-conn-neterror.page:33(title) +#: C/prob-conn-neterror.page:34(title) msgid "I get a message that says “Network error”" msgstr "Pojawia się komunikat \"Błąd sieci\"" -#: C/prob-conn-neterror.page:36(cite) +#: C/prob-conn-neterror.page:37(cite) msgid "shaunm" msgstr "shaunm" -#: C/prob-conn-neterror.page:37(p) +#: C/prob-conn-neterror.page:38(p) msgid "" "Empathy no longer allows you to create an IRC account without a valid nick. " "I've removed the guide link. Remove the text." @@ -852,7 +852,7 @@ msgstr "" "Program Empathy nie pozwala już na utworzenie konta IRC bez ważnego " "pseudonimu. Link do podręcznika został usunięty. Należy usunąć tekst." -#: C/prob-conn-neterror.page:41(p) +#: C/prob-conn-neterror.page:42(p) msgid "" "This kind of error happens when Empathy cannot communicate with " "the instant messaging service for some reason." @@ -860,7 +860,7 @@ msgstr "" "Tego rodzaju błąd pojawia się, gdy program Empathy nie może, z " "pewnego powodu, połączyć się z usługą komunikatora." -#: C/prob-conn-neterror.page:45(p) +#: C/prob-conn-neterror.page:46(p) msgid "" "Also, this kind of error happens when you try to use an IRC account without " "setting a nickname." @@ -868,15 +868,15 @@ msgstr "" "Ten rodzaj błędu pojawia się także podczas próby użycia konta IRC bez " "ustawienia pseudonimu." -#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p) -#: C/prob-conn-acctdisabled.page:43(p) +#: C/prob-conn-neterror.page:53(p) C/prob-conn-auth.page:45(p) +#: C/prob-conn-acctdisabled.page:44(p) msgid "" "Make sure that you are connected to the Internet, or to a local area network." msgstr "" "Należy się upewnić, że połączenie z Internetem lub siecią lokalną zostało " "ustanowione." -#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p) +#: C/prob-conn-neterror.page:58(p) C/prob-conn-name.page:43(p) #: C/prob-conn-auth.page:57(p) msgid "" "Click the Edytuj w oknie komunikatu błędu." -#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p) +#: C/prob-conn-neterror.page:64(p) C/prob-conn-acctdisabled.page:60(p) msgid "" "Check in the Advanced section that all the details are correct. " "You should be able to find these details from the website of the messaging " @@ -895,19 +895,20 @@ msgstr "" "są poprawne. Szczegóły powinny być możliwe do sprawdzenia na stronie usługi " "komunikatora." -#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p) +#: C/prob-conn-neterror.page:79(p) C/prob-conn-name.page:65(p) +#, fuzzy msgid "" -"Deselect the Enabled, and then select it again to try to " -"reconnect to the service." +"Switch the account off, and then switch it on to try to reconnect to the " +"service." msgstr "" "Należy odznaczyć pole Włączone znajdujące się obok nazwy konta, a " "następnie wybrać je ponownie, aby ustanowić połączenie z usługą" -#: C/prob-conn-neterror.page:90(title) +#: C/prob-conn-neterror.page:87(title) msgid "Proxy support" msgstr "Obsługa serwerów proxy" -#: C/prob-conn-neterror.page:91(p) +#: C/prob-conn-neterror.page:88(p) msgid "" "At the moment Empathy can not be configured to work with a proxy." msgstr "" @@ -926,11 +927,11 @@ msgstr "" "Pojawia się komunikat błędu \"Pseudonim jest już używany\" w " "oknie głównym." -#: C/prob-conn-name.page:32(title) +#: C/prob-conn-name.page:33(title) msgid "I get a message that says “Name in use”" msgstr "Pojawia się komunikat \"Używana nazwa\"" -#: C/prob-conn-name.page:34(p) +#: C/prob-conn-name.page:35(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 " @@ -939,11 +940,11 @@ msgstr "" "Ten rodzaj błędu zdarza się podczas próby połączenia do konta IRC przy " "użyciu pseudonimu, który jest już używany przez inną osobę w danej sieci." -#: C/prob-conn-name.page:50(p) +#: C/prob-conn-name.page:51(p) msgid "In the Nickname text box, type a new nickname." msgstr "W polu Pseudonim należy wprowadzić pseudonim." -#: C/prob-conn-name.page:55(p) +#: C/prob-conn-name.page:56(p) msgid "" "If you have registered that nickname within the network you are using, set " "the password for that nickname. For more information, see ." -#: C/prob-conn-name.page:64(p) -msgid "" -"Deselect the Enabled check-box next to the name of your account, " -"and then select it again to try to reconnect to the service." -msgstr "" -"Należy odznaczyć pole Włączone znajdujące się obok nazwy konta, a " -"następnie wybrać je ponownie, aby ustanowić połączenie z usługą" - #: C/prob-conn-auth.page:8(desc) msgid "" "An error message which says “Authentication failed” appears in " @@ -992,24 +985,32 @@ msgstr "" "próbujemy się połączyć. Jeśli konto nie zostało zarejestrowane, większość " "usług nie pozwoli na połączenie." -#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p) +#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:55(p) msgid "" "Type your username and password again to make sure that they are correct." msgstr "" "Należy ponownie wprowadzić nazwę użytkownika i hasło, aby upewnić się, że są " "one poprawne." +#: C/prob-conn-auth.page:68(p) +msgid "" +"Deselect the Enabled, and then select it again to try to " +"reconnect to the service." +msgstr "" +"Należy odznaczyć pole Włączone znajdujące się obok nazwy konta, a " +"następnie wybrać je ponownie, aby ustanowić połączenie z usługą" + #: 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 "Konto, którego chcemy użyć, nie jest włączone na liście kont." -#: C/prob-conn-acctdisabled.page:33(title) +#: C/prob-conn-acctdisabled.page:34(title) msgid "My account is not enabled" msgstr "Konto nie jest włączone" -#: C/prob-conn-acctdisabled.page:35(p) +#: C/prob-conn-acctdisabled.page:36(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 " @@ -1019,7 +1020,7 @@ msgstr "" "rozwijanej liście kont podczas rozpoczynania nowej rozmowy lub dołączania do " "pokoju, szczegóły tego konta mogą nie być poprawne." -#: C/prob-conn-acctdisabled.page:48(p) +#: C/prob-conn-acctdisabled.page:49(p) msgid "" "Choose EditAccounts and select the " "account that is not working." @@ -1027,15 +1028,9 @@ msgstr "" "Należy wybrać EdycjaKonta i zaznaczyć " "konto, które nie działa." -#: C/prob-conn-acctdisabled.page:65(p) -#, fuzzy -msgid "" -"Check that the Enabled check-box is selected. " -"If it is not, select the check-box to enable the account." +#: C/prob-conn-acctdisabled.page:66(p) +msgid "Check that the account is switched on." msgstr "" -"Należy upewnić się, że pole wyboru Włączone " -"jest zaznaczone. Jeśli nie jest, należy zaznaczyć pole wyboru, aby włączyć " -"konto." #: C/prev-conv.page:8(desc) msgid "Browse or search your previous conversations." @@ -1549,7 +1544,7 @@ msgid "" "gui>Join." msgstr "" "W oknie Listy kontaktów należy wybrać PokójDołącz..." +"gui>Dołącz...." #: C/irc-join-room.page:45(p) msgid "" @@ -1918,8 +1913,8 @@ msgid "" "Choose EditContactInvite to chatroom." msgstr "" -"Należy wybrać EdycjaKontaktZaproś do pokoju " -"rozmowy." +"Należy wybrać EdycjaKontaktZaproś do " +"pokoju rozmowy." #: C/group-conversations.page:107(p) msgid "" @@ -2382,11 +2377,11 @@ msgstr "" "Należy wyłączyć w programie Empathy funkcję automatycznego " "logowania na koncie." -#: C/disable-account.page:39(title) +#: C/disable-account.page:40(title) msgid "Disable an account" msgstr "Wyłączanie konta" -#: C/disable-account.page:41(p) +#: C/disable-account.page:42(p) msgid "" "You can disable an account to prevent Empathy from logging in to " "it without removing the account entirely. You may wish to disable and re-" @@ -2398,7 +2393,7 @@ msgstr "" "się czasami na to konto zalogować, ale chcemy używać programu Empathy do obsługi innych kont." -#: C/disable-account.page:52(p) +#: C/disable-account.page:53(p) msgid "" "Select the account you wish to disable from the accounts list on the left " "side of the window." @@ -2406,18 +2401,13 @@ msgstr "" "Należy zaznaczyć konto, które chcemy wyłączyć na liście kont po lewej " "stronie okna." -#: C/disable-account.page:56(p) -msgid "" -"Deselect Enabled on the right side of the " -"window." +#: C/disable-account.page:57(p) +msgid "On the right side of the window, switch it off." msgstr "" -"Należy odznaczyć pole Włączone po prawej " -"stronie okna." #: C/disable-account.page:62(p) -msgid "" -"To re-enable the account, simply select Enabled." +#, fuzzy +msgid "To re-enable the account, switch it on." msgstr "" "Aby ponownie włączyć konto należy jedynie zaznaczyć pole Włączone." @@ -2635,11 +2625,11 @@ msgstr "Yahoo!" msgid "Change your status to advertise your availability to your contacts." msgstr "Należy zmienić stan, aby ogłosić swoim kontaktom dostępność." -#: C/change-status.page:34(title) +#: C/change-status.page:39(title) msgid "Change your status" msgstr "Zmiana stanu dostępności" -#: C/change-status.page:36(p) +#: C/change-status.page:41(p) msgid "" "You can set your status to indicate your availability to your contacts. " "Empathy allows you to select from a list of defined statuses." @@ -2647,20 +2637,21 @@ msgstr "" "Można ustawić stan, aby pokazać swoją dostępność dla kontaktów. Program " "Empathy pozwala na wybór z listy zdefiniowanych stanów." -#: C/change-status.page:41(p) +#: C/change-status.page:46(p) msgid "" "Click on the drop-down list at the top of the Contact List window." msgstr "" "Należy wybrać z rozwijanej listy na górze okna Listy kontaktów." -#: C/change-status.page:46(p) +#: C/change-status.page:51(p) msgid "Select a status from the list." msgstr "Należy wybrać stan dostępności z listy." -#: C/change-status.page:52(p) +#: C/change-status.page:57(p) +#, fuzzy msgid "" "See for a list of the built-in statuses and " -"what they mean. You can also add custom " +"what they mean. You can also add custom " "status messages to provide more information about your availability " "to your contacts." msgstr "" @@ -2669,7 +2660,7 @@ msgstr "" "custom-message\">dodać własny stan, aby wyświetlać więcej informacji " "o swojej dostępności dla kontaktów." -#: C/change-status.page:58(p) +#: C/change-status.page:63(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." @@ -3258,7 +3249,7 @@ msgid "" msgstr "" "Pseudonim jest jedyny w sieci IRC. Tylko jedna osoba może uzyskać dany " "pseudonim. Jeśli pojawi się komunikat błędu mówiący, że , należy zmienić pseudonim." +"conn-name\" role=\"error-msg\"/>, należy zmienić pseudonim." #: C/account-irc.page:60(gui) msgid "Password" @@ -3368,8 +3359,8 @@ msgid "" "height=\"16\">Remove." msgstr "" "Aby usunąć sieć z listy, należy wybrać sieć i nacisnąć na Usuń." +"\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16" +"\">Usuń." #: C/account-irc.page:115(p) msgid "" diff --git a/help/sl/sl.po b/help/sl/sl.po index ec80885f..61dea1f5 100644 --- a/help/sl/sl.po +++ b/help/sl/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Empathy manual\n" -"POT-Creation-Date: 2011-07-19 20:27+0000\n" +"POT-Creation-Date: 2012-01-10 13:23+0000\n" "PO-Revision-Date: \n" "Last-Translator: Andrej ŽnidarÅ¡ič \n" "Language-Team: Slovenian GNOME Translation Team \n" @@ -19,7 +19,7 @@ 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/video-call.page:38(None) +#: C/video-call.page:39(None) #: C/audio-video.page:70(None) #: C/audio-call.page:36(None) msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" @@ -29,23 +29,23 @@ msgstr "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" msgid "Start a video conversation with one of your contacts." msgstr "Začnite video pogovor z enim od vaÅ¡ih stikov" -#: C/video-call.page:21(name) +#: C/video-call.page:22(name) #: C/status-icons.page:16(name) -#: C/share-desktop.page:13(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/remove-account.page:19(name) +#: C/prob-conn-neterror.page:19(name) +#: C/prob-conn-name.page:18(name) #: C/prob-conn-auth.page:21(name) -#: C/prob-conn-acctdisabled.page:18(name) -#: C/prev-conv.page:16(name) +#: C/prob-conn-acctdisabled.page:19(name) +#: C/prev-conv.page:17(name) #: C/link-contacts.page:15(name) #: C/irc-start-conversation.page:15(name) #: C/irc-send-file.page:16(name) #: C/irc-nick-password.page:18(name) -#: C/irc-manage.page:19(name) +#: C/irc-manage.page:20(name) #: C/irc-join-room.page:16(name) #: C/irc-join-pwd.page:17(name) #: C/irc-commands.page:10(name) @@ -61,31 +61,31 @@ msgstr "Začnite video pogovor z enim od vaÅ¡ih stikov" #: 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/disable-account.page:21(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/add-account.page:21(name) msgid "Milo Casagrande" msgstr "Milo Casagrande" -#: C/video-call.page:22(email) +#: C/video-call.page:23(email) #: C/status-icons.page:17(email) -#: C/share-desktop.page:14(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/remove-account.page:20(email) +#: C/prob-conn-neterror.page:20(email) +#: C/prob-conn-name.page:19(email) #: C/prob-conn-auth.page:22(email) -#: C/prob-conn-acctdisabled.page:19(email) -#: C/prev-conv.page:17(email) +#: C/prob-conn-acctdisabled.page:20(email) +#: C/prev-conv.page:18(email) #: C/link-contacts.page:16(email) #: C/irc-start-conversation.page:16(email) #: C/irc-send-file.page:17(email) #: C/irc-nick-password.page:19(email) -#: C/irc-manage.page:20(email) +#: C/irc-manage.page:21(email) #: C/irc-join-room.page:17(email) #: C/irc-join-pwd.page:18(email) #: C/irc-commands.page:11(email) @@ -101,33 +101,33 @@ msgstr "Milo Casagrande" #: 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/disable-account.page:22(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) +#: C/add-account.page:22(email) msgid "milo@ubuntu.com" msgstr "milo@ubuntu.com" -#: C/video-call.page:25(p) +#: C/video-call.page:26(p) #: C/status-icons.page:24(p) -#: C/share-desktop.page:17(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/remove-account.page:23(p) #: C/prob-conn.page:18(p) -#: C/prob-conn-neterror.page:22(p) -#: C/prob-conn-name.page:21(p) +#: C/prob-conn-neterror.page:23(p) +#: C/prob-conn-name.page:22(p) #: C/prob-conn-auth.page:25(p) -#: C/prob-conn-acctdisabled.page:22(p) -#: C/prev-conv.page:24(p) +#: C/prob-conn-acctdisabled.page:23(p) +#: C/prev-conv.page:25(p) #: C/link-contacts.page:19(p) #: C/irc-start-conversation.page:19(p) #: C/irc-send-file.page:20(p) #: C/irc-nick-password.page:22(p) -#: C/irc-manage.page:23(p) +#: C/irc-manage.page:24(p) #: C/irc-join-room.page:20(p) #: C/irc-join-pwd.page:21(p) #: C/irc-commands.page:14(p) @@ -143,60 +143,60 @@ msgstr "milo@ubuntu.com" #: 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/disable-account.page:29(p) #: C/create-account.page:23(p) -#: C/change-status.page:23(p) +#: C/change-status.page:28(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/add-account.page:29(p) #: C/accounts-window.page:22(p) #: C/account-jabber.page:18(p) #: C/account-irc.page:20(p) msgid "Creative Commons Share Alike 3.0" msgstr "Dovoljenje Creative Commons - deljenje pod istimi pogoji 3.0" -#: C/video-call.page:28(title) +#: C/video-call.page:29(title) msgid "Start a video conversation" msgstr "Začenjanje video konference" -#: 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." +#: C/video-call.page:31(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 accounts, and it requires the other person to have an application that supports video calls." msgstr "V primeru da imate spletno kamero, lahko svoje stike pokličite in imate z njimi video pogovor. Ta zmožnost deluje le z določenimi vrstami računov in zahteva, da ima druga oseba program, ki podpira video klice." -#: C/video-call.page:37(p) +#: C/video-call.page:38(p) msgid "From the Contact List window, click the video call icon next to the name of the contact you wish to call and choose Video Call." msgstr "V oknu Seznam stikov kliknite ikono video klic poleg imena stika, ki ga želite poklicati, in izberite Video klic. Namesto tega lahko desno kliknete na stik in izberete Video klic. " -#: C/video-call.page:43(p) +#: C/video-call.page:44(p) #: C/audio-call.page:42(p) msgid "A new window will open. When the connection is established, you will see Connected at the bottom of the window, along with the total conversation time." -msgstr "Odprlo se bo novo okno. Ko je povezava vzpostavljena boste na dnu okna videli Povezano skupaj s celotnim časom pogovora." +msgstr "Odprlo se bo novo okno. Ko je povezava vzpostavljena boste na dnu okna videli Povezano skupaj s celotnim časom pogovora." -#: C/video-call.page:48(p) +#: C/video-call.page:49(p) #: C/audio-call.page:48(p) msgid "To end the conversation, click on Hang up." msgstr "Za končanje pogovora izberite KlicOdloži." -#: C/video-call.page:54(p) +#: C/video-call.page:55(p) msgid "To turn a video conversation into an audio conversation, choose VideoVideo Off." msgstr "Za pretvorbo video pogovora v zvočni pogovor izberite VideoIzklopi." -#: C/video-call.page:60(title) +#: C/video-call.page:61(title) msgid "Start a video conversation with a meta-contact" msgstr "Začnite video pogovor z enim od svojih meta-stikov" -#: C/video-call.page:63(p) +#: C/video-call.page:64(p) #: C/send-message.page:53(p) #: C/audio-call.page:66(p) msgid "From the Contact List window, right-click on the meta-contact." msgstr "V oknu Seznam stikov desno kliknite na meta-stik." -#: C/video-call.page:68(p) +#: C/video-call.page:69(p) msgid "Select the contact you want to have the conversation, and from the menu select Video Call." msgstr "Desno kliknite na ime stika s katerim želite imeti pogovor in izberite Klepet." -#: C/video-call.page:75(p) +#: C/video-call.page:76(p) #: C/send-message.page:65(p) #: C/audio-call.page:78(p) msgid "To recognize if a contact is a meta-contact, move your mouse on a contact in the Contact List 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." @@ -233,13 +233,12 @@ msgstr "Razumevanje različnih stanj in ikon stanja." #: 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/prev-conv.page:21(name) #: C/import-account.page:27(name) -#: C/disable-account.page:24(name) +#: C/disable-account.page:25(name) #: C/audio-video.page:109(cite) #: C/audio-video.page:117(cite) -#: C/add-account.page:24(name) +#: C/add-account.page:25(name) #: C/accounts-window.page:18(name) #: C/account-jabber.page:14(name) #: C/account-irc.page:16(name) @@ -247,10 +246,10 @@ msgid "Shaun McCance" msgstr "Shaun McCance" #: C/status-icons.page:21(email) -#: C/prev-conv.page:21(email) +#: C/prev-conv.page:22(email) #: C/import-account.page:28(email) -#: C/disable-account.page:25(email) -#: C/add-account.page:25(email) +#: C/disable-account.page:26(email) +#: C/add-account.page:26(email) #: C/accounts-window.page:19(email) #: C/account-jabber.page:15(email) #: C/account-irc.page:17(email) @@ -319,49 +318,59 @@ msgid "Setting your status to Offline disconnects you from all of your msgstr "Nastavitev vaÅ¡ega stanja na Nepovezano prekine povezavo z vsemi vaÅ¡imi računi." #: C/share-desktop.page:7(desc) -msgid "Share the desktop with your contacts." -msgstr "Dajanje namizja v souporabo s stiki." +msgid "Show your desktop to your contacts." +msgstr "Dajte namizje v souporabo s svojimi stiki." -#: C/share-desktop.page:28(title) +#: C/share-desktop.page:18(name) +msgid "Ekaterina Gerasimova" +msgstr "Ekaterina Gerasimova" + +#: C/share-desktop.page:19(email) +msgid "kittykat3756@gmail.com" +msgstr "kittykat3756@gmail.com" + +#: C/share-desktop.page:33(title) msgid "Share your desktop" msgstr "Dajte vaÅ¡e namizje v souporabo" -#: C/share-desktop.page:30(p) -msgid "It is possible, with some of your contacts, to share your desktop with them, or to start using your contacts desktop. You can use this functionality to show your desktop to your contacts, to ask for help or to help your contacts resolve a problem." -msgstr "Z nekaterimi stiki je mogoče dati svoje namizje v souporabo ali začeti uporabljati njihovo namizje. To zmožnost lahko uporabljate za prikaz svojega namizja vaÅ¡im stikom, za iskanje pomoči ali za pomoč svojim stikom pri reÅ¡evanju težav." +#: C/share-desktop.page:35(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." +msgstr "Z nekaterimi stiki je mogoče dati svoje namizje v souporabo ali začeti uporabljati njihovo namizje. To zmožnost lahko uporabljate za prikaz svojega namizja vaÅ¡im stikom, za iskanje pomoči ali za pomoč svojim stikom pri odpravljanju težav." -#: C/share-desktop.page:38(p) -msgid "In order to be able to share your desktop or to remotely use your contacts desktop, it is necessary to have a remote desktop viewer application installed in your system." -msgstr "Za souporabo svojega namizja ali za oddaljeno uporabo namizja svojega stika morate imeti na svojemu sistemu nameščen program oddaljenega pregledovalnika namizja." +#: C/share-desktop.page:42(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. Vino, the GNOME VNC server, has the required support." +msgstr "Za zmožnost souporabe namizja boste morali imeti nameščen strežnik VNC z ustrezno podporo. Vino, GNOME strežnik VNC ima zahtevano podporo." -#: C/share-desktop.page:46(p) -#: C/send-file.page:40(p) -#: C/favorite-rooms.page:66(p) -msgid "From the Contact List window, perform one of the following:" +#: C/share-desktop.page:51(p) +msgid "From the Contact List window, do one of the following:" msgstr "V oknu Seznam stikov izvedite eno od naslednjega:" -#: C/share-desktop.page:51(p) -msgid "Select the contact you want to share your desktop with, and choose EditContactShare my desktop." +#: C/share-desktop.page:56(p) +msgid "Select the contact you want to share your desktop with and choose EditContactShare My Desktop." msgstr "Izberite stik kateremu želite dati svoje namizje v souporabo in izberite UrediStikDaj moje namizje v souporabo." -#: C/share-desktop.page:57(p) -msgid "Right-click on the name of the contact you want to share your desktop with, and select Share my desktop." +#: C/share-desktop.page:63(p) +msgid "Right-click on the name of the contact you want to share your desktop with and select Share My Desktop." msgstr "Desno kliknite na ime stika kateremu želite dati namizje v souporabo in izberite Daj moje namizje v souporabo." -#: C/share-desktop.page:65(p) -msgid "A request will be sent to the contact you want to share your desktop with. If they accept, the default remote desktop viewer application will be launched in order to permit you to disconnect the user that is controlling your desktop." -msgstr "VaÅ¡emu stiku bo poslana zahteva za souporabo namizja. V primeru da zahtevo sprejme, se bo zagnal privzeti oddaljeni pregledovalnik namizja, ki vam bo omogočal prekinitev povezave z uporabnikom, ki nadzira vaÅ¡e namizje." +#: C/share-desktop.page:71(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 "Povabilo za ogled vaÅ¡ega namizja bo bilo poslano izbranemu stiku. Za ogled vaÅ¡ega namizja ga bo moral sprejeti." + +#: C/share-desktop.page:77(p) +msgid "You can disconnect the contact from your computer using your desktop sharing application." +msgstr "Povezavo stika s svojim oddaljenim namizjem lahko prekinete s programom souporabe namizja." -#: C/share-desktop.page:70(p) -msgid "For more information about how to use the remote desktop viewer application, refer to its help." +#: C/share-desktop.page:82(p) +msgid "For more information about how to use the remote desktop sharing application, refer to its help." msgstr "Za več podrobnosti kako uporabiti program oddaljenega pregledovalnika namizja se sklicujte na pomoč." -#: C/share-desktop.page:77(p) +#: C/share-desktop.page:90(p) msgid "When you share your desktop with someone else, it is possible to experience system performance slowdown and low Internet speed." msgstr "Ko svoje namizje date v souporabo z nekom drugim, boste morda opazili upočasnjeno delovanje sistema in nizko hitrost medmrežja." -#: C/share-desktop.page:83(p) -msgid "Not all your contacts might be able to support this functionality. It is necessary for them to have at least the 2.28 version of Empathy and a remote desktop viewer application installed in their system." +#: C/share-desktop.page:96(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 Empathy and a compatible remote desktop viewer application installed in their system." msgstr "Vsi stiki morda ne podpirajo te zmožnosti. Stiki morajo imeti vsaj Empathy različico 2.28 in na svojemu sistemu nameščen program pregledovalnika oddaljenega namizja." #: C/set-custom-status.page:9(desc) @@ -472,10 +481,10 @@ msgstr "PoÅ¡ljite sporočilo enemu od vaÅ¡ih stikov." #: 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-neterror.page:15(name) #: C/prob-conn-auth.page:17(name) -#: C/prob-conn-acctdisabled.page:14(name) -#: C/change-status.page:19(name) +#: C/prob-conn-acctdisabled.page:15(name) +#: C/change-status.page:24(name) #: C/add-contact.page:18(name) msgid "Phil Bull" msgstr "Phil Bull" @@ -483,10 +492,10 @@ msgstr "Phil Bull" #: 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-neterror.page:16(email) #: C/prob-conn-auth.page:18(email) -#: C/prob-conn-acctdisabled.page:15(email) -#: C/change-status.page:20(email) +#: C/prob-conn-acctdisabled.page:16(email) +#: C/change-status.page:25(email) #: C/add-contact.page:19(email) msgid "philbull@gmail.com" msgstr "philbull@gmail.com" @@ -519,6 +528,11 @@ msgstr "PoÅ¡ljite datoteko s svojega računalnika enemu od svojih stikov." msgid "Send files" msgstr "PoÅ¡iljanje datotek" +#: C/send-file.page:40(p) +#: C/favorite-rooms.page:66(p) +msgid "From the Contact List window, perform one of the following:" +msgstr "V oknu Seznam stikov izvedite eno od naslednjega:" + #: C/send-file.page:45(p) msgid "Right click on the contact you want to send a file to, and choose Send file." msgstr "Desno kliknite na stik, kateremu želite poslati datoteko in izberite PoÅ¡lji datoteko." @@ -564,8 +578,9 @@ msgid "What is People Nearby?" msgstr "Kaj je \"Ljudje v bližini\"?" #: C/salut-protocol.page:37(p) +#, fuzzy msgid "I'd like to see this played up a bit more." -msgstr "" +msgstr "?" #: C/salut-protocol.page:40(p) msgid "The People Nearby service is a serverless communication service: you do not need to connect and authenticate to a central server in order to use it." @@ -587,34 +602,34 @@ msgstr "Vsa novejÅ¡a krajevna omrežja bi morala podpirati to vrsto storitve." msgid "Completely remove an account from Empathy." msgstr "Popolnoma odstrani račun iz Empathy." -#: C/remove-account.page:33(title) +#: C/remove-account.page:34(title) msgid "Remove an account" msgstr "Odstranitev računa" -#: C/remove-account.page:35(p) +#: C/remove-account.page:36(p) msgid "You can completely remove an account from Empathy if you no longer wish to use the account. If you wish to use the account in Empathy again in the future, you will have to add your account details again." msgstr "V primeru da računa ne želite več uporabljati, lahko račun popolnoma odstranite iz Empathy. V primeru da želite v prihodnosti račun v Empathy ponovno uporabljati boste morali ponovno dodati podrobnosti svojega računa." -#: C/remove-account.page:42(p) +#: C/remove-account.page:43(p) #: C/irc-nick-password.page:50(p) -#: C/disable-account.page:48(p) -#: C/add-account.page:48(p) +#: C/disable-account.page:49(p) +#: C/add-account.page:49(p) msgid "From the Contact List window, choose EditAccounts, or press F4." msgstr "V oknu Seznam stikov izberite UrediRačuni ali pritisnite F4." -#: C/remove-account.page:46(p) +#: C/remove-account.page:47(p) msgid "Select the account you wish to remove from the accounts list on the left side of the window." msgstr "Na seznamu računov na levi strani okna izberite račun, ki ga želite odstraniti." -#: C/remove-account.page:50(p) -msgid "Click on Remove." -msgstr "Kliknite Odstrani." +#: C/remove-account.page:51(p) +msgid "Click -." +msgstr "Kliknite -." -#: C/remove-account.page:53(p) +#: C/remove-account.page:54(p) msgid "A dialog will be shown asking for confirmation. Click the Remove button to permanently remove the account." msgstr "Pojavilo se pogovorno okno, ki vas bo spraÅ¡evalo za potrditev. Kliknite gumb Odstrani za odstranitev računa." -#: C/remove-account.page:59(p) +#: C/remove-account.page:60(p) msgid "Even after removing an account, Empathy does not delete your conversation history for that account." msgstr "Tudi po odstraniti računa Empathy ne izbriÅ¡e zgodovine vaÅ¡ih pogovorov za ta račun." @@ -628,8 +643,8 @@ msgstr "Težave s povezovanjem s storitvijo hipnega sporočanja" #. 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-neterror.page:59(None) +#: C/prob-conn-name.page:44(None) #: C/prob-conn-auth.page:58(None) #: C/account-irc.page:109(None) msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" @@ -639,53 +654,53 @@ msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" msgid "An error message which says “Network error” appears in the main window." msgstr "V glavnemu oknu se pojavi sporočilo napake, ki pravi “Network error”." -#: C/prob-conn-neterror.page:33(title) +#: C/prob-conn-neterror.page:34(title) msgid "I get a message that says “Network error”" msgstr "Dobim sporočilo, ki pravi “Napaka omrežja”" -#: C/prob-conn-neterror.page:36(cite) +#: C/prob-conn-neterror.page:37(cite) msgid "shaunm" msgstr "shaunm" -#: C/prob-conn-neterror.page:37(p) +#: C/prob-conn-neterror.page:38(p) msgid "Empathy no longer allows you to create an IRC account without a valid nick. I've removed the guide link. Remove the text." msgstr "Empathy vam ne dovoli ustvarjanje računa IRC brez veljavnega vzdevka. Povezava vodiča je bila odstranjena. Odstrani besedilo." -#: C/prob-conn-neterror.page:41(p) +#: C/prob-conn-neterror.page:42(p) msgid "This kind of error happens when Empathy cannot communicate with the instant messaging service for some reason." msgstr "Ta vrsta napake se zgodi, ko Empathy zaradi nekega vzroka ne more komunicirati s storitvijo hipnega sporočanja. " -#: C/prob-conn-neterror.page:45(p) +#: C/prob-conn-neterror.page:46(p) msgid "Also, this kind of error happens when you try to use an IRC account without setting a nickname." msgstr "Ta vrsta napake se zgodi, ko poskuÅ¡ate uporabiti račun IRC brez nastavitve vzdevka." -#: C/prob-conn-neterror.page:52(p) +#: C/prob-conn-neterror.page:53(p) #: C/prob-conn-auth.page:45(p) -#: C/prob-conn-acctdisabled.page:43(p) +#: C/prob-conn-acctdisabled.page:44(p) msgid "Make sure that you are connected to the Internet, or to a local area network." msgstr "Prepričajte se, da ste povezani na medmrežje ali na krajevno omrežje." -#: C/prob-conn-neterror.page:57(p) -#: C/prob-conn-name.page:42(p) +#: C/prob-conn-neterror.page:58(p) +#: C/prob-conn-name.page:43(p) #: C/prob-conn-auth.page:57(p) msgid "Click the edit icon in the error message." msgstr "V sporočilu napake kliknite na ikono uredi." -#: C/prob-conn-neterror.page:65(p) -#: C/prob-conn-acctdisabled.page:59(p) +#: C/prob-conn-neterror.page:64(p) +#: C/prob-conn-acctdisabled.page:60(p) msgid "Check in the Advanced section that all the details are correct. You should be able to find these details from the website of the messaging service." msgstr "V odseku Napredno preverite, da so vse podrobnosti pravilne. Te podrobnosti bi morali najti na spletišču storitve sporočanja." -#: C/prob-conn-neterror.page:82(p) -#: C/prob-conn-auth.page:68(p) -msgid "Deselect the Enabled, and then select it again to try to reconnect to the service." -msgstr "Odstranite izbiro Omogočeno in jo nato ponovno izberite za poskus ponovne povezave s storitvijo." +#: C/prob-conn-neterror.page:79(p) +#: C/prob-conn-name.page:65(p) +msgid "Switch the account off, and then switch it on to try to reconnect to the service." +msgstr "Izklopite račun in ga ponovno vklopite za poskus ponovne povezave s storitvijo." -#: C/prob-conn-neterror.page:90(title) +#: C/prob-conn-neterror.page:87(title) msgid "Proxy support" msgstr "Podpora posredniÅ¡kih strežnikov" -#: C/prob-conn-neterror.page:91(p) +#: C/prob-conn-neterror.page:88(p) msgid "At the moment Empathy can not be configured to work with a proxy." msgstr "Trenutno Empathy ni mogoče nastaviti za delo s posredovalnim strežnikom." @@ -697,26 +712,22 @@ msgstr "“Ime v uporabi”" msgid "An error message which says “Name in use” appears in the main window." msgstr "V glavnemu oknu se pojavi sporočilo napake, ki pravi “Ime v uporabi”." -#: C/prob-conn-name.page:32(title) +#: C/prob-conn-name.page:33(title) msgid "I get a message that says “Name in use”" msgstr "Dobim sporočilo, ki pravi “Ime v uporabi” " -#: C/prob-conn-name.page:34(p) +#: C/prob-conn-name.page:35(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 "Ta vrsta napak se zgodi, ko se poskusite povezati s svojim računom IRC in uporabljate vzdevek, ki ga na istemu omrežju že uporablja nekdo drug. " -#: C/prob-conn-name.page:50(p) +#: C/prob-conn-name.page:51(p) msgid "In the Nickname text box, type a new nickname." msgstr "V besedilno polje Vzdevek vpiÅ¡ite nov vzdevek." -#: C/prob-conn-name.page:55(p) +#: C/prob-conn-name.page:56(p) msgid "If you have registered that nickname within the network you are using, set the password for that nickname. For more information, see ." msgstr "V primeru da ste ta vzdevek ustvarili v omrežju, ki ga uporabljate, nastavite geslo za ta vzdevek. Za več podrobnosti si oglejte ." -#: C/prob-conn-name.page:64(p) -msgid "Deselect the Enabled check-box next to the name of your account, and then select it again to try to reconnect to the service." -msgstr "Odstranite izbiro izbirnega polja Omogočeno poleg imena svojega računa, in jo nato ponovno izberite za poskus ponovne povezave s storitvijo." - #: C/prob-conn-auth.page:8(desc) msgid "An error message which says “Authentication failed” appears in the main window." msgstr "V glavnemu oknu se pojavi sporočilo napake, ki pravi “Overitev je spodletela”." @@ -734,110 +745,102 @@ msgid "Make sure that you have registered an account with the service you are tr msgstr "Prepričajte se, da ste ustvarili račun za storitev s katero se želite povezati. V primeru da nimate računa, vam večina storitev ne bo dovolila povezave." #: C/prob-conn-auth.page:63(p) -#: C/prob-conn-acctdisabled.page:54(p) +#: C/prob-conn-acctdisabled.page:55(p) msgid "Type your username and password again to make sure that they are correct." msgstr "Ponovno vpiÅ¡ite svoje uporabniÅ¡ko ime in geslo ter se prepričajte da sta pravilna." +#: C/prob-conn-auth.page:68(p) +msgid "Deselect the Enabled, and then select it again to try to reconnect to the service." +msgstr "Odstranite izbiro Omogočeno in jo nato ponovno izberite za poskus ponovne povezave s storitvijo." + #: 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 "Račun hipnega sporočanja, ki ga želite uporabiti ni omogočen na seznamu računov." -#: C/prob-conn-acctdisabled.page:33(title) +#: C/prob-conn-acctdisabled.page:34(title) msgid "My account is not enabled" msgstr "Moj račun ni omogočen" -#: C/prob-conn-acctdisabled.page:35(p) +#: C/prob-conn-acctdisabled.page:36(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 "V primeru da račun hipnega sporočanja, ki ga želite uporabiti, v spustnemu seznamu računov ob poskusu začetka novega pogovora ali pridružitve sobe ni omogočen, so morda podrobnosti vaÅ¡ega računa nepravilne. " -#: C/prob-conn-acctdisabled.page:48(p) +#: C/prob-conn-acctdisabled.page:49(p) msgid "Choose EditAccounts and select the account that is not working." msgstr "Izberite UrediRačuni in izberite račun, ki ne deluje." -#: C/prob-conn-acctdisabled.page:65(p) -msgid "Check that the Enabled check-box is selected. If it is not, select the check-box to enable the account." -msgstr "Preverite, če je izbrano izbirno polje Omogočeno. Če ni, ga izberite in s tem omogočite račun." +#: C/prob-conn-acctdisabled.page:66(p) +msgid "Check that the account is switched on." +msgstr "Preverite, da je račun vklopljen." #: C/prev-conv.page:8(desc) msgid "Browse or search your previous conversations." msgstr "Brskanje ali iskanje po preteklih pogovorih." -#: C/prev-conv.page:35(title) +#: C/prev-conv.page:36(title) msgid "View previous conversations" msgstr "Ogled preteklih pogovorov" -#: C/prev-conv.page:39(p) -msgid "Highlighting text is quirky: #593733. 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 "Poudarjanje besedila je čudno: #593733. V primeru da pride do dejanskega poudarjanja neodvisno od izbire (na primer v rumeni barvi), lahko uporabimo izraz \"poudarjanje\". V nasprotnemu primeru moramo uporabiti \"izbira\". Opazujte ta hrošč." - -#: C/prev-conv.page:46(p) +#: C/prev-conv.page:38(p) msgid "Empathy automatically saves all your text conversations you have with your contacts. You can search through all of your previous conversations or browse previous conversations by contact and date." msgstr "Empathy samodejno shrani vse vaÅ¡e besedilne pogovore z vaÅ¡imi stiki. Lahko iščete po vseh vaÅ¡ih predhodnih pogovorih ali brskate predhodne pogovore po stiku in datumu." -#: C/prev-conv.page:54(p) +#: C/prev-conv.page:46(p) msgid "You do not need to be connected to the Internet to view and search your previous conversations." msgstr "Za ogled in iskanje vaÅ¡ih predhodnih pogovorov vam ni treba biti povezan na medmrežje." -#: C/prev-conv.page:61(title) +#: C/prev-conv.page:53(title) msgid "Search previous conversations" msgstr "Iskanje predhodnih pogovorov" -#: C/prev-conv.page:63(p) +#: C/prev-conv.page:55(p) msgid "You can perform a full-text search through all of your previous conversations." msgstr "Izvedete lahko iskanje celega besedila skozi vse vaÅ¡e predhodne pogovore." -#: C/prev-conv.page:67(p) -#: C/prev-conv.page:96(p) +#: C/prev-conv.page:59(p) +#: C/prev-conv.page:87(p) msgid "From the Contact List window, choose ViewPrevious Conversations. Alternatively, press F3." msgstr "V oknu Seznam stikov izberite PogledPretekli pogovori. Namesto tega lahko pritisnete F3." -#: C/prev-conv.page:71(p) -msgid "Select the Search tab." -msgstr "Izberite zavihek Iskanje." +#: C/prev-conv.page:63(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 "Izberite račun s spustnega seznama na vrhu. Seznam vseh stikov in klepetalnic za ta račun bo prikazan spodaj." -#: C/prev-conv.page:74(p) -msgid "In the For field, type the text you want to search for. Click Find or press Enter." -msgstr "V polje Za, vtipkajte besedilo, ki ga želite iskati. Kliknite išči ali pritisnite Enter." +#: C/prev-conv.page:67(p) +msgid "Type the text you want to search for in the Search text field." +msgstr "Vnesite besedilo, ki ga želite najti, v besedilno polje Iskanje." -#: C/prev-conv.page:78(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." +#: C/prev-conv.page:71(p) +msgid "Any conversations that matched your search terms will be shown. By default, conversations are ordered by date." msgstr "Katerikoli pogovori, ki se skladajo z vaÅ¡imi iskalnimi pogoji bodo prikazani v seznamu pod iskalnim poljem. Privzeto so pogovori razvrščeni po datumu." -#: C/prev-conv.page:82(p) -msgid "Click on a conversation to view it. Empathy will select the text in the conversation that matched your search terms." -msgstr "Za ogled pogovora kliknite nanj. Empathy bo izbral besedilo v pogovoru, ki se sklada z vaÅ¡imi pogoji iskanja." - -#: C/prev-conv.page:89(title) +#: C/prev-conv.page:80(title) msgid "Browse previous conversations" msgstr "Brskaj predhodne pogovore" -#: C/prev-conv.page:91(p) +#: C/prev-conv.page:82(p) msgid "You can browse your previous conversations with your contacts or in chat rooms by date." msgstr "Svoje predhodne pogovore s svojimi stiki ali klepetalnicami lahko brskate po datumu." -#: C/prev-conv.page:100(p) -msgid "Select the Conversations tab." -msgstr "Izberite zavihek Pogovori." - -#: C/prev-conv.page:103(p) +#: C/prev-conv.page:91(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." msgstr "Izberite račun s spustnega seznama zgoraj levo. Seznam vseh stikov in klepetalnic za ta račun bo prikazan spodaj." -#: C/prev-conv.page:107(p) +#: C/prev-conv.page:95(p) msgid "Select a contact or chat room to view your previous conversations from. By default the most recent conversation will be shown." msgstr "Izberite stik ali klepetalnico za ogled svojih predhodnih pogovorov. Privzeto bodo prikazani najbolj nedavni stiki." -#: C/prev-conv.page:111(p) +#: C/prev-conv.page:99(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." msgstr "Svoje pogovore lahko brskate po datumu. Dnevi ob katerih ste imeli pogovor z izbranim stikom bodo prikazni krepko. Kliknite na datum za izbiro. Kliknite puščice poleg meseca in leta za brskanje zgodnejÅ¡ih datumov." -#: C/prev-conv.page:117(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." +#: C/prev-conv.page:105(p) +msgid "You can search for text in the conversations by typing into the search field at the top. The matching conversations will be showed." msgstr "Besedilo v prikazanemu pogovoru lahko iščete s pisanjem v iskalno polje na vrhu. Skladajoče besedilo bo poudarjeno." -#: C/prev-conv.page:121(p) -msgid "You can quickly view the previous conversations with one of your contacts from the Contact List window. Simply right click the contact and choose View Previous Conversations. The Previous Conversations window will open with that contact already selected." -msgstr "Predhodne pogovore z enim od vaÅ¡im stikov si lahko hitro ogledate v oknu Seznam stikov. Enostavno desno kliknite na stik in izberite Ogled predhodnih pogovorov. Okno Predhodni pogovori bo bilo odprto s predhodno izbranim stikom." +#: C/prev-conv.page:111(p) +msgid "You can quickly view the previous conversations with one of your contacts from the Contact List window. Simply right click the contact and choose Previous Conversations. The Previous Conversations window will open with that contact already selected." +msgstr "Predhodne pogovore z enim od svojih stikov si lahko hitro ogledate v oknu Seznam stikov. Desno kliknite na stik in izberite Ogled predhodnih pogovorov. Odprlo se bo okno Predhodni pogovori s predhodno izbranim stikom." #: C/link-contacts.page:11(desc) msgid "Merge and separate different contacts into a single one." @@ -1029,6 +1032,7 @@ msgstr "V polje Geslo vtipkajte geslo, ki ste ga uporabili za ustvarj #: C/irc-nick-password.page:63(p) #: C/import-account.page:61(p) +#: C/add-account.page:74(p) msgid "Click Apply." msgstr "Kliknite Uveljavi." @@ -1036,32 +1040,36 @@ msgstr "Kliknite Uveljavi." 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 Empathy." msgstr "Ta navodila vam dovolijo uporabo z geslom zaščitenega vzdevka na določenih omrežjih IRC. Trenutno z Empathy ni mogoče ustvariti vzdevka IRC ali spremeniti svojega vzdevka ali gesla. " -#: C/irc-manage.page:9(desc) +#: C/irc-manage.page:10(desc) msgid "How to use IRC with Empathy." msgstr "Kako uporabiti IRC z Empathy." -#: C/irc-manage.page:34(title) +#: C/irc-manage.page:35(title) msgid "Internet Relay Chat (IRC)" msgstr "Klepet IRC" -#: C/irc-manage.page:37(p) +#: C/irc-manage.page:38(p) #: C/account-irc.page:39(p) msgid "You must have the telepathy-idle package installed to use IRC in Empathy." msgstr "Za uporabo IRC-a v Empathy morate imeti nameščen paket telepathy-idle." -#: C/irc-manage.page:43(title) +#: C/irc-manage.page:42(link) +msgid "Install telepathy-idle" +msgstr "Namesite telepathy-idle" + +#: C/irc-manage.page:49(title) msgid "IRC Chat Rooms and Conversations" msgstr "Pogovori in klepetalnice IRC" -#: C/irc-manage.page:45(title) +#: C/irc-manage.page:51(title) msgid "Chat Rooms and Conversations" msgstr "Klepetalnice in pogovori" -#: C/irc-manage.page:50(title) +#: C/irc-manage.page:56(title) msgid "Common IRC Problems" msgstr "Pogoste težave IRC" -#: C/irc-manage.page:52(title) +#: C/irc-manage.page:58(title) #: C/index.page:55(title) msgid "Common Problems" msgstr "Pogoste težave" @@ -1625,25 +1633,25 @@ msgstr "Ko ste končali, kliknite Zapri." msgid "Prevent Empathy from automatically logging in to an account." msgstr "Preprečitev samodejnega prijavljanja Empathy v račun." -#: C/disable-account.page:39(title) +#: C/disable-account.page:40(title) msgid "Disable an account" msgstr "Onemogočitev računa" -#: C/disable-account.page:41(p) +#: C/disable-account.page:42(p) msgid "You can disable an account to prevent Empathy 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 Empathy for other accounts." msgstr "Za preprečitev prijave v Empaty brez odstranitve računa lahko račun onemogočite. Morda želite račun onemogočiti in ponovno omogočiti v primeru da želite biti v račun prijavljeni le ob določenih časih, toda želite Empathy Å¡e vedno uporabiti za druge račune. " -#: C/disable-account.page:52(p) +#: C/disable-account.page:53(p) msgid "Select the account you wish to disable from the accounts list on the left side of the window." msgstr "Izberite račun, ki ga želite onemogočiti, s seznama računov na levi strani okna." -#: C/disable-account.page:56(p) -msgid "Deselect Enabled on the right side of the window." -msgstr "Odstranite izbiro Omogočeno na desni strani okna." +#: C/disable-account.page:57(p) +msgid "On the right side of the window, switch it off." +msgstr "Na desni strani okna ga izklopite." #: C/disable-account.page:62(p) -msgid "To re-enable the account, simply select Enabled." -msgstr "Za ponovno omogočitev računa enostavno izberite Omogočeno." +msgid "To re-enable the account, switch it on." +msgstr "Za ponovno omogočitev računa ga vklopite." #: C/create-account.page:9(desc) msgid "Register for an account with one of the supported messaging services." @@ -1769,27 +1777,27 @@ msgstr "Yahoo!" msgid "Change your status to advertise your availability to your contacts." msgstr "Spremenite svoje stanje za oglaÅ¡evanje vaÅ¡e razpoložljivosti vaÅ¡im stikom." -#: C/change-status.page:34(title) +#: C/change-status.page:39(title) msgid "Change your status" msgstr "Sprememba stanja" -#: C/change-status.page:36(p) +#: C/change-status.page:41(p) msgid "You can set your status to indicate your availability to your contacts. Empathy allows you to select from a list of defined statuses." msgstr "Nastavite lahko svoje stanje za nakaz vaÅ¡e razpoložljivosti vaÅ¡im stikov. Empathy vam omogoča izbiro s seznama določenih stanj." -#: C/change-status.page:41(p) +#: C/change-status.page:46(p) msgid "Click on the drop-down list at the top of the Contact List window." msgstr "Kliknite na spustni seznam na vrhu okna Seznam stikov." -#: C/change-status.page:46(p) +#: C/change-status.page:51(p) msgid "Select a status from the list." msgstr "Izberite stanje s seznama" -#: C/change-status.page:52(p) -msgid "See for a list of the built-in statuses and what they mean. You can also add custom status messages to provide more information about your availability to your contacts." -msgstr "Oglejte si za seznam vgrajenih stanj in kaj pomenijo. Lahko tudi dodate sporočila stanja po meri za več podrobnosti o vaÅ¡ih razpoložljivosti vaÅ¡im stikom." +#: C/change-status.page:57(p) +msgid "See for a list of the built-in statuses and what they mean. You can also add custom status messages to provide more information about your availability to your contacts." +msgstr "Oglejte si za seznam vgrajenih stanj in kaj pomenijo. Lahko tudi dodate sporočila stanja po meri za več podrobnosti o vaÅ¡i razpoložljivosti svojim stikom." -#: C/change-status.page:58(p) +#: C/change-status.page:63(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." msgstr "V primeru da svojega računalnika nekaj časa ne uporabljate, ali če je ohranjevalnik zaslona vklopljen bo stanje samodejno nastavljeno na Odsoten." @@ -2015,35 +2023,31 @@ msgstr "Za dodajanje nove osebe na vaÅ¡ seznam stikov morate biti povezani na me msgid "Add a new account to Empathy." msgstr "Dodajanje novega računa v Empathy." -#: C/add-account.page:39(title) +#: C/add-account.page:40(title) msgid "Add a new account" msgstr "Dodajanje novega računa" -#: C/add-account.page:41(p) +#: C/add-account.page:42(p) msgid "You can add instant messaging accounts from any supported service to communicate with all of your contacts in Empathy. For some account providers, these steps will also allow you to register for a new account. For more details, see ." msgstr "Račune hipnega sporočanja za sporazumevanje z vsemi svojimi stiki v Empathy lahko dodate s katerekoli podprte naprave. Za nekatere ponudnike računov vam bodo ti koraki omogočili tudi ustvarjanje novega računa. Za več podrobnosti si oglejte ." -#: C/add-account.page:52(p) -msgid "Click Add." -msgstr "Kliknite Dodaj." +#: C/add-account.page:53(p) +msgid "Click +." +msgstr "Kliknite +." -#: C/add-account.page:57(p) +#: C/add-account.page:58(p) msgid "From the Protocol drop-down list, select the type of account you wish to add." msgstr "Na spustnemu seznamu Protokol izberite vrsto računa, ki jo želite dodati." -#: C/add-account.page:61(p) +#: C/add-account.page:62(p) msgid "If you do not already have a registered account, select Create a new account on the server. This feature is not available for all account types, and may not work with some account providers. See for more information." msgstr "V primeru da Å¡e niste ustvarili novega račun, izberite Ustvari nov račun na strežniku. Ta zmožnost ni na voljo za vse vrste računov in morda ne bo delovala z nekaterimi ponudniki računov. Za več podrobnosti si oglejte . " -#: C/add-account.page:66(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 for more information." +#: C/add-account.page:69(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 for more information." msgstr "Vnesite zahtevane podatke. Za večino računov boste potrebovali le ID prijave in geslo. Nekateri računi morda zahtevajo dodatne podrobnosti. Za več podrobnosti si oglejte ." -#: C/add-account.page:71(p) -msgid "Click Log in." -msgstr "Kliknite Prijava." - -#: C/add-account.page:78(p) +#: C/add-account.page:81(p) msgid "To change the name that identifies the account in the Accounts 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 Enter when you’re finished." msgstr "Za spremembo imena, ki identificira račun v oknu Računi, izberite račun s seznama na levi ali kliknite na ime ali pritisnite preslednico. Uredite ime računa in pritisnite Enter, ko ste končali." @@ -2093,7 +2097,7 @@ msgstr "Prezri napake potrdila SSL" #: C/account-jabber.page:47(p) msgid "Whenever possible, communication between Empathy and the Jabber server is encrypted. If encrypted communication is not possible, messages may be sent unencrypted. Select Encryption required to prevent Empathy from communicating with the Jabber server when encryption is not possible." -msgstr "Kadar je mogoče je sporazumevanje med Empathy in strežnikom Jabber Å¡ifrirana. V primeru da Å¡ifrirana komunikacija ni mogoča, morda morda sporočila poslana neÅ¡ifrirano. Izberite Zahtevano Å¡ifriranj za preprečitev komunikacije Empathy s strežniki Jabber, ko Å¡ifriranje ni mogoče. " +msgstr "Kadar je mogoče je sporazumevanje med Empathy in strežnikom Jabber Å¡ifrirana. V primeru da Å¡ifrirana komunikacija ni mogoča, morda morda sporočila poslana neÅ¡ifrirano. Izberite Zahtevano Å¡ifriranj za preprečitev komunikacije Empathy s strežniki Jabber, ko Å¡ifriranje ni mogoče." #: C/account-jabber.page:52(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 Ignore SSL certificate errors to allow encrypted communication with invalid certificates." @@ -2262,3 +2266,137 @@ msgstr "Izberite izbirno polje v stolpcu SSL za Å¡ifriranje vse komun #: C/index.page:0(None) msgid "translator-credits" msgstr "Andrej ŽnidarÅ¡ič , 2010" + +#~ msgid "" +#~ "In order to be able to share your desktop or to remotely use your " +#~ "contacts desktop, it is necessary to have a remote desktop viewer " +#~ "application installed in your system." +#~ msgstr "" +#~ "Za souporabo svojega namizja ali za oddaljeno uporabo namizja svojega " +#~ "stika morate imeti na svojemu sistemu nameščen program oddaljenega " +#~ "pregledovalnika namizja." + +#~ msgid "" +#~ "A request will be sent to the contact you want to share your desktop " +#~ "with. If they accept, the default remote desktop viewer application will " +#~ "be launched in order to permit you to disconnect the user that is " +#~ "controlling your desktop." +#~ msgstr "" +#~ "VaÅ¡emu stiku bo poslana zahteva za souporabo namizja. V primeru da " +#~ "zahtevo sprejme, se bo zagnal privzeti oddaljeni pregledovalnik namizja, " +#~ "ki vam bo omogočal prekinitev povezave z uporabnikom, ki nadzira vaÅ¡e " +#~ "namizje." + +#~ msgid "Click on Remove." +#~ msgstr "Kliknite Odstrani." + +#~ msgid "" +#~ "Deselect the Enabled check-box next to the name of your " +#~ "account, and then select it again to try to reconnect to the service." +#~ msgstr "" +#~ "Odstranite izbiro izbirnega polja Omogočeno poleg imena " +#~ "svojega računa, in jo nato ponovno izberite za poskus ponovne povezave s " +#~ "storitvijo." + +#~ msgid "" +#~ "Check that the Enabled check-box is " +#~ "selected. If it is not, select the check-box to enable the account." +#~ msgstr "" +#~ "Preverite, če je izbrano izbirno polje Omogočeno. Če ni, ga izberite in s tem omogočite račun." + +#~ msgid "" +#~ "Highlighting text is quirky: #593733. 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 "" +#~ "Poudarjanje besedila je čudno: #593733. V primeru da pride do dejanskega " +#~ "poudarjanja neodvisno od izbire (na primer v rumeni barvi), lahko " +#~ "uporabimo izraz \"poudarjanje\". V nasprotnemu primeru moramo uporabiti " +#~ "\"izbira\". Opazujte ta hrošč." + +#~ msgid "Select the Search tab." +#~ msgstr "Izberite zavihek Iskanje." + +#~ msgid "" +#~ "In the For field, type the text you want to search for. Click " +#~ "Find or press Enter." +#~ msgstr "" +#~ "V polje Za, vtipkajte besedilo, ki ga želite iskati. Kliknite " +#~ "išči ali pritisnite Enter." + +#~ msgid "" +#~ "Click on a conversation to view it. Empathy will select the " +#~ "text in the conversation that matched your search terms." +#~ msgstr "" +#~ "Za ogled pogovora kliknite nanj. Empathy bo izbral besedilo v " +#~ "pogovoru, ki se sklada z vaÅ¡imi pogoji iskanja." + +#~ msgid "Select the Conversations tab." +#~ msgstr "Izberite zavihek Pogovori." + +#~ msgid "" +#~ "Deselect Enabled on the right side of the " +#~ "window." +#~ msgstr "" +#~ "Odstranite izbiro Omogočeno na desni strani " +#~ "okna." + +#~ msgid "Click Log in." +#~ msgstr "Kliknite Prijava." + +#~ msgid "" +#~ "To turn a video conversation into an audio conversation, choose " +#~ "VideoVideo Off, or click the video call toolbar button to deselect " +#~ "it." +#~ msgstr "" +#~ "Za spremembo video pogovora v zvočni pogovor izberiteVideoIzklopi video " +#~ "ali v orodni vrstici kliknite gumb video klic za odstranitev " +#~ "njegove izbire." + +#~ msgid "" +#~ "Click on the trash icon next to the account name to remove the account." +#~ msgstr "Kliknite na ikono smeti poleg imena računa za njegovo odstranitev." + +#~ msgid "To join such a room, if you know the password:" +#~ msgstr "Za pridružitev takÅ¡ni sobi, v primeru da veste geslo:" + +#~ msgid "" +#~ "There are a number of popular free SIP account providers; one popular " +#~ "provider is Sipphone." +#~ msgstr "" +#~ "Obstaja veliko brezplačnih ponudnikov SIP; eden od priljubljenih " +#~ "ponudnikov je Sipphone." + +#~ msgid "" +#~ "From the Contact List window, click the audio call icon next to the name of the contact you wish to call and choose " +#~ "Audio Call. Alternatively, right click the " +#~ "contact and choose Audio Call." +#~ msgstr "" +#~ "V oknu Seznam stikov kliknite ikono zvočni klic poleg imena stika, ki ga želite klicati in izberite Zvočni klic. Dodatno lahko desno kliknete na stik in " +#~ "izberete Zvočni klic." + +#~ msgid "" +#~ "To turn an audio conversation into a video conversation, choose " +#~ "VideoVideo On, or click the video call toolbar button to select it." +#~ msgstr "" +#~ "Za spremembo zvočnega pogovora v video pogovor izberite VideoVideo vklopljen ali za izbiro kliknite na gumb video klic v orodni vrstici." diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po index 645d667d..c70bd5cd 100644 --- a/help/zh_CN/zh_CN.po +++ b/help/zh_CN/zh_CN.po @@ -4,17 +4,19 @@ # Lavande , 2010 # Tao Wang , 2010 # lainme , 2011 +# Guanhao Yin , 2011 # msgid "" msgstr "" "Project-Id-Version: empathy master\n" -"POT-Creation-Date: 2011-07-11 12:41+0000\n" -"PO-Revision-Date: 2011-07-11 20:40+0800\n" -"Last-Translator: lainme \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 \n" "Language-Team: Chinese (China) \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. @@ -27,17 +29,17 @@ msgstr "" #: C/video-call.page:10(desc) msgid "Start a video conversation with one of your contacts." -msgstr "向您的联系人发起视频会话。" +msgstr "同您的联系人进行视频聊天。" #: C/video-call.page:21(name) C/status-icons.page:16(name) -#: C/share-desktop.page:13(name) C/set-custom-status.page:19(name) +#: C/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:19(name) C/irc-join-room.page:16(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) @@ -52,14 +54,14 @@ msgid "Milo Casagrande" msgstr "Milo Casagrande" #: C/video-call.page:22(email) C/status-icons.page:17(email) -#: C/share-desktop.page:14(email) C/set-custom-status.page:20(email) +#: C/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:20(email) C/irc-join-room.page:17(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) @@ -74,7 +76,7 @@ msgid "milo@ubuntu.com" msgstr "milo@ubuntu.com" #: C/video-call.page:25(p) C/status-icons.page:24(p) -#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p) +#: C/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) @@ -82,7 +84,7 @@ msgstr "milo@ubuntu.com" #: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p) #: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p) #: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p) -#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p) +#: C/irc-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) @@ -99,32 +101,19 @@ msgstr "知识共享-相同方式共享 (Creative Commons Share Alike) 3.0" #: C/video-call.page:28(title) msgid "Start a video conversation" -msgstr "发起视频会话" +msgstr "开始视频聊天" #: C/video-call.page:30(p) -#, fuzzy -#| msgid "" -#| "If you have a webcam, you can call your contacts and have an video " -#| "conversation with them. This features only works with certain types of " -#| "accounts, and it requires the other person to have an application that " -#| "supports video calls." msgid "" "If you have a webcam, you can call your contacts and have a video " "conversation with them. This features only works with certain types of " "accounts, and it requires the other person to have an application that " "supports video calls." msgstr "" -"如果您有网络摄像头，您可以呼叫您的联系人并和他们进行视频会话。此功能仅可用于" -"特定类型的帐号，并需要对方也安装了支持视频呼叫的程序。" +"如果您有网络摄像头，您可以呼叫您的联系人并和他们进行视频聊天。此功能仅特定类" +"型的账户可用，并需要对方使用的程序支持视频呼叫。" #: C/video-call.page:37(p) -#, fuzzy -#| msgid "" -#| "From the Contact List window, click the video call icon " -#| "next to the name of the contact you wish to call and choose Video Call. Alternatively, right click the contact and " -#| "choose Video Call." msgid "" "From the Contact List window, click the video call icon " @@ -133,8 +122,7 @@ msgid "" msgstr "" "在联系人列表窗口，点击您想呼叫的联系人的名字旁的视频呼叫" -"图标并选择视频呼叫。同样，也可以右击联系人并选" -"择视频呼叫。" +"图标并选择视频呼叫。" #: C/video-call.page:43(p) C/audio-call.page:42(p) msgid "" @@ -142,54 +130,36 @@ msgid "" "Connected at the bottom of the window, along with the total " "conversation time." msgstr "" -"连接建立后，会打开新的窗口，您将在窗口底部看见已连接，以及总会话时" -"间。" +"一个新窗口会被打开。连接建立后，您将在窗口底部看到已连接，以及总会" +"话时间。" #: C/video-call.page:48(p) C/audio-call.page:48(p) msgid "To end the conversation, click on Hang up." msgstr "点击挂断以结束会话。" #: C/video-call.page:54(p) -#, fuzzy -#| msgid "" -#| "To turn a video conversation into an audio conversation, choose " -#| "VideoVideo Off, or click the video call toolbar button to deselect " -#| "it." msgid "" "To turn a video conversation into an audio conversation, choose VideoVideo Off." msgstr "" -"要将视频会话转为音频会话，则选择视频关闭视频，或者点击工具栏上的视频呼叫" -"按钮以取消选择。" +"要将视频会话转为语音会话，选择 视频视频关闭。" #: C/video-call.page:60(title) -#, fuzzy -#| msgid "Start a video conversation with one of your contacts." msgid "Start a video conversation with a meta-contact" -msgstr "向您的联系人发起视频会话。" +msgstr "和一位元联系人进行视频聊天。" #: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p) -#, fuzzy -#| msgid "" -#| "From the Contact List window, click on the drop-down list at " -#| "the top." msgid "" "From the Contact List window, right-click on the meta-contact." -msgstr "从 联系人列表 窗口，点击顶部的下拉菜单。" +msgstr "在联系人列表窗口，右键点击该元联系人。" #: C/video-call.page:68(p) -#, fuzzy -#| msgid "" -#| "Right-click on the name of the contact you want to have a conversation " -#| "with, and choose Chat." msgid "" "Select the contact you want to have the conversation, and from the menu " "select Video Call." -msgstr "右键点击您想要进行交谈的联系人的名字，然后选择 聊天" +msgstr "" +"选择要聊天的联系人，然后在菜单中选择视频呼叫" #: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p) msgid "" @@ -198,6 +168,9 @@ msgid "" "second: a small pop-up message will appear showing the number of the " "contacts that form the meta-contact." 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. @@ -300,7 +273,7 @@ msgid "" "away. You can set a custom message for this status." msgstr "" "当您不在电脑旁时，使用离开状态。如果您一段时间内不使用电脑，或者屏幕" -"保护打开了，Empathy将自动设置您的状态为离开。默认地，当您离开时，" +"保护打开了，Empathy 将自动设置您的状态为离开。默认地，当您离开时，" "Empathy 不会使用气泡提示和声音提示。您可以为此状态自定一条消息。" #: C/status-icons.page:62(media) C/status-icons.page:69(media) @@ -317,8 +290,8 @@ msgid "" "to your contacts. You will still be connected to your accounts, and you " "still see your contacts’ statuses and start conversations with them." msgstr "" -"当您将状态设置为隐身时，您的联系人看到您是离线的状态。您仍然连接上了" -"您的帐号，并且仍然可以看见您的联系人的状态且可以向他们发起会话。" +"当您将状态设置为隐身时，您的联系人会看到您已离线。但您仍然连接着您的" +"账户，并且可以看到您的联系人的状态，或者和他们聊天。" #: C/status-icons.page:70(gui) msgid "Offline" @@ -328,87 +301,96 @@ msgstr "离线" msgid "" "Setting your status to Offline disconnects you from all of your " "accounts." -msgstr "将状态设置为离线将会断开您所有帐号的连接。" +msgstr "将状态设置为离线将会断开您所有账户的连接。" #: C/share-desktop.page:7(desc) -msgid "Share the desktop with your contacts." -msgstr "与您的联系人共享桌面。" +msgid "Show your desktop to your contacts." +msgstr "向您的联系人展示您的桌面。" + +#: C/share-desktop.page:18(name) +msgid "Ekaterina Gerasimova" +msgstr "Ekaterina Gerasimova" + +#: C/share-desktop.page:19(email) +msgid "kittykat3756@gmail.com" +msgstr "kittykat3756@gmail.com" -#: C/share-desktop.page:28(title) +#: C/share-desktop.page:33(title) msgid "Share your desktop" msgstr "共享您的桌面" -#: C/share-desktop.page:30(p) +#: C/share-desktop.page:35(p) msgid "" -"It is possible, with some of your contacts, to share your desktop with them, " -"or to start using your contacts desktop. You can use this functionality to " -"show your desktop to your contacts, to ask for help or to help your contacts " -"resolve a problem." +"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 "" -"可以和您的一些联系人共享您的桌面，或者使用您联系人的桌面。您可以使用这个功能" -"向您的联系人展示您的桌面，来寻求帮助或帮助您的联系人解决问题。" +"您可以和联系人共享桌面。使用这个功能，您可以向联系人展示您的桌面，来寻求帮助" +"或帮助联系人解决问题。" -#: C/share-desktop.page:38(p) +#: C/share-desktop.page:42(p) msgid "" -"In order to be able to share your desktop or to remotely use your contacts " -"desktop, it is necessary to have a remote desktop viewer application " -"installed in your system." +"To be able to share your desktop, you need to have a VNC server, which has " +"support for the feature, installed on your system. Vino, the " +"GNOME VNC server, has the required support." msgstr "" -"为了能够共享您的桌面或者远程使用您联系人的桌面，需要在您的系统中安装远程桌面" -"查看应用程序。" - -#: C/share-desktop.page:46(p) C/send-file.page:40(p) -#: C/favorite-rooms.page:66(p) -msgid "From the Contact List window, perform one of the following:" -msgstr "从 联系人列表 窗口，执行下列操作中的一个：" +"要共享您的桌面，您的系统中必须安装支持此功能的 VNC 服务器。Vino，" +"GNOME 的 VNC 服务器，就有这项功能。" #: C/share-desktop.page:51(p) +msgid "From the Contact List window, do one of the following:" +msgstr "在联系人列表窗口，执行下列操作之一：" + +#: C/share-desktop.page:56(p) msgid "" -"Select the contact you want to share your desktop with, and choose " -"EditContactShare my desktopEditContactShare My Desktop." msgstr "" "选择您想要共享您的桌面的联系人，并选择 编辑联系人共享我的桌面。" -#: C/share-desktop.page:57(p) +#: C/share-desktop.page:63(p) msgid "" -"Right-click on the name of the contact you want to share your desktop with, " -"and select Share my desktop." +"Right-click on the name of the contact you want to share your desktop with " +"and select Share My Desktop." msgstr "" -"右键点击您想要共享您桌面的联系人的名字，然后选择 共享我的桌面。" +"右键点击您想要共享您桌面的联系人的名字，然后选择共享我的桌面。" -#: C/share-desktop.page:65(p) +#: C/share-desktop.page:71(p) msgid "" -"A request will be sent to the contact you want to share your desktop with. " -"If they accept, the default remote desktop viewer application will be " -"launched in order to permit you to disconnect the user that is controlling " -"your desktop." +"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 "" -"会向要共享您的桌面的联系人发送一个请求。如果他们接受了这个请求，那么将会运行" -"默认的远程桌面查看器应用程序，这样您就可以 随时断开正在控制您桌面用户的链接。" +"您选择的联系人会收到一个查看您桌面的邀请。要查看您的桌面，他们需要接受邀请。" -#: C/share-desktop.page:70(p) +#: C/share-desktop.page:77(p) msgid "" -"For more information about how to use the remote desktop viewer application, " -"refer to its help." -msgstr "如果需要更多关于如何使用远程桌面查看器应用程序，请参看其帮助。" +"You can disconnect the contact from your computer using your desktop sharing " +"application." +msgstr "在您的桌面共享程序中，您可以断开您的联系人到您的计算机的连接。" -#: C/share-desktop.page:77(p) +#: C/share-desktop.page:82(p) +msgid "" +"For more information about how to use the remote desktop sharing " +"application, refer to its help." +msgstr "如果需要更多关于如何使用远程桌面查共享程序的信息，请参看其帮助。" + +#: C/share-desktop.page:90(p) msgid "" "When you share your desktop with someone else, it is possible to experience " "system performance slowdown and low Internet speed." msgstr "" "当您与其他人共享您的桌面的时候，可能会出现系统性能降低和网络速度下降的现象。" -#: C/share-desktop.page:83(p) +#: C/share-desktop.page:96(p) msgid "" -"Not all your contacts might be able to support this functionality. It is " -"necessary for them to have at least the 2.28 version of Empathy " -"and a remote desktop viewer application installed in their system." +"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 Empathy and a " +"compatible remote desktop viewer application installed in their system." msgstr "" -"不是所有的您的联系人都能够支持这个功能。他们必须至少有 2.28 版本以上的 " -"Empathy 并且在系统上安装了远程桌面查看器程序。" +"并非您的所有联系人都可以使用这个功能。他们必须使用 2.28 或更新版本的 " +"Empathy 并且在安装了兼容的远程桌面查看器程序。" #: C/set-custom-status.page:9(desc) msgid "Add, edit or delete personal messages for your status." @@ -444,22 +426,22 @@ msgstr "可以根据不同的状态来设置自定义消息。" msgid "" "From the Contact List window, click on the drop-down list at the " "top." -msgstr "从 联系人列表 窗口，点击顶部的下拉菜单。" +msgstr "在联系人列表窗口，点击顶部的下拉列表。" #: C/set-custom-status.page:52(p) msgid "" "Select the status you want to add a custom message to. You have to select " "the one identified with the label Custom Message." msgstr "" -"选择您希望添加到定制消息的状态。您必须选择一个标明是 自定义消息 的" -"标签。" +"选择您希望添加自定义消息的状态。您必须选择有自定义消息标签标记的状" +"态。" #: C/set-custom-status.page:58(p) msgid "" "Enter your custom message in the text box at the top of the window, and " "press Enter to set the message." msgstr "" -"在窗口顶部的文本框中输入您的自定义消息，然后按回车键来设定这个消" +"在窗口顶部的文本框中输入您的自定义消息，然后按Enter来设定这个消" "息。" #: C/set-custom-status.page:64(p) @@ -468,16 +450,16 @@ msgid "" "use it again, click on the little star on the right of the text box where " "you wrote your custom message." 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 Empathy. It will be saved only for the current session." msgstr "" -"如果您不这么做，那么下回您使用 Empathy 的时候，这个自定义消息就不" -"会再出现。它只保留到当前会话结束。" +"如果您不这么做，那么下次您使用 Empathy 的时候，这个自定义消息就不" +"会再出现。它只在 Empathy 本次运行期间被保留。" #: C/set-custom-status.page:78(title) msgid "Edit, remove and add a custom message" @@ -485,7 +467,7 @@ msgstr "编辑、删除和添加自定义消息" #: C/set-custom-status.page:88(p) msgid "Select Edit Custom Message." -msgstr "选择 编辑自定义消息" +msgstr "选择编辑自定义消息。" #: C/set-custom-status.page:95(p) msgid "To edit a custom message:" @@ -495,12 +477,11 @@ msgstr "要编辑自定义消息：" msgid "" "From the Saved Presets box, select the status message you want to " "edit and double-click on it." -msgstr "" -"从 已保存的自定义状态 框中，选择您想要编辑的状态消息，然后双击它。" +msgstr "在已保存的自定义状态中，选择您想要编辑的状态消息并双击它。" #: C/set-custom-status.page:106(p) msgid "Type the new custom message and press Enter to modify it." -msgstr "输入新的自定义消息并且按回车键来修改它。" +msgstr "输入新的自定义消息并且按Enter来修改它。" #: C/set-custom-status.page:113(p) msgid "To remove a custom message:" @@ -510,22 +491,22 @@ msgstr "要删除自定义消息：" msgid "" "From the Saved Presets box, select the status message you want to " "remove." -msgstr "从 已保存的自定义状态 框中，选择您想要删除的状态消息。" +msgstr "在已保存的自定义状态中，选择要删除的状态消息。" #: C/set-custom-status.page:124(p) msgid "Click on the Remove button." -msgstr "点击 删除 按钮。" +msgstr "点击删除按钮。" #: C/set-custom-status.page:131(p) msgid "" "To add a new custom message, from the Add New Preset section:" -msgstr "要添加一条新的自定义消息，从 添加新自定义状态 部分：" +msgstr "要添加一条新的自定义消息，在添加新自定义状态选项卡：" #: C/set-custom-status.page:136(p) msgid "" "Click on the drop-down list to select the status you want to set a custom " "message to." -msgstr "点击下拉菜单来选择您想要设定自定义消息的状态。" +msgstr "点击下拉列表选择您想要设定自定义消息的状态。" #: C/set-custom-status.page:142(p) msgid "Click on the text box, and type the new custom message." @@ -533,11 +514,11 @@ msgstr "点击文本框，输入新的自定义消息。" #: C/set-custom-status.page:147(p) msgid "Click on Add to add the new message to the presets ones." -msgstr "点击 添加 来添加新消息到已保存的的自定义消息列表中。" +msgstr "点击添加将新消息添加到已保存的的自定义消息列表中。" #: C/set-custom-status.page:156(p) msgid "When finished, click on Close." -msgstr "当这些做完后，点击 关闭。" +msgstr "完成后，点击关闭。" #: C/set-custom-status.page:163(p) msgid "" @@ -545,8 +526,8 @@ msgid "" "status message. You will need to select it from the Contact List " "window." msgstr "" -"当你编辑或添加新自定义消息的时候，它不会被设为当前状态消息。您需要从 联" -"系人列表窗口中选中它。" +"当你编辑或添加新自定义消息的时候，它不会被设为当前状态消息。您需要在联系" +"人列表窗口中选中它。" #: C/send-message.page:8(desc) msgid "Send a message to one of your contacts." @@ -568,83 +549,79 @@ msgstr "philbull@gmail.com" #: C/send-message.page:32(title) msgid "Send a message to someone" -msgstr "发送一条消息给某人" +msgstr "向某人发送消息" #: C/send-message.page:36(p) -#, fuzzy -#| msgid "" -#| "Double click the name of the contact that you want to have a conversation " -#| "with." msgid "" "From the Contact List window, double-click the name of the " "contact that you want to have a conversation with." -msgstr "双击您想要进行交谈的联系人的名字。" +msgstr "在联系人列表窗口中，双击要与之聊天的联系人的名字。" #: C/send-message.page:42(p) msgid "" "A new window will open. Type a message into the box at the bottom of the " "window and press Enter to send it." msgstr "" -"这时会打开一个新的窗口。在窗口底部的文本框中输入一条消息，然后按回车键来发送。" +"一个新窗口会被打开。在窗口底部的文本框中输入一条消息，然后按Enter" +"发送。" #: C/send-message.page:50(title) -#, fuzzy -#| msgid "Send a message to someone" msgid "Send a message to a meta-contact" -msgstr "发送一条消息给某人" +msgstr "向一位元联系人发送消息" #: C/send-message.page:58(p) -#, fuzzy -#| msgid "" -#| "Right-click on the name of the contact you want to have a conversation " -#| "with, and choose Chat." msgid "" "Select the contact you want to have the conversation, and from the menu " "select Chat." -msgstr "右键点击您想要进行交谈的联系人的名字，然后选择 聊天" +msgstr "" +"选择您想要与之聊天的联系人，并在菜单中选择 聊天。" #: C/send-file.page:8(desc) msgid "Send a file from your computer to one of your contacts." -msgstr "从您的计算机上发送一个文件至您的联系人。" +msgstr "从您的计算机发送文件给您的联系人。" #: C/send-file.page:36(title) msgid "Send files" -msgstr "发送文件。" +msgstr "发送文件" + +#: C/send-file.page:40(p) C/favorite-rooms.page:66(p) +msgid "From the Contact List window, perform one of the following:" +msgstr "在联系人列表窗口，执行下列操作之一：" #: C/send-file.page:45(p) msgid "" "Right click on the contact you want to send a file to, and choose Send " "file." -msgstr "右键点击要发送文件的联系人，然后选择 发送文件。" +msgstr "右键点击要向其发送文件的联系人，然后选择发送文件。" #: C/send-file.page:50(p) msgid "" "Click on the contact you want to send a file, and choose EditContactSend file." msgstr "" -"点击您要发送文件的联系人，然后选择编辑联系人编辑联系人发送文件。" #: C/send-file.page:58(p) msgid "Select the file to send, and click on Send." -msgstr "选择要发送的文件，然后点击 发送。" +msgstr "选择要发送的文件，并点击发送。" #: C/send-file.page:63(p) msgid "The File Transfers window will appear." -msgstr "这时会显示 文件传输窗口。" +msgstr "文件传输窗口会被显示。" #: C/send-file.page:66(p) msgid "" "Wait for your contact to accept the file transfer, or click Stop " "to halt the transfer." -msgstr "等待您的联系人接受文件传输，或点击 停止 来终止传输。" +msgstr "请等待您的联系人接受文件传输，或点击停止来终止传输。" #: C/send-file.page:72(p) msgid "" "Once the transfer is finished, it is possible to close the File " "Transfers window." -msgstr "只要传输终止，就可以关闭 文件传输 窗口。" +msgstr "传输结束之后，就可以关闭文件传输窗口了。" #: C/send-file.page:80(p) msgid "" @@ -652,22 +629,22 @@ msgid "" "Clear to empty the list. This will only remove the files from the " "list and will not delete them from your computer." msgstr "" -"如果窗口中列出了很多已经完成的传输，点击 清除 可以清空列表。这只会" -"将列表清空，而不会从您的计算机上删除这些文件。" +"如果窗口中列出了很多已经完成的传输，点击清除可以清空列表。这只会将" +"列表清空，而不会从您的计算机上删除这些文件。" #: C/send-file.page:87(p) msgid "" "It is possible to send files only using the following services: Jabber, Google Talk and People Nearby." msgstr "" -"只可能使用下列服务进行发送文件：Jabber、Google Talk 和 " -"People Nearby。" +"只有使用下列服务才能发送文件：Jabber、Google Talk和附近" +"的人。" #: C/send-file.page:93(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 "为了给别人发送文件，您需要连接到互联网，或本地局域网。" +msgstr "要向别人发送文件，您需要连接到互联网，或本地局域网。" #: C/salut-protocol.page:8(desc) msgid "Understanding the People Nearby feature." @@ -712,7 +689,7 @@ msgstr "所有现代的本地局域网都应该可以支持这类服务。" #: C/remove-account.page:8(desc) msgid "Completely remove an account from Empathy." -msgstr "从 Empathy 中完全的删除一个账户。" +msgstr "从 Empathy 中完全地删除一个账户。" #: C/remove-account.page:33(title) msgid "Remove an account" @@ -725,7 +702,7 @@ msgid "" "Empathy again in the future, you will have to add your account " "details again." msgstr "" -"如果你不想再使用某个账户，您可以从 Empathy 中完全的删除这个账户。" +"如果你不想再使用某个账户，您可以从 Empathy 中完全地删除这个账户。" "如果您将来又希望在 Empathy 中使用这个账户了，您可以再添加这个账" "户。" @@ -735,8 +712,8 @@ msgid "" "From the Contact List window, choose EditAccounts, or press F4." msgstr "" -"从 联系人列表 窗口，选择 编辑账户，或按 F4。" +"在联系人列表窗口中，选择编辑账户，或按F4。" #: C/remove-account.page:46(p) msgid "" @@ -746,15 +723,14 @@ msgstr "在窗口左侧的账户列表中选择您想要删除的账户。" #: C/remove-account.page:50(p) msgid "Click on Remove." -msgstr "点击 删除。" +msgstr "点击删除。" #: C/remove-account.page:53(p) msgid "" "A dialog will be shown asking for confirmation. Click the Remove " "button to permanently remove the account." msgstr "" -"这时会弹出一个窗口来询问是否确认。点击 删除 按钮来永久的删除这个账" -"户。" +"一个弹出对话框会要求您确认删除。点击删除按钮来永久的删除这个账户。" #: C/remove-account.page:59(p) msgid "" @@ -781,15 +757,15 @@ msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" msgid "" "An error message which says “Network error” appears in the main " "window." -msgstr "一个显示“网络错误”的信息显示在主窗口中。" +msgstr "主窗口中显示了一个错误提示信息，“网络错误”。" #: C/prob-conn-neterror.page:33(title) msgid "I get a message that says “Network error”" -msgstr "我收到“网络错误”的信息" +msgstr "我收到“网络错误”的错误提示信息" #: C/prob-conn-neterror.page:36(cite) msgid "shaunm" -msgstr "" +msgstr "shaunm" #: C/prob-conn-neterror.page:37(p) msgid "" @@ -822,8 +798,8 @@ msgid "" "Click the edit icon in the error message." msgstr "" -"点击错误信息上的编辑图标。" +"点击错误提示信息上的编辑图标。" #: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p) msgid "" @@ -831,7 +807,7 @@ msgid "" "You should be able to find these details from the website of the messaging " "service." msgstr "" -"检查高级选项卡中是否所有细节都是正确的。您可以从即时通讯服务商的网" +"检查高级选项卡中的所有细节是否正确。您应当可以从即时通讯服务商的网" "站上找到这些信息。" #: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p) @@ -857,11 +833,11 @@ msgstr "“用户名已经被占用”" msgid "" "An error message which says “Name in use” appears in the main " "window." -msgstr "一个显示“用户名已经被占用”的信息显示在主窗口中。" +msgstr "主窗口中显示了一个错误提示信息，“用户名已被占用”。" #: C/prob-conn-name.page:32(title) msgid "I get a message that says “Name in use”" -msgstr "我收到“用户名已经被占用”的信息" +msgstr "我收到“用户名已经被占用”的错误提示信息" #: C/prob-conn-name.page:34(p) msgid "" @@ -882,7 +858,7 @@ msgid "" "the password for that nickname. For more information, see ." msgstr "" -"如果您已经在所用的网路中注册了昵称，请为该昵称设置密码。更多信息参见 。" #: C/prob-conn-name.page:64(p) @@ -890,17 +866,17 @@ msgid "" "Deselect the Enabled check-box next to the name of your account, " "and then select it again to try to reconnect to the service." msgstr "" -"取消选择账户旁边的已启用选框，然后再次选中以重新连接到服务器。" +"取消选择账户旁边的已启用复选框，然后再次选中以重新连接到服务器。" #: C/prob-conn-auth.page:8(desc) msgid "" "An error message which says “Authentication failed” appears in " "the main window." -msgstr "一个显示“验证失败”的信息显示在主窗口中。" +msgstr "主窗口中显示了一个错误提示信息，“验证失败”。" #: C/prob-conn-auth.page:36(title) msgid "I get a message that says “Authentication failed”" -msgstr "我收到“验证失败”的信息" +msgstr "我收到“验证失败”的错误提示信息" #: C/prob-conn-auth.page:38(p) msgid "" @@ -908,8 +884,8 @@ msgid "" "allowing you to connect because it does not recognize your username or " "password for some reason." msgstr "" -"这种错误是由于您的即时通信服务器不允许您连接，由于某种原因，它不识别您的用户" -"名或者密码。" +"这种错误发生在您的即时通信服务器无法确认您的身份，不允许您连接时。比如，因为" +"某种原因，它无法识别您的用户名或者密码。" #: C/prob-conn-auth.page:50(p) msgid "" @@ -929,7 +905,7 @@ msgstr "再次输入您的用户名和密码，以确保它们是正确的。" msgid "" "The instant messaging account that you want to use is not enabled in the " "list of accounts." -msgstr "您要连接的即时通信账户没有在帐号列表中启用。" +msgstr "您要连接的即时通信账户没有在账户列表中启用。" #: C/prob-conn-acctdisabled.page:33(title) msgid "My account is not enabled" @@ -985,7 +961,7 @@ msgid "" msgstr "" "Empathy 自动保存您和联系人的所有文字会话。您可以搜索之前全部的会话或者根据联系人和日期浏览之前的会话。" +"\">浏览之前的会话。" #: C/prev-conv.page:54(p) msgid "" @@ -1021,19 +997,21 @@ msgid "" "In the For field, type the text you want to search for. Click " "Find or press Enter." msgstr "" +"在关键词中，输入您想要搜索的文字。点击查找或按" +"Enter。" #: C/prev-conv.page:78(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 "" -"任何符合搜索项的会话都会显示在搜索域下面的列表中。会话默认安装时间排序。" +msgstr "符合搜索条件的会话会显示在下面的列表中。会话默认按日期排序。" #: C/prev-conv.page:82(p) msgid "" "Click on a conversation to view it. Empathy will select the text " "in the conversation that matched your search terms." msgstr "" +"点击一个会话以查看。Empathy 会选择这个会话中符合您搜索条件的文字。" #: C/prev-conv.page:89(title) msgid "Browse previous conversations" @@ -1054,12 +1032,13 @@ 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." msgstr "" +"在左上的下拉列表中选择一个账户。下方会显示这个账户的联系人和聊天室列表。" #: C/prev-conv.page:107(p) msgid "" "Select a contact or chat room to view your previous conversations from. By " "default the most recent conversation will be shown." -msgstr "" +msgstr "选择一个联系人或聊天室以查看之前的会话。默认显示的是最近的会话。" #: C/prev-conv.page:111(p) msgid "" @@ -1068,12 +1047,16 @@ msgid "" "date to select it. Click the arrows next to the month and year to browse " "earlier dates." msgstr "" +"您可以按日期浏览您的会话。如果在某日您所选择的账户有过会话，该日会以粗体显" +"示。点击一个日期以选择它。点击月和年旁的箭头以浏览更早的日期。" #: C/prev-conv.page:117(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." msgstr "" +"您可以在上方的搜索栏中输入文字，以在显示的会话中搜索文字。匹配的文字会被高亮" +"显示。" #: C/prev-conv.page:121(p) msgid "" @@ -1082,10 +1065,13 @@ msgid "" "choose View Previous Conversations. The Previous " "Conversations window will open with that contact already selected." msgstr "" +"在 联系人列表 窗口中，您可以快速的查看与某个联系人之前进行过的会" +"话。右键点击该联系人并选择 查看以前的对话。最近会话窗口" +"会打开，且该联系人会被选中。" #: C/link-contacts.page:11(desc) msgid "Merge and separate different contacts into a single one." -msgstr "" +msgstr "将不同的联系人合并分割为一个联系人。" #: C/link-contacts.page:25(title) msgid "Combine and separate contacts" @@ -1095,19 +1081,19 @@ msgstr "合并和分割联系人" 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 "" +msgstr "如果您的联系人有多个聊天服务的多个账户，您可以将他们合并成一个联系人。" #: C/link-contacts.page:30(p) msgid "" "The resulting contact is called a meta-contact: a contact composed " "from different single contacts." -msgstr "" +msgstr "产生的联系人称为一个元联系人：由多个不同联系人组成的联系人。" #: C/link-contacts.page:34(p) msgid "" "If you have a Jane Smith contact that is using three different messaging " "services like:" -msgstr "" +msgstr "如果您有一个叫做 Jane Smith 的联系人，她使用三种不同的聊天服务：" #: C/link-contacts.page:40(p) msgid "janes@facebook" @@ -1123,7 +1109,7 @@ msgstr "jane_smith@hotmail" #: C/link-contacts.page:55(p) msgid "You can combine these contacts into a single Jane Smith one." -msgstr "" +msgstr "您可以将这些联系人合并成一个 Jane Smith." #: C/link-contacts.page:60(title) msgid "Combining contacts" @@ -1135,22 +1121,18 @@ msgid "" "has different accounts, and select Link Contacts...." msgstr "" +"在 联系人列表 窗口，右键点击有不同账户的联系人，并选择 绑定联系人…" #: C/link-contacts.page:70(p) -#, fuzzy -#| msgid "" -#| "From the Saved Presets box, select the status message you want " -#| "to remove." msgid "" "From the left pane in the Link Contacts window, select the " "contacts you want to combine." -msgstr "从 已保存的自定义状态 框中，选择您想要删除的状态消息。" +msgstr "在 绑定联系人 窗口的左窗格，选择您想要关联起来的联系人。" #: C/link-contacts.page:76(p) -#, fuzzy -#| msgid "Click on Remove." msgid "Click Link." -msgstr "点击 删除。" +msgstr "点击 绑定." #: C/link-contacts.page:82(p) msgid "" @@ -1158,6 +1140,8 @@ msgid "" "to have a conversation with when you double-click on it, is the contact with " "the highest presence on-line." msgstr "" +"当一个元联系人被创建后，您双击该联系人时默认使用的联系人是有最高的在线状态的" +"联系人。" #: C/link-contacts.page:91(title) msgid "Separating contacts" @@ -1168,12 +1152,12 @@ msgid "" "From the Contact List, right-click the contact to separate, and " "select Link Contacts...." msgstr "" +"在 联系人列表 窗口中，右键点击要分割的联系人，并选择 绑定联系人…" #: C/link-contacts.page:100(p) -#, fuzzy -#| msgid "Click on Remove." msgid "Click Unlink." -msgstr "点击 删除。" +msgstr "点击 解除绑定。" #: C/license.page:8(desc) msgid "Legal information." @@ -1251,10 +1235,8 @@ msgstr "" "creativecommons.org/licenses/by-sa/3.0/\">通俗协议。" #: C/irc-start-conversation.page:8(desc) -#, fuzzy -#| msgid "Start a video conversation with one of your contacts." msgid "Start a conversation with an IRC contact." -msgstr "向您的联系人发起视频会话。" +msgstr "向一位 IRC 联系人发起会话。" #: C/irc-start-conversation.page:30(title) msgid "Chat with somebody on IRC" @@ -1265,6 +1247,8 @@ 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/irc-start-conversation.page:37(p) msgid "" @@ -1272,6 +1256,8 @@ msgid "" "you want to chat with. Alternatively, right click the name of the user and " "choose Chat." msgstr "" +"在一个 IRC 聊天室的联系人列表中，双击您想要聊天的用户。或者，右键点击用户的姓" +"名并选择 聊天" #: C/irc-start-conversation.page:45(p) msgid "" @@ -1279,6 +1265,8 @@ msgid "" "list. It contains a list of users in the IRC chat room you joined. Different " "rooms can have different contacts listed." msgstr "" +"IRC 聊天室的联系人列表与 Empathy 的联系人列表不同。它包含了您加入" +"的这个 IRC 聊天室中的用户列表。不同的聊天室可能有不同的联系人列表。" #: C/irc-start-conversation.page:52(p) msgid "" @@ -1286,6 +1274,8 @@ msgid "" "window. If you do not see it, choose ConversationShow Contact List." msgstr "" +"IRC 聊天室的联系人列表通常位于窗口右侧。如果您没有看到它，选择 " +"对话显示联系人列表。" #: C/irc-send-file.page:9(desc) msgid "Empathy does not currently support sending files using IRC." @@ -1314,6 +1304,9 @@ msgid "" "and identify yourself. Some IRC chat rooms may not allow you to join without " "a registered nickname." msgstr "" +"在某些 IRC 网络上，您可以通过 NickServ 服务注册您的昵称。通过向 NickServ 发送" +"特殊的消息，您可以设置密码来认证您自己。一些 IRC 聊天室可能不允许您加入，除非" +"您有注册过的昵称。" #: C/irc-nick-password.page:40(p) msgid "" @@ -1323,6 +1316,9 @@ msgid "" "Empathy to identify yourself to NickServ. The popular freenode " "network is known to have this feature." msgstr "" +"Empathy 目前还不支持昵称注册。但一些 IRC 网络会自动向 NickServ 发" +"送一个 服务器密码。在这样的网络上，您可以在 Empathy 中使" +"用这样的密码向 NickServ 认证您自己。流行的 freenode 网络就有这个功能。" #: C/irc-nick-password.page:46(p) msgid "To set an IRC server password:" @@ -1330,13 +1326,13 @@ msgstr "设置一个 IRC 密码：" #: C/irc-nick-password.page:54(p) msgid "Select the IRC account from the list on the left of the dialog." -msgstr "" +msgstr "在左侧的对话框中选择一个 IRC 账户" #: C/irc-nick-password.page:57(p) msgid "" "In the Password field, type the password you used to register " "your nikcname." -msgstr "" +msgstr "在 密码 一栏中，输入您注册您的昵称时使用的密码。" #: C/irc-nick-password.page:63(p) C/import-account.page:61(p) msgid "Click Apply." @@ -1348,34 +1344,41 @@ msgid "" "certain IRC networks. It is not currently possible to register an IRC " "nickname or change your nickname password using Empathy." msgstr "" +"这些说明只是允许您在特定的 IRC 网络上使用密码保护的昵称。目前在 " +"Empathy 中还不能注册 IRC 昵称或修改密码。" -#: C/irc-manage.page:9(desc) +#: C/irc-manage.page:10(desc) msgid "How to use IRC with Empathy." msgstr "如何在 Empathy 中使用 IRC。" -#: C/irc-manage.page:34(title) +#: C/irc-manage.page:35(title) msgid "Internet Relay Chat (IRC)" msgstr "互联网中继聊天(IRC)" -#: C/irc-manage.page:37(p) C/account-irc.page:39(p) +#: C/irc-manage.page:38(p) C/account-irc.page:39(p) msgid "" "You must have the telepathy-idle package installed to use IRC in " "Empathy." msgstr "" +"要在 Empathy 中使用 IRC，您必须安装 telepathy-idle 包。" -#: C/irc-manage.page:43(title) +#: C/irc-manage.page:42(link) +msgid "Install telepathy-idle" +msgstr "安装 telepathy-idle" + +#: C/irc-manage.page:49(title) msgid "IRC Chat Rooms and Conversations" msgstr "IRC 聊天室和会话" -#: C/irc-manage.page:45(title) +#: C/irc-manage.page:51(title) msgid "Chat Rooms and Conversations" msgstr "聊天室和会话" -#: C/irc-manage.page:50(title) +#: C/irc-manage.page:56(title) msgid "Common IRC Problems" msgstr "常见 IRC 问题" -#: C/irc-manage.page:52(title) C/index.page:55(title) +#: C/irc-manage.page:58(title) C/index.page:55(title) msgid "Common Problems" msgstr "常见问题" @@ -1393,6 +1396,9 @@ msgid "" "you’re connected to. To connect to an IRC network, see and ." msgstr "" +"您可以加入您已经连接的所有 IRC 网络上的 IRC 聊天室(也称为 IRC 频道)。要连接一" +"个 IRC 网络，参见 and 。" #: C/irc-join-room.page:39(p) C/group-conversations.page:58(p) #: C/group-conversations.page:122(p) @@ -1400,18 +1406,22 @@ msgid "" "From the Contact List window, choose RoomJoin." msgstr "" +"在 联系人列表 窗口，选择 聊天室加入。" #: C/irc-join-room.page:45(p) msgid "" "From the Account drop-down list, select the IRC account that " "corresponds to the network you want to use." -msgstr "" +msgstr "在 账户 下拉列表中，选择与您想要使用的网络对应的 IRC 账户。" #: C/irc-join-room.page:51(p) msgid "" "In the Room text box, type the name of the channel you want to " "join. IRC channel names start with the hash character (#)." msgstr "" +"在 聊天室 文本框中，输入您想要加入的频道的名称。IRC 频道名称以井号" +"(#)开头。" #: C/irc-join-room.page:57(p) msgid "Click Join to enter the room." @@ -1435,6 +1445,8 @@ 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:" msgstr "" +"在某些 IRC 网络上，私人的 IRC 房间可以被密码保护。如果您知道这密码，按照下面" +"的步骤加入：" #: C/irc-join-pwd.page:33(p) msgid "Join the room as normal." @@ -1445,6 +1457,8 @@ msgid "" "Empathy will prompt you for a password. Enter the password for the IRC chat " "room and click Join." msgstr "" +"Empathy 会提示您输入密码。输入这个 IRC 聊天室的密码并点击 加入。" #: C/irc-commands.page:7(desc) msgid "The supported IRC commands." @@ -1459,6 +1473,8 @@ msgid "" "To see the list of the supported IRC commands, in a chat room type /" "help and press Enter." msgstr "" +"要查看支持的 IRC 命令的列表，在一个聊天室中输入/help并按" +"Enter。" #: C/irc-commands.page:24(p) msgid "All commands available have a small description on their usage." @@ -1489,12 +1505,16 @@ msgid "" "transfers, and all the most used messaging systems such as MSN and Google " "Talk." msgstr "" +"Empathy 是 GNOME 桌面的即时通讯程序。它支持文字消息，语音和视频呼" +"叫，文件传输，支持最常用的即时通讯系统，包括 MSN 和 Google Talk." #: C/introduction.page:28(p) msgid "" "Empathy includes features that help you better collaborate while " "at work, and that let you easily keep in touch with your friends." msgstr "" +"Empathy 可以帮助您在工作中更好的合作，也可以帮助您与您的朋友们保持" +"联系。" #: C/introduction.page:32(p) msgid "" @@ -1503,6 +1523,9 @@ msgid "" "search through your previous conversations, and share your desktop in just " "two clicks." msgstr "" +"使用 Empathy，您可以将所有的会话组织在同一个窗口中，或者为不同类型" +"的会话使用不同的窗口，还可以很容易地搜索之前的会话，或者共享您的桌面，只需要" +"两次点击。" #: C/introduction.page:39(title) msgid "Contact List window" @@ -1550,11 +1573,11 @@ msgstr "文字聊天" #: C/index.page:47(title) msgid "Audio and Video Conversations" -msgstr "音频和视频聊天" +msgstr "语音和视频聊天" #: C/index.page:51(title) msgid "Advanced Actions" -msgstr "" +msgstr "高级操作" #: C/import-account.page:10(desc) msgid "Import an account from another instant messaging application." @@ -1578,32 +1601,35 @@ msgid "" "accounts from other instant messaging applications. Currently, the only " "supported application is Pidgin." msgstr "" +"Empathy 第一次运行时，会提示您可以从其他即时通讯程序中导入账户。目" +"前，支持的程序只有 Pidgin。" #: C/import-account.page:50(p) msgid "" "Run Empathy for the first time. An assistant will offer you a " "number of options to create new accounts." msgstr "" +"第一次运行 Empathy，一个助理程序会提供若干选项以创建新账户。" #: C/import-account.page:54(p) msgid "" "Select Yes, import my account details from and click " "Forward." -msgstr "" +msgstr "选择 有，请导入我的账户信息 并点击 前进。" #: C/import-account.page:58(p) msgid "Select the check box next to each account you wish to import." -msgstr "" +msgstr "选择每个您想要导入的账户旁的复选框。" #: C/import-account.page:66(p) msgid "" "It is not currently possible to import accounts after you have completed the " "first-run assistant." -msgstr "" +msgstr "目前，您只能在第一次运行时的助理程序中导入账户。" #: C/hide-contacts.page:8(desc) msgid "Hide the offline contacts from your Contact List." -msgstr "" +msgstr "在 联系人列表 中隐藏离线联系人。" #: C/hide-contacts.page:19(title) msgid "Hide offline contacts" @@ -1614,6 +1640,8 @@ msgid "" "Normally, Empathy shows all your contacts: those that are online, " "with which you can have a conversation, and also those that are offline." msgstr "" +"一般情况下，Empathy 会显示您所有的联系人：您可以与之进行会话的在线" +"的联系人，和那些离线的联系人。" #: C/hide-contacts.page:25(p) msgid "To hide the contacts that are offline:" @@ -1625,6 +1653,8 @@ msgid "" "gui>Offline Contacts, or press CtrlH." msgstr "" +"在 联系人列表 窗口，选择 查看离线联系人，或按下 CtrlH。" #: C/hide-contacts.page:36(p) msgid "To show the offline contacts again, repeat the same procedure above." @@ -1632,55 +1662,57 @@ msgstr "要再次显示离线的联系人，重复上面的步骤。" #: C/group-conversations.page:8(desc) msgid "Start or join a group conversation with your contacts." -msgstr "" +msgstr "开始和您的联系人进行群组聊天，或加入群组聊天。" #: C/group-conversations.page:34(title) msgid "Group conversations" -msgstr "" +msgstr "群组聊天" #: C/group-conversations.page:36(p) msgid "" "Group conversations permits you to have text conversations with more than " "one contact at the same time." -msgstr "" +msgstr "在群组聊天中，您可以和不止一位联系人同时进行文字交谈。" #: C/group-conversations.page:40(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 账户，或者“附近的人”账" +"户。" #: C/group-conversations.page:46(p) msgid "" "You can have a group conversation only with the contacts that are using the " "same service as yours." -msgstr "" +msgstr "您只能和那些与您使用同样的服务的联系人进行群组聊天。" #: C/group-conversations.page:54(title) msgid "Start a group conversation" -msgstr "" +msgstr "开始群组聊天" #: C/group-conversations.page:63(p) msgid "" "From the Account drop-down list, select the account you want to " "use for the group conversation." -msgstr "" +msgstr "在 账户 下拉列表中，选择一个账户用来进行群组聊天。" #: C/group-conversations.page:69(p) msgid "" "In the Server text box, type the name of server in which the " "conversation will be hosted." -msgstr "" +msgstr "在 服务器 文本框中，输入将会承载这次聊天的服务器名称。" #: C/group-conversations.page:73(p) msgid "Leave it empty if it will be on the current server." -msgstr "" +msgstr "如果要使用当前服务器，请将其留空。" #: C/group-conversations.page:78(p) msgid "" "In the Room text box, type the name you want to give to the " "conversation." -msgstr "" +msgstr "在 聊天室 文本框中，输入您为这次群组聊天起的名字。" #: C/group-conversations.page:82(p) msgid "" @@ -1688,6 +1720,8 @@ msgid "" "name will be publicly available for other people to join. It is not possible " "to create a private room." msgstr "" +"这将是您进行群组聊天的聊天室的名字。这个名字会被大家看到以使大家可以加入。您" +"不能建立一个私人的聊天室。" #: C/group-conversations.page:90(p) msgid "" @@ -1695,34 +1729,38 @@ msgid "" "Contact List window, select the contact you want to invite, and " "perform one of the following:" msgstr "" +"要邀请其他联系人加入这次群组聊天，在 联系人列表 窗口，选择您想要邀" +"请的联系人，并进行下列操作中的某一项：" #: C/group-conversations.page:97(p) msgid "Right-click on the contact and choose Invite to chatroom." -msgstr "" +msgstr "右键点击联系人，并选择 邀请到聊天室。" #: C/group-conversations.page:102(p) msgid "" "Choose EditContactInvite to chatroom." msgstr "" +"选择 编辑联系人邀请到聊天室。" #: C/group-conversations.page:107(p) msgid "" "If you have more than one group conversation open, select the one you want " "to invite your contacts." -msgstr "" +msgstr "如果您打开了不止一个群组聊天，选择您想要邀请联系人加入的那个。" #: C/group-conversations.page:118(title) msgid "Join a group conversation" -msgstr "" +msgstr "加入群组聊天。" #: C/group-conversations.page:128(p) msgid "Expand the Room List section to see all the existing rooms." -msgstr "展开房间列表部分来查看所有存在的房间。" +msgstr "展开聊天室列表选项卡来查看所有存在的房间。" #: C/group-conversations.page:133(p) msgid "Double-click on the name of a room to join it." -msgstr "双击房间的名称来加入它。" +msgstr "双击房间的名称加入。" #: C/group-conversations.page:139(p) msgid "" @@ -1730,6 +1768,8 @@ msgid "" "require a password, or might be invitation only. Empathy does not " "support these kind of rooms." msgstr "" +"并非所有的聊天室都可以加入。有些聊天室可能需要密码，有些只有收到邀请才能加" +"入。Empathy 不支持这些房间。" #: C/geolocation-what-is.page:9(desc) msgid "Understanding geolocation." @@ -1761,13 +1801,13 @@ msgstr "查看联系人的地址位置并快速联系他们。" msgid "" "Set the accuracy of your location and the device used to discover your " "location." -msgstr "" +msgstr "设置您的地理位置的精度及可以用来发现您的地理位置的设备。" #: C/geolocation-what-is.page:60(p) msgid "" "In order to see your contacts’ geographical locations, they need to use a " "service and an application that supports geolocation." -msgstr "" +msgstr "您的联系人必须使用支持地理位置的程序，您才能看到他们的地理位置。" #: C/geolocation-turn.page:9(desc) msgid "How to activate and deactivate geolocation in Empathy." @@ -1788,17 +1828,17 @@ msgstr "选择位置标签。" #: C/geolocation-turn.page:47(p) msgid "" "Select Publish location to my contacts to activate geolocation." -msgstr "" +msgstr "选择 向我的联系人公布位置信息 以激活地理位置。" #: C/geolocation-turn.page:50(p) msgid "To deactivate geolocation, deselect it." -msgstr "" +msgstr "要禁用地理位置，请取消选择。" #: C/geolocation-turn.page:55(p) msgid "" "To increase the accuracy of your position, deselect Reduce location " "accuracy." -msgstr "" +msgstr "要提高您的位置的精度，请取消选择 降低位置信息精度。" #: C/geolocation-turn.page:61(p) msgid "" @@ -1806,10 +1846,12 @@ msgid "" "position, select the appropriate option in the Location sources " "section." msgstr "" +"如果您有 GPS 这样的外部设备，或者想要发送更加精确的位置信息，在位置来源" +"选项卡中选择适当的选项。" #: C/geolocation-supported.page:7(desc) msgid "Services that supports geolocation and compatibility." -msgstr "" +msgstr "支持地理位置的服务和及其兼容性。" #: C/geolocation-supported.page:31(title) msgid "Supported services" @@ -1821,6 +1863,8 @@ msgid "" "service. In order to use it, you and your contacts need to have a Jabber " "account." msgstr "" +"目前，只有 Jabber 服务与地理位置功能兼容。要使用地理位置，您和您的联系人必须" +"有 Jabber 账户。" #: C/geolocation-supported.page:39(p) msgid "" @@ -1828,10 +1872,12 @@ msgid "" "feature. Most of the Jabber servers support it. See your service website " "documentation for more information." msgstr "" +"而且，您使用的服务器也需要支持地理位置功能。大多 Jabber 服务器都支持。要了解" +"更多，请参看您的服务提供者的网站文档。" #: C/geolocation-supported.page:47(title) msgid "Compatibility" -msgstr "" +msgstr "兼容性" #: C/geolocation-supported.page:49(p) msgid "" @@ -1839,10 +1885,12 @@ msgid "" "geographical position services such as Google Latitude, Yahoo " "Fire Eagle or Brightkite." msgstr "" +"Empathy 的地理位置功能与其他一些地理位置信息服务并不兼容，如 " +"Google Latitude，Yahoo Fire Eggle 和 Brightkite。" #: C/geolocation-privacy.page:8(desc) msgid "What information are sent and to who." -msgstr "" +msgstr "发送了什么信息，发送给谁了？" #: C/geolocation-privacy.page:32(title) msgid "Geolocation Privacy" @@ -1850,7 +1898,7 @@ msgstr "地理位置隐私" #: C/geolocation-privacy.page:35(title) msgid "What information is sent" -msgstr "" +msgstr "什么信息被发送了" #: C/geolocation-privacy.page:36(p) msgid "" @@ -1858,13 +1906,15 @@ msgid "" "building, floor, room, and postal code, longitude, latitude and altitude, " "speed and bearing." msgstr "" +"有可能被发送的信息：您所在的国家，地区，地方，区域，街道，建筑，楼层，房间，" +"邮政编码及经纬度，您的速度和方向。" #: 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 "" +msgstr "您的地理位置信息的精度和质量取决于软件或者用于发现您的位置的设施。" #: C/geolocation-privacy.page:44(p) msgid "" @@ -1872,20 +1922,23 @@ msgid "" "send different information. The use of external devices such as GPS or " "mobile phone will increase the accuracy of the information sent." msgstr "" +"不同的网络可能有不同的精度设置，可能发送不同的信息。使用外部设备，如 GPS 或手" +"机，可以增加发送的信息的精度。" #: C/geolocation-privacy.page:49(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." msgstr "" +"当隐私模式被启用后，只有您所在的城市信息会被发送，即使您正在使用外部设备。" #: C/geolocation-privacy.page:56(title) msgid "Who can see the information sent" -msgstr "" +msgstr "谁会看到这些发送出去的信息" #: C/geolocation-privacy.page:57(p) msgid "Only your contacts can see your geographical position." -msgstr "" +msgstr "只有您的联系人可以看到您的地理位置。" #: C/geolocation-privacy.page:63(title) msgid "What is the privacy mode" @@ -1896,19 +1949,21 @@ 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." msgstr "" +"隐私模式是精度降低模式，它会降低发送给您的联系人的地理位置信息的精度。隐私模" +"式默认开启。" #: C/geolocation-privacy.page:71(title) msgid "Privacy overview" -msgstr "" +msgstr "隐私概述" #: C/geolocation-privacy.page:72(p) msgid "" "Overview of the various geolocation privacy settings in Empathy." -msgstr "" +msgstr "Empathy 中一些关于地理位置隐私的选项的概况。" #: C/geolocation-privacy.page:77(p) msgid "Geolocation is not enabled by default." -msgstr "" +msgstr "地理位置默认不开启。" #: C/geolocation-privacy.page:82(p) msgid "Privacy mode is enabled by default." @@ -1917,7 +1972,7 @@ msgstr "隐私模式默认被激活" #: C/geolocation-privacy.page:87(p) msgid "" "Privacy mode prevails even when using external and more precise devices." -msgstr "" +msgstr "即使在使用精度更高的外部设备，隐私模式也会发挥作用。" #: C/geolocation-privacy.page:92(p) msgid "Only your contacts can see your position." @@ -1925,29 +1980,32 @@ msgstr "只有您的联系人可以看到您的位置。" #: C/geolocation-not-showing.page:8(desc) msgid "Empathy does not publish my geographical position." -msgstr "" +msgstr "Empathy 没有发布我的地理位置。" #: C/geolocation-not-showing.page:32(title) msgid "Geographical position not published" -msgstr "" +msgstr "地理位置没有被公布。" #: C/geolocation-not-showing.page:34(p) msgid "" "If your contacts cannot see your location, Empathy might not be " "able to discover with a good margin of precision your geographical position." msgstr "" +"如果您的联系人不能看到您的位置，可能是因为 Empathy 无法发现有一定" +"精度的您的地理位置信息。" #: C/geolocation-not-showing.page:38(p) msgid "" "In this case, your position will not be published, but you are still able to " "see the location of your contacts." msgstr "" +"在这种情况下，您的位置信息不会被公布，但您仍可以看到您的联系人的位置信息。" #: C/geolocation-not-showing.page:42(p) msgid "" "If you want to publish your geographical position, you can try to use an " "external device such as a GPS." -msgstr "" +msgstr "如果您想要公布您的地理位置，您可以试一试使用 GPS 等外部设备。" #: C/geolocation-not-showing.page:48(p) msgid "" @@ -1957,6 +2015,10 @@ msgid "" "PEP is maintained online. Google Talk does not support this feature " "at this time." msgstr "" +"要发布您的地理位置，您的 Jabber 服务器必须支持 Personal Eventing Protocal " +"(PEP)。互联网上有人维护着一份支持 PEP 的服务器列表。Google Talk 目前不" +"支持 PEP。" #: C/geolocation.page:8(desc) msgid "Use and understand geolocation in Empathy." @@ -1964,11 +2026,11 @@ msgstr "使用和了解 Empathy 中的地理位置。" #: C/geolocation.page:32(title) msgid "Geographical position" -msgstr "" +msgstr "地理位置" #: C/geolocation.page:35(title) msgid "Geolocation" -msgstr "" +msgstr "地理位置" #: C/geolocation.page:39(title) msgid "Fix common problems" @@ -1976,41 +2038,43 @@ msgstr "修复常见问题" #: C/favorite-rooms.page:10(desc) msgid "Set, join and manage favorite rooms." -msgstr "" +msgstr "设立，加入或管理聊天室收藏。" #: C/favorite-rooms.page:29(title) msgid "Favorite rooms" -msgstr "" +msgstr "聊天室收藏" #: C/favorite-rooms.page:32(title) msgid "Set a room as a favorite" -msgstr "" +msgstr "收藏一个聊天室" #: C/favorite-rooms.page:35(p) msgid "Join a room." -msgstr "加入一个房间。" +msgstr "加入一个聊天室。" #: C/favorite-rooms.page:40(p) msgid "" "See for more information on how to join an " "IRC room." -msgstr "" +msgstr "关于如何加入 IRC 聊天室，参见 。" #: C/favorite-rooms.page:46(p) msgid "" "See for more information on how to " "start or join a group conversation." msgstr "" +"关于如何发起或加入群组聊天，参见 。" #: C/favorite-rooms.page:54(p) msgid "" "From the conversation window, choose ConversationFavorite Chat Room." msgstr "" +"在会话窗口，选择 会话收藏聊天室。" #: C/favorite-rooms.page:63(title) msgid "Join favorite rooms" -msgstr "" +msgstr "加入收藏的聊天室" #: C/favorite-rooms.page:71(p) msgid "Press F5." @@ -2021,58 +2085,62 @@ msgid "" "Choose RoomJoin Favorites, to join " "all your favorite rooms." msgstr "" +"选择 聊天室加入已收藏的聊天室，以加入" +"您之前收藏的聊天室。" #: C/favorite-rooms.page:82(p) msgid "Choose Room, and select the favorite room you want to join." -msgstr "" +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 "" +msgstr "要加入一个已收藏的聊天室，您必须连接互联网和您的账户。" #: C/favorite-rooms.page:98(title) msgid "Manage favorite rooms" -msgstr "" +msgstr "管理聊天室收藏" #: C/favorite-rooms.page:101(p) msgid "" "From the Contact List window, choose RoomManage Favorites." msgstr "" +"在 联系人列表 窗口，选择 聊天室管理收藏夹" +"。" #: C/favorite-rooms.page:107(p) msgid "" "From the Account drop-down list, select the account you want to " "manage the favorite rooms of." -msgstr "" +msgstr "在 账户 下拉列表中，选择您要管理聊天室收藏的账户。" #: C/favorite-rooms.page:111(p) msgid "Select All to see all you favorite rooms." -msgstr "" +msgstr "选择 全部 以看到搜有您收藏的聊天室。" #: C/favorite-rooms.page:116(p) msgid "Select the favorite room you want to manage:" -msgstr "" +msgstr "选择您要管理的收藏：" #: C/favorite-rooms.page:121(p) msgid "" "Select the Auto-Connect check-box in order to automatically join " "that room when you connect to your account." -msgstr "" +msgstr "选择 自动连接，则您连接到您的账户后，会自动加入这个聊天室。" #: C/favorite-rooms.page:127(p) msgid "Click on Remove to remove the room from your favorites." -msgstr "" +msgstr "点击 删除 以从收藏夹中删除这个聊天室。" #: C/favorite-rooms.page:134(p) msgid "When done, click Close." -msgstr "完成后点关闭。" +msgstr "完成后，点击 关闭。" #: C/disable-account.page:9(desc) msgid "Prevent Empathy from automatically logging in to an account." -msgstr "" +msgstr "使 Empathy 不要自动登录一个账户。" #: C/disable-account.page:39(title) msgid "Disable an account" @@ -2085,28 +2153,31 @@ msgid "" "enable an account if you only want to be logged in to the account at certain " "times, but you still want to use Empathy for other accounts." msgstr "" +"您可以禁用一个账户以阻止 Empathy 自动登录这个账户而不必将其彻底删" +"除。您可能想要禁用、启用某个账户如果您只想偶尔登录这个账户，但又想使用 " +"Empathy 中的其他账户。" #: C/disable-account.page:52(p) msgid "" "Select the account you wish to disable from the accounts list on the left " "side of the window." -msgstr "" +msgstr "在窗口左侧的账户列表中，选择您想要禁用的账户。" #: C/disable-account.page:56(p) msgid "" "Deselect Enabled on the right side of the " "window." -msgstr "" +msgstr "在窗口右侧，取消选择 启用。" #: C/disable-account.page:62(p) msgid "" "To re-enable the account, simply select Enabled." -msgstr "" +msgstr "要重新启用这个账户，只需选择 启用。" #: C/create-account.page:9(desc) msgid "Register for an account with one of the supported messaging services." -msgstr "" +msgstr "为某种支持的服务注册账户。" #: C/create-account.page:34(title) msgid "Register for a new account" @@ -2120,6 +2191,9 @@ msgid "" "app> to register for a new account, using the same steps as you would to " "add an account." msgstr "" +"大多账户类型需要您在使用 Empathy 这样的即时通讯软件连接之前先建立" +"账户。但对于某些账户提供商，您可以使用 Empathy 来注册新账户，使用" +"与 添加账户 相同的步骤。" #: C/create-account.page:42(p) msgid "" @@ -2128,6 +2202,8 @@ msgid "" "password, as well as any additional information you need to connect using " "Empathy." msgstr "" +"这一页是关于建立各种类型的账户的。您应当已经从您的账户提供商那里得到了登录 " +"ID 和密码，以及其他使用 Empathy 连接这个账户需要的信息。" #: C/create-account.page:47(title) msgid "Facebook" @@ -2138,6 +2214,8 @@ msgid "" "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/create-account.page:52(p) msgid "" @@ -2145,6 +2223,8 @@ msgid "" "new account from the website: www." "facebook.com." msgstr "" +"要使用 Facebook 与您的朋友们交流，您需要在其网站上建立一个新账户：www.facebook.com。" #: C/create-account.page:60(title) C/audio-video.page:170(p) msgid "Jabber" @@ -2156,6 +2236,8 @@ msgid "" "choose your account provider and communicate with all other Jabber users, " "regardless of their account provider." msgstr "" +"Jabber 是一种开放的即时通讯系统。像 email 一样，Jabber 允许您选择账户提供商，" +"并与其他 Jabber 用户交流，无论他们使用哪里账户提供商。" #: C/create-account.page:66(p) msgid "" @@ -2163,6 +2245,8 @@ msgid "" "free providers; one popular provider is Jabber.org." msgstr "" +"您需要在某个 Jabber 服务提供商那里建立账户。有许多 Jabber 服务提供商，Jabber.org 是很流行的一个。" #: C/create-account.page:71(p) msgid "" @@ -2170,10 +2254,13 @@ msgid "" "Google Talk is a Jabber service. Simply use your Google Mail address and " "password in Empathy to connect." msgstr "" +"如果您使用 Google Mail 或者 Google Talk，那么您已经拥有 Jabber 账户了。" +"Google Talk 就是一个 Jabber 服务。您只需要使用您的 Google Mail 地址和密码在 " +"Empathy 中连接。" #: C/create-account.page:78(title) C/audio-video.page:190(p) msgid "People Nearby" -msgstr "" +msgstr "附近的人" #: C/create-account.page:80(p) msgid "" @@ -2182,10 +2269,12 @@ msgid "" "such as a wireless hotspot. It automatically finds all other users on the " "network who are also using this service." msgstr "" +"要使用这个服务，您并不需要在某个服务提供商那里创建账户，只需要连接到一个本地" +"网络，比如一个无线热点。它会自动发现网络中使用这个服务的其他用户。" #: C/create-account.page:85(p) msgid "For more information, see ." -msgstr "" +msgstr "更多信息参见。" #: C/create-account.page:89(title) C/audio-video.page:205(p) msgid "SIP" @@ -2198,6 +2287,9 @@ msgid "" "provider. You can communicate with all other SIP users, regardless of which " "SIP provider they use." msgstr "" +"SIP 是一种允许用户通过互联网进行语音和视频会话的开放系统。您需要在某个 SIP 服" +"务提供商处创建账户。您可以和其他的 SIP 用户交流，无论他们的 SIP 服务提供商与" +"您是否相同。" #: C/create-account.page:97(p) msgid "" @@ -2205,12 +2297,16 @@ msgid "" "index.php?page=register\">Ekiga.net service does not currently work " "with Empathy." msgstr "" +"由于技术上的差别，免费的 Ekiga.net 服务目前在 Empathy 中还不能使用。" #: C/create-account.page:102(p) msgid "" "Some SIP providers allow you to call normal phones from your computer. " "Generally, you will need to subscribe to a paid service for this feature." msgstr "" +"有些 SIP 服务提供商允许用您的计算机呼叫一般的电话。通常，您需要订阅某种付费服" +"务才能使用这个功能。" #: C/create-account.page:107(title) C/audio-video.page:165(p) msgid "IRC" @@ -2223,22 +2319,29 @@ msgid "" "is only established each time you connect. If another user is using the " "nickname, you will need to choose a new nickname." msgstr "" +"您不需要注册账户就可以使用 IRC。尽管您在 Empathy 中添加 IRC 账户时" +"指定了一个昵称，这个昵称只是您每次连接时才建立。如果有其他用户在使用这个昵" +"称，您需要选择一个其他昵称。" #: C/create-account.page:114(p) msgid "" "Some IRC networks use a service called NickServ to allow users to protect " "their nicknames. See for more information." msgstr "" +"有些 IRC 网络上有一种叫做 NickServ 的服务，允许用户保护他们的昵称。更多信息参" +"见。" #: C/create-account.page:117(p) msgid "" "Some IRC servers are password protected. You will need to know the password " "to connect to these servers. Generally, these are private IRC networks." msgstr "" +"有些 IRC 服务器是被密码保护的。您需要知道密码才能连接到这些服务器。通常，这样" +"的服务器是私有的。" #: C/create-account.page:122(title) msgid "Proprietary Services" -msgstr "" +msgstr "专有的服务" #: C/create-account.page:124(p) msgid "" @@ -2248,6 +2351,9 @@ msgid "" "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 "" +"许多不同的公司或组织开发了一些专营的即时消息服务。Empathy 允许您连" +"接大多常见服务的既存账户。要为这样的服务创建账户，您需要访问其网站并同意其使" +"用条款。" #: C/create-account.page:133(link) C/audio-video.page:135(p) msgid "AIM" @@ -2267,7 +2373,7 @@ msgstr "Yahoo!" #: C/change-status.page:9(desc) msgid "Change your status to advertise your availability to your contacts." -msgstr "" +msgstr "改变您的状态以向您的联系人表明您是否闲暇。" #: C/change-status.page:34(title) msgid "Change your status" @@ -2278,15 +2384,17 @@ msgid "" "You can set your status to indicate your availability to your contacts. " "Empathy allows you to select from a list of defined statuses." msgstr "" +"您可以改变您的状态，从而向联系人表明您现在是否闲暇。Empathy 允许您" +"从一些定义好的状态中选择一个。" #: C/change-status.page:41(p) msgid "" "Click on the drop-down list at the top of the Contact List window." -msgstr "" +msgstr "点击 联系人列表 窗口顶部的下拉列表。" #: C/change-status.page:46(p) msgid "Select a status from the list." -msgstr "" +msgstr "从列表中选择一个状态。" #: C/change-status.page:52(p) msgid "" @@ -2295,12 +2403,16 @@ msgid "" "status messages to provide more information about your availability " "to your contacts." msgstr "" +"内置的状态和它们的含义参见。您也可以添加自定义的状态信息来向您的联系人提供更多有关" +"您当前状态的信息。" #: C/change-status.page:58(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." 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. @@ -2315,11 +2427,11 @@ msgstr "" #: C/audio-video.page:8(desc) msgid "" "Information on when it is possible to have an audio or video conversation." -msgstr "" +msgstr "语音或视频会话的条件。" #: C/audio-video.page:32(title) msgid "Audio and video support" -msgstr "音频和视频支持" +msgstr "语音和视频支持" #: C/audio-video.page:34(p) msgid "" @@ -2328,6 +2440,9 @@ msgid "" "audio or video conversations, you will see the following icons next to their " "names in the contact list:" msgstr "" +"您的联系人也在使用支持语音和视频会话的程序时，您才可以和他们进行语音、视频会" +"话。如果您的联系人可以进行语音或视频会话，您将在联系人列表中他们的姓名旁看到" +"下列图标：" #: C/audio-video.page:43(p) msgid "Icon" @@ -2339,11 +2454,11 @@ msgstr "描述" #: C/audio-video.page:58(media) msgid "Icon for audio conversation" -msgstr "音频聊天的图标" +msgstr "语音聊天的图标" #: C/audio-video.page:64(p) msgid "The contact is able to have an audio conversation." -msgstr "" +msgstr "联系人可以进行语音聊天。" #: C/audio-video.page:70(media) msgid "Icon for video conversation" @@ -2351,19 +2466,21 @@ msgstr "视频聊天的图标" #: C/audio-video.page:76(p) msgid "The contact is able to have a video conversation." -msgstr "" +msgstr "联系人可以进行视频聊天。" #: C/audio-video.page:83(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." msgstr "" +"要进行语音聊天，您需要有一块声卡，且您的操作系统必需支持它，还需要一个能正常" +"工作的麦克风。" #: C/audio-video.page:87(p) msgid "" "In order to have a video conversation, you need to have a webcam that is " "supported by your operating system, and a working microphone." -msgstr "" +msgstr "要进行视频聊天，您需要操作系统支持的摄像头，及可以正常工作的麦克风。" #: C/audio-video.page:95(title) msgid "Supported Account Types" @@ -2375,6 +2492,8 @@ msgid "" "supported services. The following table lists whether audio and video is " "supported for each type of account." msgstr "" +"只有一些特定类型的账户支持语音或视频聊天。下表列出了每种类型的账户的语音、视" +"频支持情况。" #: C/audio-video.page:102(p) msgid "" @@ -2383,6 +2502,8 @@ msgid "" "plugins may make audio or video conversations possible on account types that " "are listed as unsupported here." msgstr "" +"账户类型是由插件提供的。您的系统上不一定有以下列出的全部类型，也可能有一些类" +"型没有在下面列出。插件的升级可能使下表中不支持语音或视频的账户类型获得支持。" #: C/audio-video.page:110(p) msgid "" @@ -2406,7 +2527,7 @@ msgstr "服务" #: C/audio-video.page:129(p) msgid "Audio" -msgstr "音频" +msgstr "语音" #: C/audio-video.page:130(p) msgid "Video" @@ -2426,7 +2547,7 @@ msgstr "视频" #: 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 "" +msgstr "否" #: C/audio-video.page:140(p) msgid "Facebook Chat" @@ -2445,7 +2566,7 @@ msgstr "Google Talk" #: 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 "" +msgstr "是" #: C/audio-video.page:155(p) msgid "Groupwise" @@ -2473,11 +2594,11 @@ msgstr "zephyr" #: C/audio-call.page:9(desc) msgid "Call your contacts over the Internet." -msgstr "" +msgstr "通过互联网呼叫您的联系人。" #: C/audio-call.page:27(title) msgid "Start an audio conversation" -msgstr "开始音频聊天" +msgstr "开始语音聊天" #: C/audio-call.page:29(p) msgid "" @@ -2485,58 +2606,39 @@ msgid "" "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(p) -#, fuzzy -#| msgid "" -#| "From the Contact List window, click the video call icon " -#| "next to the name of the contact you wish to call and choose Video Call. Alternatively, right click the contact and " -#| "choose Video Call." msgid "" "From the Contact List window, click the video call icon " "next to the name of the contact you wish to call and choose Audio Call." msgstr "" -"在联系人列表窗口，点击您想呼叫的联系人的名字旁的视频呼叫" -"图标并选择视频呼叫。同样，也可以右击联系人并选" -"择视频呼叫。" +"在 联系人列表 窗口，点击您想呼叫的联系人的名字旁的 视频呼叫 " +"图标并选择 语音呼叫。" #: C/audio-call.page:55(p) -#, fuzzy -#| msgid "" -#| "To turn a video conversation into an audio conversation, choose " -#| "VideoVideo Off, or click the video call toolbar button to deselect " -#| "it." msgid "" "To turn an audio conversation into a video conversation, choose VideoVideo On." msgstr "" -"要将视频会话转为音频会话，则选择视频关闭视频，或者点击工具栏上的视频呼叫" -"按钮以取消选择。" +"要将语音会话转为视频会话，选择 视频视频开启。" #: C/audio-call.page:63(title) -#, fuzzy -#| msgid "Start a video conversation with one of your contacts." msgid "Start an audio conversation with a meta-contact" -msgstr "向您的联系人发起视频会话。" +msgstr "向一位元联系人发起语音会话" #: C/audio-call.page:71(p) -#, fuzzy -#| msgid "" -#| "Right-click on the name of the contact you want to have a conversation " -#| "with, and choose Chat." msgid "" "Select the contact you want to have the conversation, and from the menu " "select Audio Call." -msgstr "右键点击您想要进行交谈的联系人的名字，然后选择 聊天" +msgstr "" +"选择您想要交谈的联系人，然后在菜单中选择语音呼叫。" #: C/add-contact.page:9(desc) msgid "Add someone to the contact list." @@ -2556,28 +2658,32 @@ msgid "" "use to connect to your contact. Your contact will need to be using the same " "service as the account you select." msgstr "" +"在 账户 下拉列表中，选择您用来与您的联系人联系的账户。您的联系人需" +"要使用与您选择的账户相同的服务。" #: C/add-contact.page:45(p) msgid "" "In the Identifier field, enter your contact’s login ID, username, " "screen name, or other appropriate identifier for the service type." msgstr "" +"在 标识符 一栏中，输入这种服务中您的联系人的登录 ID，用户名，显示" +"名或其他合适的标识符。" #: C/add-contact.page:49(p) msgid "" "In the Alias field, type your contact’s name as you would like it " "to appear in your contact list." -msgstr "" +msgstr "在 别名 中，输入您希望这个联系人显示在联系人列表中的名字。" #: C/add-contact.page:53(p) msgid "Click Add to add the person to your list of contacts." -msgstr "" +msgstr "点击添加将此人添加到您的联系人列表。" #: C/add-contact.page:61(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 "" +msgstr "要添加联系人到您的联系人列表，您需要连接因特网和您的账户。" #: C/add-account.page:9(desc) msgid "Add a new account to Empathy." @@ -2594,6 +2700,9 @@ msgid "" "account providers, these steps will also allow you to register for a new " "account. For more details, see ." msgstr "" +"您可以添加任何支持的服务的即时消息账户，以在 Empathy 中与您的联系" +"人交流。对于某些账户提供商，这些步骤也允许您注册新账户。更多细节参见。" #: C/add-account.page:52(p) msgid "Click Add." @@ -2603,7 +2712,7 @@ msgstr "点击添加。" msgid "" "From the Protocol drop-down list, select the type of account you " "wish to add." -msgstr "" +msgstr "在协议下拉列表，选择您要创建的账户类型。" #: C/add-account.page:61(p) msgid "" @@ -2612,6 +2721,9 @@ msgid "" "types, and may not work with some account providers. See for more information." msgstr "" +"如果您还没有注册账户，选择在服务器上创建新的账户。这个功能并不是对" +"于每一种账户都可用，也可能对于某些账户提供商不可用。更多信息参见。" #: C/add-account.page:66(p) msgid "" @@ -2619,10 +2731,12 @@ msgid "" "login ID and a password. Some accounts may require additional information. " "See for more information." msgstr "" +"输入必要的信息。对于大多数账户，您只需要输入登录 ID 和密码。有些账户可能需要" +"更多信息。参见。" #: C/add-account.page:71(p) msgid "Click Log in." -msgstr "" +msgstr "点击登入。" #: C/add-account.page:78(p) msgid "" @@ -2631,6 +2745,8 @@ msgid "" "name or press the space bar. Edit the account name and press Enter when you’re finished." msgstr "" +"要改变账户在账户窗口中的作为标识的名字，在左侧的列表中选择账户，然" +"后点击名字或者按空格键。编辑账户的名字，完成后按Enter。" #: C/accounts-window.page:11(desc) msgid "Add, modify, and delete accounts." @@ -2656,14 +2772,16 @@ msgid "" "Certain accounts or account types, however, may require additional " "information." msgstr "" +"对于大多数的账户，您只需要输入登录 ID 和密码。但有些账户或有些类型的账户可能" +"需要额外的信息。" #: C/account-jabber.page:7(desc) msgid "Advanced options for Jabber and Google Talk accounts." -msgstr "" +msgstr "Jabber 和 Google Talk 账户的高级选项。" #: C/account-jabber.page:29(title) msgid "Jabber account details" -msgstr "Jabber 账户信息" +msgstr "Jabber 账户详情" #: C/account-jabber.page:31(p) msgid "" @@ -2673,12 +2791,15 @@ msgid "" "will not need to use the advanced options below. For general instructions on " "adding an account, see ." msgstr "" +"大多 Jabber 账户只需要登录 ID 和密码就可以连接。但对于某些账户或某些网络，您" +"可能需要在高级选项卡中输入一些额外的信息。通常，您不需要使用下面的" +"这些高级选项。添加账户的一般指导参见。" #: C/account-jabber.page:39(p) msgid "" "Google Talk is a type of Jabber account. These instructions hold for Google " "Talk accounts as well." -msgstr "" +msgstr "Google Talk 是一种 Jabber 账户。这些指南对 Google Talk 账户同样适用。" #: C/account-jabber.page:45(gui) msgid "Encryption required (TLS/SSL)" @@ -2696,6 +2817,9 @@ msgid "" "Empathy from communicating with the Jabber server when encryption " "is not possible." msgstr "" +"只要有可能，Empathy 与 Jabber 服务器之间的通讯就会被加密。如果不可" +"能加密，消息就可能被明文发送。选择需要加密以阻止不能加密时 " +"Empathy 与 Jabber 服务器进行明文通讯。" #: C/account-jabber.page:52(p) msgid "" @@ -2704,6 +2828,9 @@ msgid "" "connecting to, you can select Ignore SSL certificate errors to " "allow encrypted communication with invalid certificates." msgstr "" +"有些 Jabber 服务器可能使用不合法的证书加密数据，或者使用来自未知的证书认证机" +"构的证书。如果您信任您的服务器，您可以选择忽略 SSL 证书错误以允许" +"使用不合法的证书进行加密通讯。" #: C/account-jabber.page:59(gui) msgid "Resource" @@ -2720,6 +2847,9 @@ msgid "" "uniquely identify each one. By default, Empathy will use " "Telepathy as the resource." msgstr "" +"如果您有多个应用程序(比如，在另一台计算机上)同时连接了您的账户，您可以设置“资" +"源”以唯一地标识每一个连接的程序。默认地，Empathy 会使用 " +"Telepathy 作为“资源”。" #: C/account-jabber.page:65(p) msgid "" @@ -2727,10 +2857,12 @@ msgid "" "incoming messages from your contacts. New messages will be sent to the " "application with the highest priority." msgstr "" +"您可以设置优先级以指定哪一个程序优先收到您的联系人发送来的消息。新的消息会被" +"发送给优先级最高的程序。" #: C/account-jabber.page:70(gui) msgid "Override server settings" -msgstr "" +msgstr "覆盖服务器设置" #: C/account-jabber.page:71(p) msgid "" @@ -2739,6 +2871,9 @@ msgid "" "custom server settings manually. These settings should be provided for you " "by your Jabber provider." msgstr "" +"Empathy 会根据您的登录 ID 以默认的设置连接 Jabber 服务器。对某些 " +"Jabber 服务器，您需要人工输入一些服务器设置。这些设置应该由您的 Jabber 服务提" +"供商提供。" #. 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. @@ -2755,11 +2890,11 @@ msgstr "" #: C/account-irc.page:8(desc) msgid "Additional information necessary for connecting to IRC networks." -msgstr "" +msgstr "连接 IRC 网络需要的额外信息。" #: C/account-irc.page:31(title) msgid "IRC account details" -msgstr "IRC 账户信息" +msgstr "IRC 账户详情" #: C/account-irc.page:33(p) msgid "" @@ -2768,6 +2903,8 @@ msgid "" "and a nickname. This page details the information you can provide for an IRC " "account." msgstr "" +"IRC 账户需要与其他类型的账户不同的信息。要创建 IRC 账户，您至少需要指定一个 " +"IRC 网络和一个昵称。本页详细介绍了您可以为一个 IRC 账户提供的信息。" #: C/account-irc.page:45(gui) C/account-irc.page:120(gui) msgid "Network" @@ -2780,6 +2917,9 @@ msgid "" "lists the most popular networks in the Network drop-down list. " "You can add additional networks. See below." msgstr "" +"IRC 是一种开放的系统，它允许人们运行各自的 IRC 网络。每个网络是独立的，有特有" +"的用户和聊天室。Empathy 在 网络 下拉列表中列出了一些最" +"流行的网络。您可以添加其他的网络。参看下面的。" #: C/account-irc.page:53(gui) msgid "Nickname" @@ -2792,6 +2932,9 @@ msgid "" " you will need to change " "your nickname." msgstr "" +"您的昵称是您在 IRC 网络上的唯一性的名字。只有一个人可以使用某个特定的昵称。如" +"果您得到错误信息，您需要改变" +"您的昵称。" #: C/account-irc.page:60(gui) msgid "Password" @@ -2803,6 +2946,8 @@ msgid "" "connect. If you are authorized to use the network, the network " "administrators should provide you with a password." msgstr "" +"一些服务器，尤其是那些私有网络，需要密码才能连接。如果您被授权使用，网络的管" +"理员应当为您提供了密码。" #: C/account-irc.page:65(title) msgid "NickServ Passwords" @@ -2817,20 +2962,26 @@ msgid "" "identify yourself with NickServ. See for " "more details." msgstr "" +"在某些网络上，昵称可以通过一种叫做 NickServ 的服务被注册。Empathy " +"并不直接支持昵称密码。在某些网络上，包括流行的 freenode 网络，服务器密码会被" +"自动转发给 NickServ，从而允许您设置此项向 NickServ 证明您自己。更多信息参见" +"。" #: C/account-irc.page:76(gui) msgid "Real name" -msgstr "" +msgstr "真实姓名" #: C/account-irc.page:77(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 "" +"除了昵称，您还可以提供您的真实姓名。其他用户查看您的信息时可以看到您的真实姓" +"名。" #: C/account-irc.page:81(gui) msgid "Quit message" -msgstr "" +msgstr "退出消息" #: C/account-irc.page:82(p) msgid "" @@ -2838,6 +2989,8 @@ msgid "" "and to all the users you’re having a private conversation with. Use this " "field to provide a custom quit message." msgstr "" +"当您离线时，一个退出消息会被发送给所有您加入的聊天室和正在与您进行私人聊天的" +"用户。设置此项以提供自定义的退出消息。" #: C/account-irc.page:94(title) msgid "IRC Networks" @@ -2853,12 +3006,16 @@ msgid "" "another IRC network, you can add it to the list. You can also modify " "networks and remove them from the list." msgstr "" +"Empathy 包括了一份常用 IRC 网络的列表。如果您想使用其他的 IRC 网" +"络，您可以将其添加到这个列表中。您也可以修改网络或从列表中删除网络。" #: C/account-irc.page:104(p) msgid "" "To add a network to the list, click Add." msgstr "" +"要想列表中添加网络，点击添加。" #: C/account-irc.page:107(p) msgid "" @@ -2866,6 +3023,8 @@ msgid "" "\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" " "height=\"16\">Edit." msgstr "" +"要修改列表中的网络，选择那个网络并点击编辑。" #: C/account-irc.page:110(p) msgid "" @@ -2873,17 +3032,20 @@ msgid "" "\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" " "height=\"16\">Remove." msgstr "" +"要从列表中删除网络，选择要删除的网络并点击删除。" #: C/account-irc.page:115(p) msgid "" "When adding or modifying a network, you can enter the following information:" -msgstr "" +msgstr "在添加或修改一个网络时，您可以输入下列信息：" #: C/account-irc.page:121(p) msgid "" "This is the name of the network as you want it to appear in the list of " "networks." -msgstr "" +msgstr "这是您希望网络显示在网络列表中的名字。" #: C/account-irc.page:125(gui) msgid "Charset" @@ -2897,6 +3059,9 @@ msgid "" "to use the same character encoding as other users to see their messages " "correctly." msgstr "" +"这指明了网络上常用的字符编码。字符编码是计算机内部记录字符的一种特定方式。有" +"许多不同的字符编码，您需要与其他用户使用同样的字符编码才能正确地看到他们的信" +"息。" #. Translators: Recommend character encodings that are common #. for your language. @@ -2906,6 +3071,8 @@ msgid "" "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 "" +"默认地，Empathy 使用 UTF-8，一种能够处理世界上大多数语言的现代化的" +"字符编码。简体中文常用的编码还有 GB18030，GBK 和 GB2312。" #: C/account-irc.page:141(gui) msgid "Servers" @@ -2918,6 +3085,9 @@ msgid "" "users on all other servers on that network. You can add and remove servers " "for this network using the Add and Remove buttons." msgstr "" +"一个 IRC 网络可能有许多服务器供您连接。当您连接到一个特定网络的服务器后，您可" +"以和同一网络中所有服务器的用户交流。您可以为一个网络添加或删除服务器，使用" +"添加或删除按钮。" #: C/account-irc.page:147(p) msgid "" @@ -2925,6 +3095,8 @@ msgid "" "Port to edit it. Alternatively, use the left and right arrow keys " "to focus the field, and press the space bar to begin editing." msgstr "" +"当一个服务器被选择后，点击服务器或端口下方的字段来编辑" +"它。或者，使用左右方向键来聚焦某个字段，并按空格键开始编辑。" #: C/account-irc.page:151(p) msgid "" @@ -2932,10 +3104,14 @@ msgid "" "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 "" +"选择 SSL 列中的复选框以加密与服务器间的所有通讯。注意这并不能意味" +"着其他用户不能看到您在公共聊天室中的发言。" #. Put one translator per line, in the form of NAME , YEAR1, YEAR2 #: C/index.page:0(None) msgid "translator-credits" msgstr "" "Lavande , 2010\n" -"Tao Wang , 2010lainme , 2011" +"Tao Wang , 2010\n" +"lainme , 2011\n" +"Guanhao Yin , 2011" diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index e502736d..c32448fa 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -15,6 +15,7 @@ AM_CPPFLAGS = \ $(GEOCODE_CFLAGS) \ $(MEEGO_CFLAGS) \ $(CHEESE_CFLAGS) \ + $(EDS_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) @@ -45,9 +46,7 @@ libempathy_gtk_handwritten_source = \ empathy-contact-blocking-dialog.c \ empathy-contact-dialogs.c \ empathy-contact-chooser.c \ - empathy-contact-menu.c \ empathy-contactinfo-utils.c \ - empathy-linking-dialog.c \ empathy-live-search.c \ empathy-contact-search-dialog.c \ empathy-contact-widget.c \ @@ -56,8 +55,6 @@ libempathy_gtk_handwritten_source = \ empathy-groups-widget.c \ empathy-individual-dialogs.c \ empathy-individual-edit-dialog.c \ - empathy-individual-information-dialog.c \ - empathy-individual-linker.c \ empathy-individual-menu.c \ empathy-individual-store.c \ empathy-individual-store-channel.c \ @@ -68,13 +65,13 @@ libempathy_gtk_handwritten_source = \ empathy-irc-network-chooser.c \ empathy-irc-network-chooser-dialog.c \ empathy-irc-network-dialog.c \ + empathy-local-xmpp-assistant-widget.c \ empathy-log-window.c \ + empathy-new-account-dialog.c \ empathy-new-message-dialog.c \ empathy-new-call-dialog.c \ empathy-notify-manager.c \ empathy-password-dialog.c \ - empathy-persona-store.c \ - empathy-persona-view.c \ empathy-presence-chooser.c \ empathy-protocol-chooser.c \ empathy-search-bar.c \ @@ -114,8 +111,6 @@ libempathy_gtk_headers = \ empathy-contact-blocking-dialog.h \ empathy-contact-dialogs.h \ empathy-contact-chooser.h \ - empathy-contact-menu.h \ - empathy-linking-dialog.h \ empathy-live-search.h \ empathy-contact-search-dialog.h \ empathy-contact-widget.h \ @@ -126,8 +121,6 @@ libempathy_gtk_headers = \ empathy-images.h \ empathy-individual-dialogs.h \ empathy-individual-edit-dialog.h \ - empathy-individual-information-dialog.h \ - empathy-individual-linker.h \ empathy-individual-menu.h \ empathy-individual-store.h \ empathy-individual-store-channel.h \ @@ -138,13 +131,13 @@ libempathy_gtk_headers = \ empathy-irc-network-chooser.h \ empathy-irc-network-chooser-dialog.h \ empathy-irc-network-dialog.h \ + empathy-local-xmpp-assistant-widget.h \ empathy-log-window.h \ + empathy-new-account-dialog.h \ empathy-new-message-dialog.h \ empathy-new-call-dialog.h \ empathy-notify-manager.h \ empathy-password-dialog.h \ - empathy-persona-store.h \ - empathy-persona-view.h \ empathy-presence-chooser.h \ empathy-protocol-chooser.h \ empathy-search-bar.h \ @@ -187,6 +180,7 @@ libempathy_gtk_la_LIBADD = \ $(GCR_LIBS) \ $(MEEGO_LIBS) \ $(CHEESE_LIBS) \ + $(EDS_LIBS) \ $(top_builddir)/libempathy/libempathy.la check_c_sources = \ diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index c21a22eb..ae3f1dd1 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -90,6 +90,10 @@ filter_result_callback_data_new (EmpathyAccountChooser *self, { FilterResultCallbackData *data; + g_return_val_if_fail (self != NULL, NULL); + g_return_val_if_fail (account != NULL, NULL); + g_return_val_if_fail (iter != NULL, NULL); + data = g_slice_new0 (FilterResultCallbackData); data->self = g_object_ref (self); data->account = g_object_ref (account); diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui index aa6e643e..999fd320 100644 --- a/libempathy-gtk/empathy-account-widget-irc.ui +++ b/libempathy-gtk/empathy-account-widget-irc.ui @@ -81,6 +81,7 @@ 1 + 0 diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui index f4ee3b55..49ac47e3 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.ui +++ b/libempathy-gtk/empathy-account-widget-jabber.ui @@ -2,7 +2,7 @@ - -128 + 0 127 1 10 diff --git a/libempathy-gtk/empathy-account-widget-local-xmpp.ui b/libempathy-gtk/empathy-account-widget-local-xmpp.ui index e5fc0967..7e7cfe8e 100644 --- a/libempathy-gtk/empathy-account-widget-local-xmpp.ui +++ b/libempathy-gtk/empathy-account-widget-local-xmpp.ui @@ -15,6 +15,7 @@ True True + True 1 @@ -25,6 +26,7 @@ True True + True 1 @@ -35,6 +37,7 @@ True True + True 1 @@ -98,6 +101,7 @@ True True + True 1 @@ -119,6 +123,7 @@ True True + True 1 @@ -129,6 +134,7 @@ True True + True 1 diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index e314ad33..375d6246 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -21,6 +21,7 @@ * Martyn Russell * Cosimo Cecchi * Jonathan Tellier + * Danielle Madeley */ #include @@ -71,7 +72,7 @@ static ServiceInfo services_infos[N_SERVICES] = { { "label_username_f_example", FALSE }, }; -typedef struct { +struct _EmpathyAccountWidgetPriv { EmpathyAccountSettings *settings; GtkWidget *grid_common_settings; @@ -80,6 +81,7 @@ typedef struct { GtkWidget *entry_password; GtkWidget *spinbutton_port; GtkWidget *radiobutton_reuse; + GtkWidget *hbox_buttons; gboolean simple; @@ -114,9 +116,7 @@ typedef struct { /* Used for 'special' XMPP account having a service associated ensuring that * JIDs have a specific suffix; such as Facebook for example */ gchar *jid_suffix; - - gboolean dispose_run; -} EmpathyAccountWidgetPriv; +}; enum { PROP_PROTOCOL = 1, @@ -130,6 +130,7 @@ enum { HANDLE_APPLY, ACCOUNT_CREATED, CANCELLED, + CLOSE, LAST_SIGNAL }; @@ -141,7 +142,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountWidget) #define CHANGED_TIMEOUT 300 #define DIGIT "0-9" @@ -199,7 +199,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; #define ACCOUNT_REGEX_ICQ "^"ICQ_USER_NAME"$" #define ACCOUNT_REGEX_IRC "^"IRC_NICK_NAME"$" #define USERNAME_REGEX_IRC "^"IRC_USER_NAME"$" -#define ACCOUNT_REGEX_JABBER "^"JABBER_USER_NAME"@"HOST"$" +#define ACCOUNT_REGEX_JABBER "^"JABBER_USER_NAME"@[^@/]+" #define ACCOUNT_REGEX_MSN "^"MSN_USER_NAME"@"HOST"$" #define ACCOUNT_REGEX_YAHOO "^"YAHOO_USER_NAME"$" @@ -207,32 +207,25 @@ static void account_widget_set_control_buttons_sensitivity (EmpathyAccountWidget *self, gboolean sensitive) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); + /* we hit this case because of the 'other-accounts-exist' property handler + * being called during init (before constructed()) */ + if (self->priv->apply_button == NULL || self->priv->cancel_button == NULL) + return; - if (!priv->simple) - { - /* we hit this case because of the 'other-accounts-exist' property handler - * being called during init (before constructed()) */ - if (priv->apply_button == NULL || priv->cancel_button == NULL) - return; + gtk_widget_set_sensitive (self->priv->apply_button, sensitive); - gtk_widget_set_sensitive (priv->apply_button, sensitive); - gtk_widget_set_sensitive (priv->cancel_button, - (sensitive || priv->creating_account) && priv->other_accounts_exist); + if (sensitive) + { + /* We can't grab default if the widget hasn't be packed in a + * window */ + GtkWidget *window; - if (sensitive) + window = gtk_widget_get_toplevel (self->priv->apply_button); + if (window != NULL && + gtk_widget_is_toplevel (window)) { - /* We can't grab default if the widget hasn't be packed in a - * window */ - GtkWidget *window; - - window = gtk_widget_get_toplevel (priv->apply_button); - if (window != NULL && - gtk_widget_is_toplevel (window)) - { - gtk_widget_set_can_default (priv->apply_button, TRUE); - gtk_widget_grab_default (priv->apply_button); - } + gtk_widget_set_can_default (self->priv->apply_button, TRUE); + gtk_widget_grab_default (self->priv->apply_button); } } } @@ -270,13 +263,11 @@ account_widget_set_entry_highlighting (GtkEntry *entry, static void account_widget_handle_control_buttons_sensitivity (EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); gboolean is_valid; - is_valid = empathy_account_settings_is_valid (priv->settings); + is_valid = empathy_account_settings_is_valid (self->priv->settings); - if (!priv->simple) - account_widget_set_control_buttons_sensitivity (self, is_valid); + account_widget_set_control_buttons_sensitivity (self, is_valid); g_signal_emit (self, signals[HANDLE_APPLY], 0, is_valid); } @@ -287,24 +278,23 @@ account_widget_entry_changed_common (EmpathyAccountWidget *self, { const gchar *str; const gchar *param_name; - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); gboolean prev_status; gboolean curr_status; str = gtk_entry_get_text (entry); param_name = g_object_get_data (G_OBJECT (entry), "param_name"); - prev_status = empathy_account_settings_parameter_is_valid (priv->settings, - param_name); + prev_status = empathy_account_settings_parameter_is_valid ( + self->priv->settings, param_name); if (EMP_STR_EMPTY (str)) { const gchar *value = NULL; - empathy_account_settings_unset (priv->settings, param_name); + empathy_account_settings_unset (self->priv->settings, param_name); if (focus) { - value = empathy_account_settings_get_string (priv->settings, + value = empathy_account_settings_get_string (self->priv->settings, param_name); DEBUG ("Unset %s and restore to %s", param_name, value); gtk_entry_set_text (entry, value ? value : ""); @@ -314,11 +304,13 @@ account_widget_entry_changed_common (EmpathyAccountWidget *self, { DEBUG ("Setting %s to %s", param_name, tp_strdiff (param_name, "password") ? str : "***"); - empathy_account_settings_set_string (priv->settings, param_name, str); + empathy_account_settings_set_string (self->priv->settings, param_name, + str); } - curr_status = empathy_account_settings_parameter_is_valid (priv->settings, - param_name); + curr_status = empathy_account_settings_parameter_is_valid ( + self->priv->settings, param_name); + if (curr_status != prev_status) account_widget_set_entry_highlighting (entry, !curr_status); } @@ -327,9 +319,7 @@ static void account_widget_entry_changed_cb (GtkEditable *entry, EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - if (priv->automatic_change) + if (self->priv->automatic_change) return; account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE); @@ -340,14 +330,13 @@ static void account_widget_entry_map_cb (GtkEntry *entry, EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); const gchar *param_name; gboolean is_valid; /* need to initialize input highlighting */ param_name = g_object_get_data (G_OBJECT (entry), "param_name"); - is_valid = empathy_account_settings_parameter_is_valid (priv->settings, - param_name); + is_valid = empathy_account_settings_parameter_is_valid (self->priv->settings, + param_name); account_widget_set_entry_highlighting (entry, !is_valid); } @@ -358,12 +347,11 @@ account_widget_int_changed_cb (GtkWidget *widget, const gchar *param_name; gint value; const gchar *signature; - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget)); param_name = g_object_get_data (G_OBJECT (widget), "param_name"); - signature = empathy_account_settings_get_dbus_signature (priv->settings, + signature = empathy_account_settings_get_dbus_signature (self->priv->settings, param_name); g_return_if_fail (signature != NULL); @@ -373,17 +361,21 @@ account_widget_int_changed_cb (GtkWidget *widget, { case DBUS_TYPE_INT16: case DBUS_TYPE_INT32: - empathy_account_settings_set_int32 (priv->settings, param_name, value); + empathy_account_settings_set_int32 (self->priv->settings, param_name, + value); break; case DBUS_TYPE_INT64: - empathy_account_settings_set_int64 (priv->settings, param_name, value); + empathy_account_settings_set_int64 (self->priv->settings, param_name, + value); break; case DBUS_TYPE_UINT16: case DBUS_TYPE_UINT32: - empathy_account_settings_set_uint32 (priv->settings, param_name, value); + empathy_account_settings_set_uint32 (self->priv->settings, param_name, + value); break; case DBUS_TYPE_UINT64: - empathy_account_settings_set_uint64 (priv->settings, param_name, value); + empathy_account_settings_set_uint64 (self->priv->settings, param_name, + value); break; default: g_return_if_reached (); @@ -399,7 +391,6 @@ account_widget_checkbutton_toggled_cb (GtkWidget *widget, gboolean value; gboolean default_value; const gchar *param_name; - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); param_name = g_object_get_data (G_OBJECT (widget), "param_name"); @@ -407,8 +398,8 @@ account_widget_checkbutton_toggled_cb (GtkWidget *widget, /* FIXME: This is ugly! checkbox don't have a "not-set" value so we * always unset the param and set the value if different from the * default value. */ - empathy_account_settings_unset (priv->settings, param_name); - default_value = empathy_account_settings_get_boolean (priv->settings, + empathy_account_settings_unset (self->priv->settings, param_name); + default_value = empathy_account_settings_get_boolean (self->priv->settings, param_name); if (default_value == value) @@ -418,7 +409,8 @@ account_widget_checkbutton_toggled_cb (GtkWidget *widget, else { DEBUG ("Setting %s to %d", param_name, value); - empathy_account_settings_set_boolean (priv->settings, param_name, value); + empathy_account_settings_set_boolean (self->priv->settings, param_name, + value); } empathy_account_widget_changed (self); @@ -428,12 +420,11 @@ static void account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl, EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); gboolean value; gint32 port = 0; value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton_ssl)); - port = empathy_account_settings_get_uint32 (priv->settings, "port"); + port = empathy_account_settings_get_uint32 (self->priv->settings, "port"); if (value) { @@ -446,9 +437,10 @@ account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl, port = 5222; } - gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->spinbutton_port), port); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (self->priv->spinbutton_port), + port); - priv->contains_pending_changes = TRUE; + self->priv->contains_pending_changes = TRUE; } static void @@ -461,7 +453,6 @@ account_widget_combobox_changed_cb (GtkWidget *widget, const GValue *v; const gchar *default_value = NULL; const gchar *param_name; - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)) return; @@ -472,19 +463,20 @@ account_widget_combobox_changed_cb (GtkWidget *widget, param_name = g_object_get_data (G_OBJECT (widget), "param_name"); - v = empathy_account_settings_get_default (priv->settings, param_name); + v = empathy_account_settings_get_default (self->priv->settings, param_name); if (v != NULL) default_value = g_value_get_string (v); if (!tp_strdiff (value, default_value)) { DEBUG ("Unset %s and restore to %s", param_name, default_value); - empathy_account_settings_unset (priv->settings, param_name); + empathy_account_settings_unset (self->priv->settings, param_name); } else { DEBUG ("Setting %s to %s", param_name, value); - empathy_account_settings_set_string (priv->settings, param_name, value); + empathy_account_settings_set_string (self->priv->settings, param_name, + value); } empathy_account_widget_changed (self); @@ -496,13 +488,12 @@ clear_icon_released_cb (GtkEntry *entry, GdkEvent *event, EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); const gchar *param_name; param_name = g_object_get_data (G_OBJECT (entry), "param_name"); DEBUG ("Unset %s", param_name); - empathy_account_settings_unset (priv->settings, param_name); + empathy_account_settings_unset (self->priv->settings, param_name); gtk_entry_set_text (entry, ""); empathy_account_widget_changed (self); @@ -524,9 +515,7 @@ static void password_entry_activated_cb (GtkEntry *entry, EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - if (gtk_widget_get_sensitive (priv->apply_button)) + if (gtk_widget_get_sensitive (self->priv->apply_button)) account_widget_apply_and_log_in (self); } @@ -534,9 +523,7 @@ static void account_entry_activated_cb (GtkEntry *entry, EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - if (gtk_widget_get_sensitive (priv->apply_button)) + if (gtk_widget_get_sensitive (self->priv->apply_button)) account_widget_apply_and_log_in (self); } @@ -545,8 +532,6 @@ empathy_account_widget_setup_widget (EmpathyAccountWidget *self, GtkWidget *widget, const gchar *param_name) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - g_object_set_data_full (G_OBJECT (widget), "param_name", g_strdup (param_name), g_free); @@ -555,28 +540,28 @@ empathy_account_widget_setup_widget (EmpathyAccountWidget *self, gint value = 0; const gchar *signature; - signature = empathy_account_settings_get_dbus_signature (priv->settings, - param_name); + signature = empathy_account_settings_get_dbus_signature ( + self->priv->settings, param_name); g_return_if_fail (signature != NULL); switch ((int)*signature) { case DBUS_TYPE_INT16: case DBUS_TYPE_INT32: - value = empathy_account_settings_get_int32 (priv->settings, + value = empathy_account_settings_get_int32 (self->priv->settings, param_name); break; case DBUS_TYPE_INT64: - value = empathy_account_settings_get_int64 (priv->settings, + value = empathy_account_settings_get_int64 (self->priv->settings, param_name); break; case DBUS_TYPE_UINT16: case DBUS_TYPE_UINT32: - value = empathy_account_settings_get_uint32 (priv->settings, + value = empathy_account_settings_get_uint32 (self->priv->settings, param_name); break; case DBUS_TYPE_UINT64: - value = empathy_account_settings_get_uint64 (priv->settings, + value = empathy_account_settings_get_uint64 (self->priv->settings, param_name); break; default: @@ -593,13 +578,14 @@ empathy_account_widget_setup_widget (EmpathyAccountWidget *self, { const gchar *str = NULL; - str = empathy_account_settings_get_string (priv->settings, param_name); + str = empathy_account_settings_get_string (self->priv->settings, + param_name); gtk_entry_set_text (GTK_ENTRY (widget), str ? str : ""); if (!tp_strdiff (param_name, "account")) - priv->param_account_widget = widget; + self->priv->param_account_widget = widget; else if (!tp_strdiff (param_name, "password")) - priv->param_password_widget = widget; + self->priv->param_password_widget = widget; if (strstr (param_name, "password")) { @@ -633,7 +619,7 @@ empathy_account_widget_setup_widget (EmpathyAccountWidget *self, { gboolean value = FALSE; - value = empathy_account_settings_get_boolean (priv->settings, + value = empathy_account_settings_get_boolean (self->priv->settings, param_name); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value); @@ -650,7 +636,8 @@ empathy_account_widget_setup_widget (EmpathyAccountWidget *self, GtkTreeIter iter; gboolean valid; - str = empathy_account_settings_get_string (priv->settings, param_name); + str = empathy_account_settings_get_string (self->priv->settings, + param_name); model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); valid = gtk_tree_model_get_iter_first (model, &iter); @@ -682,7 +669,8 @@ empathy_account_widget_setup_widget (EmpathyAccountWidget *self, } gtk_widget_set_sensitive (widget, - empathy_account_settings_param_is_supported (priv->settings, param_name)); + empathy_account_settings_param_is_supported (self->priv->settings, + param_name)); } static GHashTable * @@ -706,6 +694,8 @@ account_widget_generic_format_param_name (const gchar *param_name) gchar *p; static GHashTable *translated_params = NULL; + g_return_val_if_fail (param_name != NULL, NULL); + if (G_UNLIKELY (translated_params == NULL)) translated_params = build_translated_params (); @@ -739,10 +729,9 @@ accounts_widget_generic_setup (EmpathyAccountWidget *self, GtkWidget *grid_advanced_settings) { TpConnectionManagerParam *params, *param; - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); guint row_common = 0, row_advanced = 0; - params = empathy_account_settings_get_tp_params (priv->settings); + params = empathy_account_settings_get_tp_params (self->priv->settings); for (param = params; param != NULL && param->name != NULL; param++) { @@ -756,7 +745,7 @@ accounts_widget_generic_setup (EmpathyAccountWidget *self, grid_settings = grid_common_settings; row = row_common++; } - else if (priv->simple) + else if (self->priv->simple) { return; } @@ -890,6 +879,7 @@ account_widget_cancel_clicked_cb (GtkWidget *button, EmpathyAccountWidget *self) { g_signal_emit (self, signals[CANCELLED], 0); + g_signal_emit (self, signals[CLOSE], 0, GTK_RESPONSE_CANCEL); } static void @@ -899,8 +889,7 @@ account_widget_account_enabled_cb (GObject *source_object, { GError *error = NULL; TpAccount *account = TP_ACCOUNT (source_object); - EmpathyAccountWidget *widget = EMPATHY_ACCOUNT_WIDGET (user_data); - EmpathyAccountWidgetPriv *priv = GET_PRIV (widget); + EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (user_data); tp_account_set_enabled_finish (account, res, &error); @@ -911,11 +900,11 @@ account_widget_account_enabled_cb (GObject *source_object, } else { - empathy_connect_new_account (account, priv->account_manager); + empathy_connect_new_account (account, self->priv->account_manager); } - /* unref widget - part of the workaround */ - g_object_unref (widget); + /* unref self - part of the workaround */ + g_object_unref (self); } static void @@ -926,8 +915,7 @@ account_widget_applied_cb (GObject *source_object, GError *error = NULL; TpAccount *account; EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source_object); - EmpathyAccountWidget *widget = EMPATHY_ACCOUNT_WIDGET (user_data); - EmpathyAccountWidgetPriv *priv = GET_PRIV (widget); + EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (user_data); gboolean reconnect_required; empathy_account_settings_apply_finish (settings, res, &reconnect_required, @@ -940,20 +928,20 @@ account_widget_applied_cb (GObject *source_object, return; } - account = empathy_account_settings_get_account (priv->settings); + account = empathy_account_settings_get_account (self->priv->settings); if (account != NULL) { - if (priv->creating_account) + if (self->priv->creating_account) { /* By default, when an account is created, we enable it. */ - /* workaround to keep widget alive during async call */ - g_object_ref (widget); + /* workaround to keep self alive during async call */ + g_object_ref (self); tp_account_set_enabled_async (account, TRUE, - account_widget_account_enabled_cb, widget); - g_signal_emit (widget, signals[ACCOUNT_CREATED], 0, account); + account_widget_account_enabled_cb, self); + g_signal_emit (self, signals[ACCOUNT_CREATED], 0, account); } else { @@ -976,34 +964,37 @@ account_widget_applied_cb (GObject *source_object, } } - if (!priv->destroyed) - account_widget_set_control_buttons_sensitivity (widget, FALSE); + if (!self->priv->destroyed) + account_widget_set_control_buttons_sensitivity (self, FALSE); + + self->priv->contains_pending_changes = FALSE; - priv->contains_pending_changes = FALSE; + /* announce the widget can be closed */ + g_signal_emit (self, signals[CLOSE], 0, GTK_RESPONSE_APPLY); /* unref the widget - part of the workaround */ - g_object_unref (widget); + g_object_unref (self); } static void account_widget_apply_and_log_in (EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); gboolean display_name_overridden; - if (priv->radiobutton_reuse != NULL) + if (self->priv->radiobutton_reuse != NULL) { gboolean reuse = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON ( - priv->radiobutton_reuse)); + self->priv->radiobutton_reuse)); DEBUG ("Set register param: %d", !reuse); - empathy_account_settings_set_boolean (priv->settings, "register", !reuse); + empathy_account_settings_set_boolean (self->priv->settings, "register", + !reuse); } - g_object_get (priv->settings, + g_object_get (self->priv->settings, "display-name-overridden", &display_name_overridden, NULL); - if (priv->creating_account || !display_name_overridden) + if (self->priv->creating_account || !display_name_overridden) { gchar *display_name; @@ -1011,7 +1002,7 @@ account_widget_apply_and_log_in (EmpathyAccountWidget *self) * manually override it. */ display_name = empathy_account_widget_get_default_display_name (self); - empathy_account_settings_set_display_name_async (priv->settings, + empathy_account_settings_set_display_name_async (self->priv->settings, display_name, NULL, NULL); g_free (display_name); @@ -1019,7 +1010,7 @@ account_widget_apply_and_log_in (EmpathyAccountWidget *self) /* workaround to keep widget alive during async call */ g_object_ref (self); - empathy_account_settings_apply_async (priv->settings, + empathy_account_settings_apply_async (self->priv->settings, account_widget_applied_cb, self); } @@ -1053,9 +1044,8 @@ account_widget_settings_ready_cb (EmpathyAccountSettings *settings, gpointer user_data) { EmpathyAccountWidget *self = user_data; - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - if (empathy_account_settings_is_ready (priv->settings)) + if (empathy_account_settings_is_ready (self->priv->settings)) account_widget_setup_generic (self); } @@ -1063,205 +1053,34 @@ static void account_widget_build_generic (EmpathyAccountWidget *self, const char *filename) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); GtkWidget *expander_advanced; self->ui_details->gui = empathy_builder_get_file (filename, - "grid_common_settings", &priv->grid_common_settings, + "grid_common_settings", &self->priv->grid_common_settings, "vbox_generic_settings", &self->ui_details->widget, "expander_advanced_settings", &expander_advanced, NULL); - if (priv->simple) + if (self->priv->simple) gtk_widget_hide (expander_advanced); g_object_ref (self->ui_details->gui); - if (empathy_account_settings_is_ready (priv->settings)) + if (empathy_account_settings_is_ready (self->priv->settings)) account_widget_setup_generic (self); else - g_signal_connect (priv->settings, "notify::ready", + g_signal_connect (self->priv->settings, "notify::ready", G_CALLBACK (account_widget_settings_ready_cb), self); } -static void -account_widget_launch_external_clicked (GtkWidget *button, - TpAccount *account) -{ - GdkAppLaunchContext *context = NULL; - GdkDisplay *display; - GAppInfo *app_info; - GError *error = NULL; - - app_info = g_object_get_data (G_OBJECT (button), "app-info"); - - g_return_if_fail (G_IS_APP_INFO (app_info)); - - display = gdk_display_get_default (); - context = gdk_display_get_app_launch_context (display); - - if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context, - &error)) - { - g_critical ("Failed to bisho: %s", error->message); - g_clear_error (&error); - } -} - -static void -account_widget_launch_external_clicked_meego (GtkWidget *button, - TpAccount *account) -{ - if (!tp_strdiff (tp_account_get_storage_provider (account), - "com.meego.libsocialweb")) - { - /* we know how to handle this external provider */ - GDesktopAppInfo *desktop_info; - GError *error = NULL; - GdkAppLaunchContext *context = NULL; - GdkDisplay *display; - gchar *cmd; - GAppInfo *app_info; - - desktop_info = g_desktop_app_info_new ("gnome-control-center.desktop"); - if (desktop_info == NULL) - { - g_critical ("Could not locate 'gnome-control-center.desktop'"); - return; - } - - /* glib doesn't have API to start a desktop file with args... (#637875) */ - cmd = g_strdup_printf ("%s bisho.desktop", g_app_info_get_commandline ( - (GAppInfo *) desktop_info)); - - app_info = g_app_info_create_from_commandline (cmd, NULL, 0, &error); - g_free (cmd); - - if (app_info == NULL) - { - DEBUG ("Failed to create app info: %s", error->message); - g_error_free (error); - goto out; - } - - display = gdk_display_get_default (); - context = gdk_display_get_app_launch_context (display); - - if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context, - &error)) - { - g_critical ("Failed to bisho: %s", error->message); - g_clear_error (&error); - } - -out: - g_object_unref (desktop_info); - tp_clear_object (&app_info); - tp_clear_object (&context); - } -} - -static void -account_widget_build_external (EmpathyAccountWidget *self, - EmpathyAccountSettings *settings) -{ - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - TpAccount *account = empathy_account_settings_get_account (settings); - GtkWidget *bar, *widget; - gchar *str; - const gchar *provider, *name = NULL; - GDesktopAppInfo *desktop_info = NULL; - - self->ui_details->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - priv->grid_common_settings = gtk_grid_new (); - - provider = tp_account_get_storage_provider (account); - - if (!tp_strdiff (provider, "com.meego.libsocialweb")) - { - name = _("My Web Accounts"); - } - else if (!tp_strdiff (provider, "org.gnome.OnlineAccounts")) - { - /* FIXME: we should publish the .desktop file in some general way */ - desktop_info = g_desktop_app_info_new ( - "gnome-online-accounts-panel.desktop"); - - if (desktop_info == NULL) - g_critical ("Could not locate 'gnome-online-accounts-panel.desktop'"); - else - name = g_app_info_get_name (G_APP_INFO (desktop_info)); - } - - if (name != NULL) - { - str = g_strdup_printf ( - _("The account %s is edited via %s."), - empathy_account_settings_get_display_name (settings), name); - } - else - { - str = g_strdup_printf ( - _("The account %s cannot be edited in Empathy."), - empathy_account_settings_get_display_name (settings)); - } - - widget = gtk_label_new (str); - gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); - g_free (str); - - bar = gtk_info_bar_new (); - gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO); - gtk_container_add ( - GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), - widget); - gtk_container_set_border_width (GTK_CONTAINER (bar), 6); - - if (!tp_strdiff (provider, "com.meego.libsocialweb")) - { - /* we know how to handle this external provider */ - widget = gtk_info_bar_add_button (GTK_INFO_BAR (bar), - _("Launch My Web Accounts"), RESPONSE_LAUNCH); - - g_signal_connect (widget, "clicked", - G_CALLBACK (account_widget_launch_external_clicked_meego), account); - } - else if (desktop_info != NULL) - { - /* general handler */ - str = g_strdup_printf (_("Edit %s"), name); - - widget = gtk_info_bar_add_button (GTK_INFO_BAR (bar), - str, RESPONSE_LAUNCH); - - g_object_set_data_full (G_OBJECT (widget), "app-info", - g_object_ref (desktop_info), g_object_unref); - - g_signal_connect (widget, "clicked", - G_CALLBACK (account_widget_launch_external_clicked), account); - - g_free (str); - } - - gtk_box_pack_start (GTK_BOX (self->ui_details->widget), bar, - FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (self->ui_details->widget), - priv->grid_common_settings, FALSE, TRUE, 0); - - gtk_widget_show_all (self->ui_details->widget); - - tp_clear_object (&desktop_info); -} - static void account_widget_build_salut (EmpathyAccountWidget *self, const char *filename) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); GtkWidget *expander_advanced; self->ui_details->gui = empathy_builder_get_file (filename, - "grid_common_settings", &priv->grid_common_settings, + "grid_common_settings", &self->priv->grid_common_settings, "vbox_salut_settings", &self->ui_details->widget, "expander_advanced_settings", &expander_advanced, NULL); @@ -1275,7 +1094,7 @@ account_widget_build_salut (EmpathyAccountWidget *self, "entry_jid", "jid", NULL); - if (priv->simple) + if (self->priv->simple) gtk_widget_hide (expander_advanced); self->ui_details->default_focus = g_strdup ("entry_first_name"); @@ -1285,22 +1104,20 @@ static void account_widget_build_irc (EmpathyAccountWidget *self, const char *filename) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - empathy_account_settings_set_regex (priv->settings, "account", + empathy_account_settings_set_regex (self->priv->settings, "account", ACCOUNT_REGEX_IRC); - empathy_account_settings_set_regex (priv->settings, "username", + empathy_account_settings_set_regex (self->priv->settings, "username", USERNAME_REGEX_IRC); - if (priv->simple) + if (self->priv->simple) { - priv->irc_network_chooser = empathy_account_widget_irc_build_simple (self, - filename); + self->priv->irc_network_chooser = empathy_account_widget_irc_build_simple + (self, filename); } else { - priv->irc_network_chooser = empathy_account_widget_irc_build (self, - filename, &priv->grid_common_settings); + self->priv->irc_network_chooser = empathy_account_widget_irc_build (self, + filename, &self->priv->grid_common_settings); } } @@ -1308,19 +1125,19 @@ static void account_widget_build_sip (EmpathyAccountWidget *self, const char *filename) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); empathy_account_widget_sip_build (self, filename, - &priv->grid_common_settings); + &self->priv->grid_common_settings); - if (priv->simple) + if (self->priv->simple) { - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password_simple")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, + "remember_password_simple")); } else { - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, "remember_password")); } } @@ -1328,12 +1145,10 @@ static void account_widget_build_msn (EmpathyAccountWidget *self, const char *filename) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - empathy_account_settings_set_regex (priv->settings, "account", + empathy_account_settings_set_regex (self->priv->settings, "account", ACCOUNT_REGEX_MSN); - if (priv->simple) + if (self->priv->simple) { self->ui_details->gui = empathy_builder_get_file (filename, "vbox_msn_simple", &self->ui_details->widget, @@ -1346,13 +1161,14 @@ account_widget_build_msn (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_id_simple"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password_simple")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, + "remember_password_simple")); } else { self->ui_details->gui = empathy_builder_get_file (filename, - "grid_common_msn_settings", &priv->grid_common_settings, + "grid_common_msn_settings", &self->priv->grid_common_settings, "vbox_msn_settings", &self->ui_details->widget, NULL); @@ -1365,8 +1181,8 @@ account_widget_build_msn (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_id"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, "remember_password")); } } @@ -1374,24 +1190,25 @@ static void suffix_id_widget_changed_cb (GtkWidget *entry, EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); const gchar *account; - g_assert (priv->jid_suffix != NULL); + g_assert (self->priv->jid_suffix != NULL); account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE); - account = empathy_account_settings_get_string (priv->settings, "account"); + account = empathy_account_settings_get_string (self->priv->settings, + "account"); if (!EMP_STR_EMPTY (account) && - !g_str_has_suffix (account, priv->jid_suffix)) + !g_str_has_suffix (account, self->priv->jid_suffix)) { gchar *tmp; - tmp = g_strdup_printf ("%s%s", account, priv->jid_suffix); + tmp = g_strdup_printf ("%s%s", account, self->priv->jid_suffix); DEBUG ("Change account from '%s' to '%s'", account, tmp); - empathy_account_settings_set_string (priv->settings, "account", tmp); + empathy_account_settings_set_string (self->priv->settings, "account", + tmp); g_free (tmp); } @@ -1402,14 +1219,12 @@ static gchar * remove_jid_suffix (EmpathyAccountWidget *self, const gchar *str) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - g_assert (priv->jid_suffix != NULL); + g_assert (self->priv->jid_suffix != NULL); - if (!g_str_has_suffix (str, priv->jid_suffix)) + if (!g_str_has_suffix (str, self->priv->jid_suffix)) return g_strdup (str); - return g_strndup (str, strlen (str) - strlen (priv->jid_suffix)); + return g_strndup (str, strlen (str) - strlen (self->priv->jid_suffix)); } static void @@ -1417,16 +1232,15 @@ setup_id_widget_with_suffix (EmpathyAccountWidget *self, GtkWidget *widget, const gchar *suffix) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); const gchar *str = NULL; g_object_set_data_full (G_OBJECT (widget), "param_name", g_strdup ("account"), g_free); - g_assert (priv->jid_suffix == NULL); - priv->jid_suffix = g_strdup (suffix); + g_assert (self->priv->jid_suffix == NULL); + self->priv->jid_suffix = g_strdup (suffix); - str = empathy_account_settings_get_string (priv->settings, "account"); + str = empathy_account_settings_get_string (self->priv->settings, "account"); if (str != NULL) { gchar *tmp; @@ -1436,7 +1250,7 @@ setup_id_widget_with_suffix (EmpathyAccountWidget *self, g_free (tmp); } - priv->param_account_widget = widget; + self->priv->param_account_widget = widget; g_signal_connect (widget, "changed", G_CALLBACK (suffix_id_widget_changed_cb), self); @@ -1445,11 +1259,10 @@ setup_id_widget_with_suffix (EmpathyAccountWidget *self, static Service account_widget_get_service (EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); const gchar *icon_name, *service; - icon_name = empathy_account_settings_get_icon_name (priv->settings); - service = empathy_account_settings_get_service (priv->settings); + icon_name = empathy_account_settings_get_icon_name (self->priv->settings); + service = empathy_account_settings_get_service (self->priv->settings); /* Previous versions of Empathy didn't set the Service property on Facebook * and gtalk accounts, so we check using the icon name as well. */ @@ -1468,7 +1281,6 @@ static void account_widget_build_jabber (EmpathyAccountWidget *self, const char *filename) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); GtkWidget *spinbutton_port; GtkWidget *checkbutton_ssl; GtkWidget *label_id, *label_password; @@ -1481,10 +1293,10 @@ account_widget_build_jabber (EmpathyAccountWidget *self, service = account_widget_get_service (self); - empathy_account_settings_set_regex (priv->settings, "account", + empathy_account_settings_set_regex (self->priv->settings, "account", ACCOUNT_REGEX_JABBER); - if (priv->simple && service == NO_SERVICE) + if (self->priv->simple && service == NO_SERVICE) { /* Simple widget for XMPP */ self->ui_details->gui = empathy_builder_get_file (filename, @@ -1495,7 +1307,8 @@ account_widget_build_jabber (EmpathyAccountWidget *self, "label_password_create", &label_password_create, NULL); - if (empathy_account_settings_get_boolean (priv->settings, "register")) + if (empathy_account_settings_get_boolean (self->priv->settings, + "register")) { gtk_widget_hide (label_id); gtk_widget_hide (label_password); @@ -1510,10 +1323,11 @@ account_widget_build_jabber (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_id_simple"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password_simple")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, + "remember_password_simple")); } - else if (priv->simple && service == GTALK_SERVICE) + else if (self->priv->simple && service == GTALK_SERVICE) { /* Simple widget for Google Talk */ self->ui_details->gui = empathy_builder_get_file (filename, @@ -1527,10 +1341,11 @@ account_widget_build_jabber (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_id_g_simple"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password_g_simple")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, + "remember_password_g_simple")); } - else if (priv->simple && service == FACEBOOK_SERVICE) + else if (self->priv->simple && service == FACEBOOK_SERVICE) { /* Simple widget for Facebook */ self->ui_details->gui = empathy_builder_get_file (filename, @@ -1546,8 +1361,9 @@ account_widget_build_jabber (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_id_fb_simple"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password_fb_simple")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, + "remember_password_fb_simple")); } else { @@ -1555,7 +1371,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self, /* Full widget for XMPP, Google Talk and Facebook*/ self->ui_details->gui = empathy_builder_get_file (filename, - "grid_common_settings", &priv->grid_common_settings, + "grid_common_settings", &self->priv->grid_common_settings, "vbox_jabber_settings", &self->ui_details->widget, "spinbutton_port", &spinbutton_port, "checkbutton_ssl", &checkbutton_ssl, @@ -1591,10 +1407,10 @@ account_widget_build_jabber (EmpathyAccountWidget *self, } self->ui_details->default_focus = g_strdup ("entry_id"); - priv->spinbutton_port = spinbutton_port; + self->priv->spinbutton_port = spinbutton_port; - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, "remember_password")); g_signal_connect (checkbutton_ssl, "toggled", G_CALLBACK (account_widget_jabber_ssl_toggled_cb), @@ -1624,13 +1440,12 @@ static void account_widget_build_icq (EmpathyAccountWidget *self, const char *filename) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); GtkWidget *spinbutton_port; - empathy_account_settings_set_regex (priv->settings, "account", + empathy_account_settings_set_regex (self->priv->settings, "account", ACCOUNT_REGEX_ICQ); - if (priv->simple) + if (self->priv->simple) { self->ui_details->gui = empathy_builder_get_file (filename, "vbox_icq_simple", &self->ui_details->widget, @@ -1643,13 +1458,14 @@ account_widget_build_icq (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_uin_simple"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password_simple")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, + "remember_password_simple")); } else { self->ui_details->gui = empathy_builder_get_file (filename, - "grid_common_settings", &priv->grid_common_settings, + "grid_common_settings", &self->priv->grid_common_settings, "vbox_icq_settings", &self->ui_details->widget, "spinbutton_port", &spinbutton_port, NULL); @@ -1664,8 +1480,8 @@ account_widget_build_icq (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_uin"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, "remember_password")); } } @@ -1673,10 +1489,9 @@ static void account_widget_build_aim (EmpathyAccountWidget *self, const char *filename) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); GtkWidget *spinbutton_port; - if (priv->simple) + if (self->priv->simple) { self->ui_details->gui = empathy_builder_get_file (filename, "vbox_aim_simple", &self->ui_details->widget, @@ -1689,13 +1504,14 @@ account_widget_build_aim (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_screenname_simple"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password_simple")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, + "remember_password_simple")); } else { self->ui_details->gui = empathy_builder_get_file (filename, - "grid_common_settings", &priv->grid_common_settings, + "grid_common_settings", &self->priv->grid_common_settings, "vbox_aim_settings", &self->ui_details->widget, "spinbutton_port", &spinbutton_port, NULL); @@ -1709,8 +1525,8 @@ account_widget_build_aim (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_screenname"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, "remember_password")); } } @@ -1718,12 +1534,10 @@ static void account_widget_build_yahoo (EmpathyAccountWidget *self, const char *filename) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - empathy_account_settings_set_regex (priv->settings, "account", + empathy_account_settings_set_regex (self->priv->settings, "account", ACCOUNT_REGEX_YAHOO); - if (priv->simple) + if (self->priv->simple) { self->ui_details->gui = empathy_builder_get_file (filename, "vbox_yahoo_simple", &self->ui_details->widget, @@ -1736,13 +1550,14 @@ account_widget_build_yahoo (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_id_simple"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password_simple")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, + "remember_password_simple")); } else { self->ui_details->gui = empathy_builder_get_file (filename, - "grid_common_settings", &priv->grid_common_settings, + "grid_common_settings", &self->priv->grid_common_settings, "vbox_yahoo_settings", &self->ui_details->widget, NULL); @@ -1757,8 +1572,8 @@ account_widget_build_yahoo (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_id"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, "remember_password")); } } @@ -1766,9 +1581,7 @@ static void account_widget_build_groupwise (EmpathyAccountWidget *self, const char *filename) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - if (priv->simple) + if (self->priv->simple) { self->ui_details->gui = empathy_builder_get_file (filename, "vbox_groupwise_simple", &self->ui_details->widget, @@ -1781,13 +1594,14 @@ account_widget_build_groupwise (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_id_simple"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password_simple")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, + "remember_password_simple")); } else { self->ui_details->gui = empathy_builder_get_file (filename, - "grid_common_groupwise_settings", &priv->grid_common_settings, + "grid_common_groupwise_settings", &self->priv->grid_common_settings, "vbox_groupwise_settings", &self->ui_details->widget, NULL); @@ -1800,8 +1614,8 @@ account_widget_build_groupwise (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_id"); - priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( - self->ui_details->gui, "remember_password")); + self->priv->remember_password_widget = GTK_WIDGET ( + gtk_builder_get_object (self->ui_details->gui, "remember_password")); } } @@ -1809,9 +1623,8 @@ static void account_widget_destroy_cb (GtkWidget *widget, EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); /* set the destroyed flag - workaround */ - priv->destroyed = TRUE; + self->priv->destroyed = TRUE; g_object_unref (self); } @@ -1820,11 +1633,9 @@ void empathy_account_widget_set_other_accounts_exist (EmpathyAccountWidget *self, gboolean others_exist) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); + self->priv->other_accounts_exist = others_exist; - priv->other_accounts_exist = others_exist; - - if (priv->creating_account) + if (self->priv->creating_account) account_widget_handle_control_buttons_sensitivity (self); } @@ -1834,18 +1645,18 @@ do_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (object); + EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (object); switch (prop_id) { case PROP_SETTINGS: - priv->settings = g_value_dup_object (value); + self->priv->settings = g_value_dup_object (value); break; case PROP_SIMPLE: - priv->simple = g_value_get_boolean (value); + self->priv->simple = g_value_get_boolean (value); break; case PROP_CREATING_ACCOUNT: - priv->creating_account = g_value_get_boolean (value); + self->priv->creating_account = g_value_get_boolean (value); break; case PROP_OTHER_ACCOUNTS_EXIST: empathy_account_widget_set_other_accounts_exist ( @@ -1862,25 +1673,25 @@ do_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (object); + EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (object); switch (prop_id) { case PROP_PROTOCOL: g_value_set_string (value, - empathy_account_settings_get_protocol (priv->settings)); + empathy_account_settings_get_protocol (self->priv->settings)); break; case PROP_SETTINGS: - g_value_set_object (value, priv->settings); + g_value_set_object (value, self->priv->settings); break; case PROP_SIMPLE: - g_value_set_boolean (value, priv->simple); + g_value_set_boolean (value, self->priv->simple); break; case PROP_CREATING_ACCOUNT: - g_value_set_boolean (value, priv->creating_account); + g_value_set_boolean (value, self->priv->creating_account); break; case PROP_OTHER_ACCOUNTS_EXIST: - g_value_set_boolean (value, priv->other_accounts_exist); + g_value_set_boolean (value, self->priv->other_accounts_exist); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1890,18 +1701,17 @@ do_get_property (GObject *object, static void set_apply_button (EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); GtkWidget *image; /* We can't use the stock button as its accelerator ('A') clashes with the * Add button. */ - gtk_button_set_use_stock (GTK_BUTTON (priv->apply_button), FALSE); + gtk_button_set_use_stock (GTK_BUTTON (self->priv->apply_button), FALSE); - gtk_button_set_label (GTK_BUTTON (priv->apply_button), _("A_pply")); - gtk_button_set_use_underline (GTK_BUTTON (priv->apply_button), TRUE); + gtk_button_set_label (GTK_BUTTON (self->priv->apply_button), _("A_pply")); + gtk_button_set_use_underline (GTK_BUTTON (self->priv->apply_button), TRUE); image = gtk_image_new_from_stock (GTK_STOCK_APPLY, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (priv->apply_button), image); + gtk_button_set_image (GTK_BUTTON (self->priv->apply_button), image); } static void @@ -1911,27 +1721,26 @@ presence_changed_cb (TpAccountManager *manager, const gchar *message, EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - if (priv->destroyed) + if (self->priv->destroyed) return; - if (priv->apply_button == NULL) + if (self->priv->apply_button == NULL) /* This button doesn't exist in 'simple' mode */ return; if (state > TP_CONNECTION_PRESENCE_TYPE_OFFLINE && - priv->creating_account) + self->priv->creating_account) { /* We are online and creating a new account, display a Login button */ GtkWidget *image; - gtk_button_set_use_stock (GTK_BUTTON (priv->apply_button), FALSE); - gtk_button_set_label (GTK_BUTTON (priv->apply_button), _("L_og in")); + gtk_button_set_use_stock (GTK_BUTTON (self->priv->apply_button), FALSE); + gtk_button_set_label (GTK_BUTTON (self->priv->apply_button), + _("L_og in")); image = gtk_image_new_from_stock (GTK_STOCK_CONNECT, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (priv->apply_button), image); + gtk_button_set_image (GTK_BUTTON (self->priv->apply_button), image); } else { @@ -1979,15 +1788,14 @@ static void add_register_buttons (EmpathyAccountWidget *self, TpAccount *account) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); const TpConnectionManagerProtocol *protocol; GtkWidget *radiobutton_register; GtkWidget *vbox = self->ui_details->widget; - if (!priv->creating_account) + if (!self->priv->creating_account) return; - protocol = empathy_account_settings_get_tp_protocol (priv->settings); + protocol = empathy_account_settings_get_tp_protocol (self->priv->settings); if (protocol == NULL) return; @@ -1997,20 +1805,22 @@ add_register_buttons (EmpathyAccountWidget *self, if (account_widget_get_service (self) != NO_SERVICE) return; - if (priv->simple) + if (self->priv->simple) return; - priv->radiobutton_reuse = gtk_radio_button_new_with_label (NULL, + self->priv->radiobutton_reuse = gtk_radio_button_new_with_label (NULL, _("This account already exists on the server")); radiobutton_register = gtk_radio_button_new_with_label ( - gtk_radio_button_get_group (GTK_RADIO_BUTTON (priv->radiobutton_reuse)), + gtk_radio_button_get_group ( + GTK_RADIO_BUTTON (self->priv->radiobutton_reuse)), _("Create a new account on the server")); - gtk_box_pack_start (GTK_BOX (vbox), priv->radiobutton_reuse, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), self->priv->radiobutton_reuse, FALSE, + FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), radiobutton_register, FALSE, FALSE, 0); - gtk_box_reorder_child (GTK_BOX (vbox), priv->radiobutton_reuse, 0); + gtk_box_reorder_child (GTK_BOX (vbox), self->priv->radiobutton_reuse, 0); gtk_box_reorder_child (GTK_BOX (vbox), radiobutton_register, 1); - gtk_widget_show (priv->radiobutton_reuse); + gtk_widget_show (self->priv->radiobutton_reuse); gtk_widget_show (radiobutton_register); } #endif /* HAVE_MEEGO */ @@ -2019,17 +1829,15 @@ static void remember_password_toggled_cb (GtkToggleButton *button, EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - if (gtk_toggle_button_get_active (button)) { - gtk_widget_set_sensitive (priv->param_password_widget, TRUE); + gtk_widget_set_sensitive (self->priv->param_password_widget, TRUE); } else { - gtk_widget_set_sensitive (priv->param_password_widget, FALSE); - gtk_entry_set_text (GTK_ENTRY (priv->param_password_widget), ""); - empathy_account_settings_unset (priv->settings, "password"); + gtk_widget_set_sensitive (self->priv->param_password_widget, FALSE); + gtk_entry_set_text (GTK_ENTRY (self->priv->param_password_widget), ""); + empathy_account_settings_unset (self->priv->settings, "password"); } } @@ -2038,22 +1846,22 @@ account_settings_password_retrieved_cb (GObject *object, gpointer user_data) { EmpathyAccountWidget *self = user_data; - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); const gchar *password = empathy_account_settings_get_string ( - priv->settings, "password"); + self->priv->settings, "password"); if (password != NULL) { /* We have to do this so that when we call gtk_entry_set_text, * the ::changed callback doesn't think the user made the * change. */ - priv->automatic_change = TRUE; - gtk_entry_set_text (GTK_ENTRY (priv->param_password_widget), password); - priv->automatic_change = FALSE; + self->priv->automatic_change = TRUE; + gtk_entry_set_text (GTK_ENTRY (self->priv->param_password_widget), + password); + self->priv->automatic_change = FALSE; } gtk_toggle_button_set_active ( - GTK_TOGGLE_BUTTON (priv->remember_password_widget), + GTK_TOGGLE_BUTTON (self->priv->remember_password_widget), !EMP_STR_EMPTY (password)); } @@ -2061,9 +1869,7 @@ static void do_constructed (GObject *obj) { EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj); - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); TpAccount *account; - TpStorageRestrictionFlags storage_restrictions; const gchar *display_name, *default_display_name; guint i = 0; struct { @@ -2083,51 +1889,35 @@ do_constructed (GObject *obj) WIDGET (idle, irc), WIDGET (sofiasip, sip), }; + const gchar *protocol, *cm_name; - account = empathy_account_settings_get_account (priv->settings); - - if (account != NULL) - storage_restrictions = tp_account_get_storage_restrictions (account); - else - storage_restrictions = 0; + account = empathy_account_settings_get_account (self->priv->settings); - /* Empathy can only edit accounts without the Cannot_Set_Parameters flag */ - if (storage_restrictions & TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS) - { - DEBUG ("Account is provided by an external storage provider"); + cm_name = empathy_account_settings_get_cm (self->priv->settings); + protocol = empathy_account_settings_get_protocol (self->priv->settings); - account_widget_build_external (self, priv->settings); - } - else + for (i = 0 ; i < G_N_ELEMENTS (widgets); i++) { - const gchar *protocol, *cm_name; - - cm_name = empathy_account_settings_get_cm (priv->settings); - protocol = empathy_account_settings_get_protocol (priv->settings); - - for (i = 0 ; i < G_N_ELEMENTS (widgets); i++) + if (!tp_strdiff (widgets[i].cm_name, cm_name) && + !tp_strdiff (widgets[i].protocol, protocol)) { - if (!tp_strdiff (widgets[i].cm_name, cm_name) && - !tp_strdiff (widgets[i].protocol, protocol)) - { - gchar *filename; + gchar *filename; - filename = empathy_file_lookup (widgets[i].file, - "libempathy-gtk"); - widgets[i].func (self, filename); - g_free (filename); + filename = empathy_file_lookup (widgets[i].file, + "libempathy-gtk"); + widgets[i].func (self, filename); + g_free (filename); - break; - } + break; } + } - if (i == G_N_ELEMENTS (widgets)) - { - gchar *filename = empathy_file_lookup ( - "empathy-account-widget-generic.ui", "libempathy-gtk"); - account_widget_build_generic (self, filename); - g_free (filename); - } + if (i == G_N_ELEMENTS (widgets)) + { + gchar *filename = empathy_file_lookup ( + "empathy-account-widget-generic.ui", "libempathy-gtk"); + account_widget_build_generic (self, filename); + g_free (filename); } /* handle default focus */ @@ -2143,101 +1933,89 @@ do_constructed (GObject *obj) } /* remember password */ - if (priv->param_password_widget != NULL - && priv->remember_password_widget != NULL - && empathy_account_settings_supports_sasl (priv->settings)) + if (self->priv->param_password_widget != NULL + && self->priv->remember_password_widget != NULL + && empathy_account_settings_supports_sasl (self->priv->settings)) { - if (priv->simple) + if (self->priv->simple) { gtk_toggle_button_set_active ( - GTK_TOGGLE_BUTTON (priv->remember_password_widget), TRUE); + GTK_TOGGLE_BUTTON (self->priv->remember_password_widget), TRUE); } else { gtk_toggle_button_set_active ( - GTK_TOGGLE_BUTTON (priv->remember_password_widget), + GTK_TOGGLE_BUTTON (self->priv->remember_password_widget), !EMP_STR_EMPTY (empathy_account_settings_get_string ( - priv->settings, "password"))); + self->priv->settings, "password"))); /* The password might not have been retrieved from the * keyring yet. We should update the remember password * toggle button and the password entry when/if it is. */ - tp_g_signal_connect_object (priv->settings, "password-retrieved", + tp_g_signal_connect_object (self->priv->settings, + "password-retrieved", G_CALLBACK (account_settings_password_retrieved_cb), self, 0); } - g_signal_connect (priv->remember_password_widget, "toggled", + g_signal_connect (self->priv->remember_password_widget, "toggled", G_CALLBACK (remember_password_toggled_cb), self); remember_password_toggled_cb ( - GTK_TOGGLE_BUTTON (priv->remember_password_widget), self); + GTK_TOGGLE_BUTTON (self->priv->remember_password_widget), self); } - else if (priv->remember_password_widget != NULL - && !empathy_account_settings_supports_sasl (priv->settings)) + else if (self->priv->remember_password_widget != NULL + && !empathy_account_settings_supports_sasl (self->priv->settings)) { - gtk_widget_set_visible (priv->remember_password_widget, FALSE); + gtk_widget_set_visible (self->priv->remember_password_widget, FALSE); } /* dup and init the account-manager */ - priv->account_manager = tp_account_manager_dup (); + self->priv->account_manager = tp_account_manager_dup (); g_object_ref (self); - tp_proxy_prepare_async (priv->account_manager, NULL, + tp_proxy_prepare_async (self->priv->account_manager, NULL, account_manager_ready_cb, self); /* handle apply and cancel button */ - if (!priv->simple && - !(storage_restrictions & - TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS)) - { - GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); - GtkWidget *image; - - gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE); - - /* We can't use the stock button as its accelerator ('C') clashes with - * the Close button. */ - priv->cancel_button = gtk_button_new (); - gtk_button_set_label (GTK_BUTTON (priv->cancel_button), _("Ca_ncel")); - gtk_button_set_use_underline (GTK_BUTTON (priv->cancel_button), TRUE); - - image = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (priv->cancel_button), image); - - priv->apply_button = gtk_button_new (); - set_apply_button (self); - - /* We'll change this button to a "Log in" one if we are creating a new - * account and are connected. */ - tp_g_signal_connect_object (priv->account_manager, - "most-available-presence-changed", - G_CALLBACK (presence_changed_cb), obj, 0); - - gtk_box_pack_end (GTK_BOX (hbox), priv->apply_button, TRUE, - TRUE, 3); - gtk_box_pack_end (GTK_BOX (hbox), priv->cancel_button, TRUE, - TRUE, 3); - - gtk_box_pack_end (GTK_BOX (self->ui_details->widget), hbox, FALSE, - FALSE, 3); - - g_signal_connect (priv->cancel_button, "clicked", - G_CALLBACK (account_widget_cancel_clicked_cb), - self); - g_signal_connect (priv->apply_button, "clicked", - G_CALLBACK (account_widget_apply_clicked_cb), - self); - gtk_widget_show_all (hbox); - - if (priv->creating_account) - /* When creating an account, the user might have nothing to enter. - * That means that no control interaction might occur, - * so we update the control button sensitivity manually. - */ - account_widget_handle_control_buttons_sensitivity (self); - else - account_widget_set_control_buttons_sensitivity (self, FALSE); - } + self->priv->hbox_buttons = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + + gtk_box_set_homogeneous (GTK_BOX (self->priv->hbox_buttons), TRUE); + + self->priv->cancel_button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + + self->priv->apply_button = gtk_button_new (); + set_apply_button (self); + + /* We'll change this button to a "Log in" one if we are creating a new + * account and are connected. */ + tp_g_signal_connect_object (self->priv->account_manager, + "most-available-presence-changed", + G_CALLBACK (presence_changed_cb), obj, 0); + + gtk_box_pack_end (GTK_BOX (self->priv->hbox_buttons), + self->priv->apply_button, TRUE, TRUE, 3); + gtk_box_pack_end (GTK_BOX (self->priv->hbox_buttons), + self->priv->cancel_button, TRUE, TRUE, 3); + + gtk_box_pack_end (GTK_BOX (self->ui_details->widget), self->priv->hbox_buttons, FALSE, + FALSE, 3); + + g_signal_connect (self->priv->cancel_button, "clicked", + G_CALLBACK (account_widget_cancel_clicked_cb), + self); + g_signal_connect (self->priv->apply_button, "clicked", + G_CALLBACK (account_widget_apply_clicked_cb), + self); + gtk_widget_show_all (self->priv->hbox_buttons); + + if (self->priv->creating_account) + /* When creating an account, the user might have nothing to enter. + * That means that no control interaction might occur, + * so we update the control button sensitivity manually. + */ + account_widget_handle_control_buttons_sensitivity (self); + else + account_widget_set_control_buttons_sensitivity (self, FALSE); #ifndef HAVE_MEEGO add_register_buttons (self, account); @@ -2254,15 +2032,17 @@ do_constructed (GObject *obj) self->ui_details->gui = NULL; } - display_name = empathy_account_settings_get_display_name (priv->settings); + display_name = empathy_account_settings_get_display_name ( + self->priv->settings); default_display_name = empathy_account_widget_get_default_display_name (self); if (tp_strdiff (display_name, default_display_name) && - !priv->creating_account) + !self->priv->creating_account) { /* The display name of the account is not the one that we'd assign by * default; assume that the user changed it manually */ - g_object_set (priv->settings, "display-name-overridden", TRUE, NULL); + g_object_set (self->priv->settings, "display-name-overridden", TRUE, + NULL); } } @@ -2270,24 +2050,9 @@ static void do_dispose (GObject *obj) { EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj); - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - if (priv->dispose_run) - return; - - priv->dispose_run = TRUE; - - if (priv->settings != NULL) - { - g_object_unref (priv->settings); - priv->settings = NULL; - } - if (priv->account_manager != NULL) - { - g_object_unref (priv->account_manager); - priv->account_manager = NULL; - } + g_clear_object (&self->priv->settings); + g_clear_object (&self->priv->account_manager); if (G_OBJECT_CLASS (empathy_account_widget_parent_class)->dispose != NULL) G_OBJECT_CLASS (empathy_account_widget_parent_class)->dispose (obj); @@ -2297,12 +2062,11 @@ static void do_finalize (GObject *obj) { EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj); - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); g_free (self->ui_details->default_focus); g_slice_free (EmpathyAccountWidgetUIDetails, self->ui_details); - g_free (priv->jid_suffix); + g_free (self->priv->jid_suffix); if (G_OBJECT_CLASS (empathy_account_widget_parent_class)->finalize != NULL) G_OBJECT_CLASS (empathy_account_widget_parent_class)->finalize (obj); @@ -2375,40 +2139,38 @@ empathy_account_widget_class_init (EmpathyAccountWidgetClass *klass) G_TYPE_NONE, 0); + signals[CLOSE] = + g_signal_new ("close", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, 0, NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, + 1, G_TYPE_INT); + g_type_class_add_private (klass, sizeof (EmpathyAccountWidgetPriv)); } static void empathy_account_widget_init (EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = - G_TYPE_INSTANCE_GET_PRIVATE ((self), EMPATHY_TYPE_ACCOUNT_WIDGET, + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), EMPATHY_TYPE_ACCOUNT_WIDGET, EmpathyAccountWidgetPriv); - self->priv = priv; - priv->dispose_run = FALSE; - self->ui_details = g_slice_new0 (EmpathyAccountWidgetUIDetails); } /* public methods */ void -empathy_account_widget_discard_pending_changes - (EmpathyAccountWidget *widget) +empathy_account_widget_discard_pending_changes (EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (widget); - - empathy_account_settings_discard_changes (priv->settings); - priv->contains_pending_changes = FALSE; + empathy_account_settings_discard_changes (self->priv->settings); + self->priv->contains_pending_changes = FALSE; } gboolean -empathy_account_widget_contains_pending_changes (EmpathyAccountWidget *widget) +empathy_account_widget_contains_pending_changes (EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (widget); - - return priv->contains_pending_changes; + return self->priv->contains_pending_changes; } void @@ -2450,14 +2212,14 @@ empathy_account_widget_new_for_protocol (EmpathyAccountSettings *settings, gchar * empathy_account_widget_get_default_display_name (EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); const gchar *login_id; const gchar *protocol, *p; gchar *default_display_name; Service service; - login_id = empathy_account_settings_get_string (priv->settings, "account"); - protocol = empathy_account_settings_get_protocol (priv->settings); + login_id = empathy_account_settings_get_string (self->priv->settings, + "account"); + protocol = empathy_account_settings_get_protocol (self->priv->settings); service = account_widget_get_service (self); if (login_id != NULL) @@ -2468,7 +2230,7 @@ empathy_account_widget_get_default_display_name (EmpathyAccountWidget *self) EmpathyIrcNetwork *network; network = empathy_irc_network_chooser_get_network ( - priv->irc_network_chooser); + self->priv->irc_network_chooser); g_assert (network != NULL); /* To translators: The first parameter is the login id and the @@ -2479,7 +2241,7 @@ empathy_account_widget_get_default_display_name (EmpathyAccountWidget *self) default_display_name = g_strdup_printf (_("%1$s on %2$s"), login_id, empathy_irc_network_get_name (network)); } - else if (service == FACEBOOK_SERVICE && priv->jid_suffix != NULL) + else if (service == FACEBOOK_SERVICE && self->priv->jid_suffix != NULL) { gchar *tmp; @@ -2516,40 +2278,38 @@ empathy_account_widget_get_default_display_name (EmpathyAccountWidget *self) void empathy_account_widget_changed (EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - account_widget_handle_control_buttons_sensitivity (self); - priv->contains_pending_changes = TRUE; + self->priv->contains_pending_changes = TRUE; } void empathy_account_widget_set_account_param (EmpathyAccountWidget *self, const gchar *account) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - if (priv->param_account_widget == NULL) + if (self->priv->param_account_widget == NULL) return; - gtk_entry_set_text (GTK_ENTRY (priv->param_account_widget), account); + gtk_entry_set_text (GTK_ENTRY (self->priv->param_account_widget), account); } void empathy_account_widget_set_password_param (EmpathyAccountWidget *self, const gchar *account) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - - if (priv->param_password_widget == NULL) + if (self->priv->param_password_widget == NULL) return; - gtk_entry_set_text (GTK_ENTRY (priv->param_password_widget), account); + gtk_entry_set_text (GTK_ENTRY (self->priv->param_password_widget), account); } EmpathyAccountSettings * empathy_account_widget_get_settings (EmpathyAccountWidget *self) { - EmpathyAccountWidgetPriv *priv = GET_PRIV (self); + return self->priv->settings; +} - return priv->settings; +void +empathy_account_widget_hide_buttons (EmpathyAccountWidget *self) +{ + gtk_widget_hide (self->priv->hbox_buttons); } diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h index ab1f3a5d..5279d75f 100644 --- a/libempathy-gtk/empathy-account-widget.h +++ b/libempathy-gtk/empathy-account-widget.h @@ -42,6 +42,7 @@ G_BEGIN_DECLS #define EMPATHY_ACCOUNT_WIDGET_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ACCOUNT_WIDGET, EmpathyAccountWidgetClass)) +typedef struct _EmpathyAccountWidgetPriv EmpathyAccountWidgetPriv; typedef struct _EmpathyAccountWidgetUIDetails EmpathyAccountWidgetUIDetails; typedef struct { @@ -49,8 +50,7 @@ typedef struct { EmpathyAccountWidgetUIDetails *ui_details; - /* private */ - gpointer priv; + EmpathyAccountWidgetPriv *priv; } EmpathyAccountWidget; typedef struct { @@ -82,6 +82,8 @@ void empathy_account_widget_set_password_param (EmpathyAccountWidget *self, void empathy_account_widget_set_other_accounts_exist ( EmpathyAccountWidget *self, gboolean others_exist); +void empathy_account_widget_hide_buttons (EmpathyAccountWidget *self); + /* protected methods */ void empathy_account_widget_changed (EmpathyAccountWidget *widget); diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c index be708e81..5ca6cb67 100644 --- a/libempathy-gtk/empathy-base-password-dialog.c +++ b/libempathy-gtk/empathy-base-password-dialog.c @@ -272,6 +272,8 @@ empathy_base_password_dialog_constructed (GObject *object) gtk_widget_grab_focus (self->entry); gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER_ALWAYS); + + gtk_window_set_keep_above (GTK_WINDOW (self), TRUE); } static void diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c index c251f1f4..60d642cc 100644 --- a/libempathy-gtk/empathy-chat-text-view.c +++ b/libempathy-gtk/empathy-chat-text-view.c @@ -717,7 +717,8 @@ chat_text_view_scroll_down (EmpathyChatView *view) static void chat_text_view_append_message (EmpathyChatView *view, - EmpathyMessage *msg) + EmpathyMessage *msg, + gboolean should_highlight) { EmpathyChatTextView *text_view = EMPATHY_CHAT_TEXT_VIEW (view); EmpathyChatTextViewPriv *priv = GET_PRIV (text_view); @@ -739,7 +740,8 @@ chat_text_view_append_message (EmpathyChatView *view, chat_text_maybe_append_date_and_time (text_view, timestamp); if (EMPATHY_CHAT_TEXT_VIEW_GET_CLASS (view)->append_message) { EMPATHY_CHAT_TEXT_VIEW_GET_CLASS (view)->append_message (text_view, - msg); + msg, + should_highlight); } if (bottom) { diff --git a/libempathy-gtk/empathy-chat-text-view.h b/libempathy-gtk/empathy-chat-text-view.h index 12edbcc6..ce83fd2f 100644 --- a/libempathy-gtk/empathy-chat-text-view.h +++ b/libempathy-gtk/empathy-chat-text-view.h @@ -56,7 +56,8 @@ struct _EmpathyChatTextViewClass { /* */ void (*append_message) (EmpathyChatTextView *view, - EmpathyMessage *message); + EmpathyMessage *message, + gboolean should_highlight); }; #define EMPATHY_CHAT_TEXT_VIEW_TAG_CUT "cut" diff --git a/libempathy-gtk/empathy-chat-view.c b/libempathy-gtk/empathy-chat-view.c index 088b1208..f5d6ddf0 100644 --- a/libempathy-gtk/empathy-chat-view.c +++ b/libempathy-gtk/empathy-chat-view.c @@ -61,13 +61,15 @@ chat_view_base_init (gpointer klass) void empathy_chat_view_append_message (EmpathyChatView *view, - EmpathyMessage *msg) + EmpathyMessage *msg, + gboolean should_highlight) { g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view)); if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_message) { EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_message (view, - msg); + msg, + should_highlight); } } diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h index bc9e9176..2c47e042 100644 --- a/libempathy-gtk/empathy-chat-view.h +++ b/libempathy-gtk/empathy-chat-view.h @@ -43,7 +43,8 @@ struct _EmpathyChatViewIface { /* VTabled */ void (*append_message) (EmpathyChatView *view, - EmpathyMessage *msg); + EmpathyMessage *msg, + gboolean should_highlight); void (*append_event) (EmpathyChatView *view, const gchar *str); void (*append_event_markup) (EmpathyChatView *view, @@ -81,7 +82,8 @@ struct _EmpathyChatViewIface { GType empathy_chat_view_get_type (void) G_GNUC_CONST; void empathy_chat_view_append_message (EmpathyChatView *view, - EmpathyMessage *msg); + EmpathyMessage *msg, + gboolean should_highlight); void empathy_chat_view_append_event (EmpathyChatView *view, const gchar *str); void empathy_chat_view_append_event_markup (EmpathyChatView *view, diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 70e35dda..d273a379 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -51,7 +51,6 @@ #include "empathy-contact-dialogs.h" #include "empathy-individual-store-channel.h" #include "empathy-individual-view.h" -#include "empathy-contact-menu.h" #include "empathy-input-text-view.h" #include "empathy-search-bar.h" #include "empathy-theme-manager.h" @@ -74,6 +73,7 @@ struct _EmpathyChatPriv { gchar *id; gchar *name; gchar *subject; + EmpathyContact *self_contact; EmpathyContact *remote_contact; gboolean show_contacts; @@ -156,6 +156,14 @@ struct _EmpathyChatPriv { * the keyboard or the mouse. We can't ask GTK for the most recent * event, because it will be a notify event. Instead we track it here */ GdkEventType most_recent_event_type; + + /* A regex matching our own current nickname in the room, or %NULL if + * !empathy_chat_is_room (). */ + GRegex *highlight_regex; + + /* TRUE if empathy_chat_is_room () and there are unread highlighted messages. + * Cleared by empathy_chat_messages_read (). */ + gboolean highlighted; }; typedef struct { @@ -369,11 +377,18 @@ static gboolean chat_composing_stop_timeout_cb (EmpathyChat *chat) { EmpathyChatPriv *priv; + gboolean send_chat_states; priv = GET_PRIV (chat); priv->composing_stop_timeout_id = 0; - set_chat_state (chat, TP_CHANNEL_CHAT_STATE_PAUSED); + send_chat_states = g_settings_get_boolean (priv->gsettings_chat, + EMPATHY_PREFS_CHAT_SEND_CHAT_STATES); + if (!send_chat_states) { + set_chat_state (chat, TP_CHANNEL_CHAT_STATE_ACTIVE); + } else { + set_chat_state (chat, TP_CHANNEL_CHAT_STATE_PAUSED); + } return FALSE; } @@ -382,9 +397,16 @@ static void chat_composing_start (EmpathyChat *chat) { EmpathyChatPriv *priv; + gboolean send_chat_states; priv = GET_PRIV (chat); + send_chat_states = g_settings_get_boolean (priv->gsettings_chat, + EMPATHY_PREFS_CHAT_SEND_CHAT_STATES); + if (!send_chat_states) { + return; + } + if (priv->composing_stop_timeout_id) { /* Just restart the timeout */ chat_composing_remove_timeout (chat); @@ -897,14 +919,12 @@ chat_command_me (EmpathyChat *chat, if (!tp_text_channel_supports_message_type (channel, TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION)) { /* Action message are not supported, 'simulate' the action */ - EmpathyContact *self_contact; gchar *tmp; - self_contact = empathy_tp_chat_get_self_contact (priv->tp_chat); /* The TpChat can't be ready if it doesn't have the self contact */ - g_assert (self_contact != NULL); + g_assert (priv->self_contact != NULL); - tmp = g_strdup_printf ("%s %s", empathy_contact_get_alias (self_contact), + tmp = g_strdup_printf ("%s %s", empathy_contact_get_alias (priv->self_contact), strv[1]); message = tp_client_message_new_text (TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL, tmp); @@ -1384,6 +1404,86 @@ chat_state_changed_cb (EmpathyTpChat *tp_chat, } } +static GRegex * +get_highlight_regex_for (const gchar *name) +{ + GRegex *regex; + gchar *name_esc, *pattern; + GError *error = NULL; + + name_esc = g_regex_escape_string (name, -1); + pattern = g_strdup_printf ("\\b%s\\b", name_esc); + regex = g_regex_new (pattern, G_REGEX_CASELESS | G_REGEX_OPTIMIZE, 0, + &error); + + if (regex == NULL) { + DEBUG ("couldn't compile regex /%s/: %s", pattern, + error->message); + + g_error_free (error); + } + + g_free (pattern); + g_free (name_esc); + + return regex; +} + +/* Called when priv->self_contact changes, or priv->self_contact:alias changes. + * Only connected if empathy_chat_is_room() is TRUE, for obvious-ish reasons. + */ +static void +chat_self_contact_alias_changed_cb (EmpathyChat *chat) +{ + EmpathyChatPriv *priv = GET_PRIV (chat); + + tp_clear_pointer (&priv->highlight_regex, g_regex_unref); + + if (priv->self_contact != NULL) { + const gchar *alias = empathy_contact_get_alias (priv->self_contact); + + g_return_if_fail (alias != NULL); + priv->highlight_regex = get_highlight_regex_for (alias); + } +} + +static gboolean +chat_should_highlight (EmpathyChat *chat, + EmpathyMessage *message) +{ + EmpathyChatPriv *priv = GET_PRIV (chat); + const gchar *msg; + TpChannelTextMessageFlags flags; + + g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE); + + if (!empathy_chat_is_room (chat)) { + return FALSE; + } + + if (!empathy_message_is_incoming (message)) { + return FALSE; + } + + msg = empathy_message_get_body (message); + if (!msg) { + return FALSE; + } + + flags = empathy_message_get_flags (message); + if (flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK) { + /* FIXME: Ideally we shouldn't highlight scrollback messages only if they + * have already been received by the user before (and so are in the logs) */ + return FALSE; + } + + if (priv->highlight_regex == NULL) { + return FALSE; + } + + return g_regex_match (priv->highlight_regex, msg, 0, NULL); +} + static void chat_message_received (EmpathyChat *chat, EmpathyMessage *message, @@ -1401,19 +1501,26 @@ chat_message_received (EmpathyChat *chat, empathy_chat_view_edit_message (chat->view, message); } else { + gboolean should_highlight = chat_should_highlight (chat, message); + + if (should_highlight) { + priv->highlighted = TRUE; + } + DEBUG ("Appending new message '%s' from %s (%d)", empathy_message_get_token (message), empathy_contact_get_alias (sender), empathy_contact_get_handle (sender)); - empathy_chat_view_append_message (chat->view, message); + empathy_chat_view_append_message (chat->view, message, should_highlight); if (empathy_message_is_incoming (message)) { priv->unread_messages++; g_object_notify (G_OBJECT (chat), "nb-unread-messages"); } - g_signal_emit (chat, signals[NEW_MESSAGE], 0, message, pending); + g_signal_emit (chat, signals[NEW_MESSAGE], 0, message, pending, + should_highlight); } /* We received a message so the contact is no longer @@ -1605,15 +1712,26 @@ chat_subject_changed_cb (EmpathyChat *chat) gtk_widget_show (priv->hbox_topic); } if (priv->block_events_timeout_id == 0) { - gchar *str; + gchar *str = NULL; if (!EMP_STR_EMPTY (priv->subject)) { - str = g_strdup_printf (_("Topic set to: %s"), priv->subject); - } else { + const gchar *actor = empathy_tp_chat_get_subject_actor (priv->tp_chat); + + if (tp_str_empty (actor)) { + str = g_strdup_printf (_("Topic set to: %s"), priv->subject); + } else { + str = g_strdup_printf (_("Topic set by %s to: %s"), + actor, priv->subject); + } + } else if (empathy_tp_chat_supports_subject (priv->tp_chat)) { + /* No need to display this 'event' is no topic can be defined anyway */ str = g_strdup (_("No topic defined")); } - empathy_chat_view_append_event (EMPATHY_CHAT (chat)->view, str); - g_free (str); + + if (str != NULL) { + empathy_chat_view_append_event (EMPATHY_CHAT (chat)->view, str); + g_free (str); + } } } @@ -2492,13 +2610,15 @@ got_filtered_messages_cb (GObject *manager, "sender", empathy_message_get_sender (message), NULL); - empathy_chat_view_append_message (chat->view, syn_msg); + empathy_chat_view_append_message (chat->view, syn_msg, + chat_should_highlight (chat, syn_msg)); empathy_chat_view_edit_message (chat->view, message); g_object_unref (syn_msg); } else { /* append the latest message */ - empathy_chat_view_append_message (chat->view, message); + empathy_chat_view_append_message (chat->view, message, + chat_should_highlight (chat, message)); } g_object_unref (message); @@ -2796,6 +2916,32 @@ empathy_chat_set_show_contacts (EmpathyChat *chat, g_object_notify (G_OBJECT (chat), "show-contacts"); } +static void +chat_self_contact_changed_cb (EmpathyChat *chat) +{ + EmpathyChatPriv *priv = GET_PRIV (chat); + + if (priv->self_contact != NULL) { + g_signal_handlers_disconnect_by_func (priv->self_contact, + chat_self_contact_alias_changed_cb, + chat); + } + g_clear_object (&priv->self_contact); + + priv->self_contact = empathy_tp_chat_get_self_contact (priv->tp_chat); + if (priv->self_contact != NULL) { + g_object_ref (priv->self_contact); + + if (empathy_chat_is_room (chat)) { + g_signal_connect_swapped (priv->self_contact, "notify::alias", + G_CALLBACK (chat_self_contact_alias_changed_cb), + chat); + } + } + + chat_self_contact_alias_changed_cb (chat); +} + static void chat_remote_contact_changed_cb (EmpathyChat *chat) { @@ -3150,6 +3296,8 @@ chat_finalize (GObject *object) chat_state_changed_cb, chat); g_signal_handlers_disconnect_by_func (priv->tp_chat, chat_members_changed_cb, chat); + g_signal_handlers_disconnect_by_func (priv->tp_chat, + chat_self_contact_changed_cb, chat); g_signal_handlers_disconnect_by_func (priv->tp_chat, chat_remote_contact_changed_cb, chat); g_signal_handlers_disconnect_by_func (priv->tp_chat, @@ -3162,6 +3310,12 @@ chat_finalize (GObject *object) if (priv->account) { g_object_unref (priv->account); } + if (priv->self_contact) { + g_signal_handlers_disconnect_by_func (priv->self_contact, + chat_self_contact_alias_changed_cb, + chat); + g_object_unref (priv->self_contact); + } if (priv->remote_contact) { g_object_unref (priv->remote_contact); } @@ -3175,6 +3329,8 @@ chat_finalize (GObject *object) g_free (priv->subject); g_completion_free (priv->completion); + tp_clear_pointer (&priv->highlight_regex, g_regex_unref); + G_OBJECT_CLASS (empathy_chat_parent_class)->finalize (object); } @@ -3297,6 +3453,14 @@ empathy_chat_class_init (EmpathyChatClass *klass) G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + /** + * EmpathyChat::new-message: + * @self: the #EmpathyChat + * @message: the new message + * @pending: whether the message was in the pending queue when @self + * was created + * @should_highlight: %TRUE if the message mentions the local user + */ signals[NEW_MESSAGE] = g_signal_new ("new-message", G_OBJECT_CLASS_TYPE (object_class), @@ -3305,7 +3469,7 @@ empathy_chat_class_init (EmpathyChatClass *klass) NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, - 2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN); + 3, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); signals[PART_COMMAND_ENTERED] = g_signal_new ("part-command-entered", @@ -3871,6 +4035,9 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, g_signal_connect (tp_chat, "member-renamed", G_CALLBACK (chat_member_renamed_cb), chat); + g_signal_connect_swapped (tp_chat, "notify::self-contact", + G_CALLBACK (chat_self_contact_changed_cb), + chat); g_signal_connect_swapped (tp_chat, "notify::remote-contact", G_CALLBACK (chat_remote_contact_changed_cb), chat); @@ -3892,6 +4059,7 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, /* Get initial value of properties */ chat_sms_channel_changed_cb (chat); + chat_self_contact_changed_cb (chat); chat_remote_contact_changed_cb (chat); chat_title_changed_cb (chat); chat_subject_changed_cb (chat); @@ -3989,16 +4157,30 @@ empathy_chat_get_contact_menu (EmpathyChat *chat) { EmpathyChatPriv *priv = GET_PRIV (chat); GtkWidget *menu = NULL; + FolksIndividual *individual; + TpContact *contact; g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL); - if (priv->remote_contact) { - menu = empathy_contact_menu_new (priv->remote_contact, - EMPATHY_CONTACT_FEATURE_CALL | - EMPATHY_CONTACT_FEATURE_LOG | - EMPATHY_CONTACT_FEATURE_INFO | - EMPATHY_CONTACT_FEATURE_BLOCK); - } + if (priv->remote_contact == NULL) + return NULL; + + contact = empathy_contact_get_tp_contact (priv->remote_contact); + if (contact == NULL) + return NULL; + + individual = empathy_ensure_individual_from_tp_contact (contact); + + if (individual == NULL) + return NULL; + + menu = empathy_individual_menu_new (individual, + EMPATHY_INDIVIDUAL_FEATURE_CALL | + EMPATHY_INDIVIDUAL_FEATURE_LOG | + EMPATHY_INDIVIDUAL_FEATURE_INFO | + EMPATHY_INDIVIDUAL_FEATURE_BLOCK, NULL); + + g_object_unref (individual); return menu; } @@ -4150,6 +4332,16 @@ empathy_chat_is_room (EmpathyChat *chat) return (priv->handle_type == TP_HANDLE_TYPE_ROOM); } +gboolean +empathy_chat_is_highlighted (EmpathyChat *chat) +{ + EmpathyChatPriv *priv = GET_PRIV (chat); + + g_return_val_if_fail (EMPATHY_IS_CHAT (chat), FALSE); + + return priv->highlighted; +} + guint empathy_chat_get_nb_unread_messages (EmpathyChat *self) { @@ -4178,6 +4370,8 @@ empathy_chat_messages_read (EmpathyChat *self) TP_TEXT_CHANNEL (priv->tp_chat), NULL, NULL); } + priv->highlighted = FALSE; + if (priv->unread_messages_when_offline > 0) { /* We can't ack those as the connection has gone away so just consider * them as read. */ diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h index 0031410d..00da3d64 100644 --- a/libempathy-gtk/empathy-chat.h +++ b/libempathy-gtk/empathy-chat.h @@ -89,7 +89,7 @@ gboolean empathy_chat_is_room (EmpathyChat *chat); void empathy_chat_set_show_contacts (EmpathyChat *chat, gboolean show); guint empathy_chat_get_nb_unread_messages (EmpathyChat *chat); - +gboolean empathy_chat_is_highlighted (EmpathyChat *chat); void empathy_chat_messages_read (EmpathyChat *self); gboolean empathy_chat_is_composing (EmpathyChat *chat); diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c index c28362b7..eee88aa5 100644 --- a/libempathy-gtk/empathy-contact-blocking-dialog.c +++ b/libempathy-gtk/empathy-contact-blocking-dialog.c @@ -27,7 +27,6 @@ #include -#include #include #include @@ -433,9 +432,8 @@ contact_blocking_dialog_account_changed (GtkWidget *account_chooser, TpConnection *conn = empathy_account_chooser_get_connection ( EMPATHY_ACCOUNT_CHOOSER (account_chooser)); GPtrArray *blocked; - EmpathyContactManager *contact_manager; - EmpathyTpContactList *contact_list; - GList *members, *ptr; + GPtrArray *members; + guint i; if (self->priv->block_account_changed > 0) return; @@ -472,37 +470,29 @@ contact_blocking_dialog_account_changed (GtkWidget *account_chooser, contact_blocking_dialog_add_blocked (self, blocked); - /* load the completion list */ - g_return_if_fail (empathy_contact_manager_initialized ()); - DEBUG ("Loading contacts"); - contact_manager = empathy_contact_manager_dup_singleton (); - contact_list = empathy_contact_manager_get_list (contact_manager, conn); - members = empathy_contact_list_get_members ( - EMPATHY_CONTACT_LIST (contact_list)); + members = tp_connection_dup_contact_list (conn); - for (ptr = members; ptr != NULL; ptr = ptr->next) + for (i = 0; i < members->len; i++) { - EmpathyContact *contact = ptr->data; + TpContact *contact = g_ptr_array_index (members, i); gchar *tmpstr; tmpstr = g_strdup_printf ("%s (%s)", - empathy_contact_get_alias (contact), - empathy_contact_get_id (contact)); + tp_contact_get_alias (contact), + tp_contact_get_identifier (contact)); gtk_list_store_insert_with_values (self->priv->completion_contacts, NULL, -1, - COL_COMPLETION_IDENTIFIER, empathy_contact_get_id (contact), + COL_COMPLETION_IDENTIFIER, tp_contact_get_identifier (contact), COL_COMPLETION_TEXT, tmpstr, -1); g_free (tmpstr); - g_object_unref (contact); } - g_list_free (members); - g_object_unref (contact_manager); + g_ptr_array_unref (members); } static void diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c index cba419be..ccdd5fa6 100644 --- a/libempathy-gtk/empathy-contact-chooser.c +++ b/libempathy-gtk/empathy-contact-chooser.c @@ -51,6 +51,9 @@ struct _EmpathyContactChooserPrivate EmpathyContactChooserFilterFunc filter_func; gpointer filter_data; + + /* list of reffed TpContact */ + GList *tp_contacts; }; struct _AddTemporaryIndividualCtx @@ -104,6 +107,9 @@ contact_chooser_dispose (GObject *object) tp_clear_object (&self->priv->account_mgr); + g_list_free_full (self->priv->tp_contacts, g_object_unref); + self->priv->tp_contacts = NULL; + G_OBJECT_CLASS (empathy_contact_chooser_parent_class)->dispose ( object); } @@ -212,6 +218,7 @@ get_contacts_cb (TpConnection *connection, (EmpathyContactChooser *) weak_object; AddTemporaryIndividualCtx *ctx = user_data; FolksIndividual *individual; + TpContact *contact; if (self->priv->add_temp_ctx != ctx) /* another request has been started */ @@ -220,10 +227,20 @@ get_contacts_cb (TpConnection *connection, if (n_contacts != 1) return; - individual = empathy_create_individual_from_tp_contact (contacts[0]); + contact = contacts[0]; + + individual = empathy_create_individual_from_tp_contact (contact); + if (individual == NULL) + return; + + /* tp-glib will unref the TpContact once we return from this callback + * but folks expect us to keep a reference on the TpContact. + * Ideally folks shouldn't force us to do that: bgo #666580 */ + self->priv->tp_contacts = g_list_prepend (self->priv->tp_contacts, + g_object_ref (contact)); /* listen for updates to the capabilities */ - tp_g_signal_connect_object (contacts[0], "notify::capabilities", + tp_g_signal_connect_object (contact, "notify::capabilities", G_CALLBACK (contact_capabilities_changed), self, 0); /* Pass ownership to the list */ @@ -433,6 +450,9 @@ empathy_contact_chooser_new (void) NULL); } +/* Note that because of bgo #666580 the returned invidivdual is valid until + * @self is destroyed. To keep it around after that, the TpContact associated + * with the individual needs to be manually reffed. */ FolksIndividual * empathy_contact_chooser_dup_selected (EmpathyContactChooser *self) { diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index 1c56a868..00d737bd 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -39,8 +39,6 @@ static GList *subscription_dialogs = NULL; static GList *information_dialogs = NULL; -static GList *edit_dialogs = NULL; -static GtkWidget *personal_dialog = NULL; static GtkWidget *new_contact_dialog = NULL; static gint @@ -262,117 +260,6 @@ empathy_contact_information_dialog_show (EmpathyContact *contact, gtk_widget_show (dialog); } -void -empathy_contact_edit_dialog_show (EmpathyContact *contact, - GtkWindow *parent) -{ - GtkWidget *dialog; - GtkWidget *button; - GtkWidget *contact_widget; - GList *l; - - g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - - l = g_list_find_custom (edit_dialogs, - contact, - (GCompareFunc) contact_dialogs_find); - if (l) { - gtk_window_present (GTK_WINDOW (l->data)); - return; - } - - /* Create dialog */ - dialog = gtk_dialog_new (); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Contact Information")); - - /* Close button */ - button = gtk_button_new_with_label (GTK_STOCK_CLOSE); - gtk_button_set_use_stock (GTK_BUTTON (button), TRUE); - gtk_dialog_add_action_widget (GTK_DIALOG (dialog), - button, - GTK_RESPONSE_CLOSE); - gtk_widget_set_can_default (button, TRUE); - gtk_window_set_default (GTK_WINDOW (dialog), button); - gtk_widget_show (button); - - /* Contact info widget */ - contact_widget = empathy_contact_widget_new (contact, - EMPATHY_CONTACT_WIDGET_EDIT_ALIAS | - EMPATHY_CONTACT_WIDGET_EDIT_GROUPS | - EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE); - gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), - contact_widget, - TRUE, TRUE, 0); - gtk_widget_show (contact_widget); - - g_object_set_data (G_OBJECT (dialog), "contact_widget", contact_widget); - edit_dialogs = g_list_prepend (edit_dialogs, dialog); - - g_signal_connect (dialog, "response", - G_CALLBACK (contact_dialogs_response_cb), - &edit_dialogs); - - if (parent) { - gtk_window_set_transient_for (GTK_WINDOW (dialog), parent); - } - - gtk_widget_show (dialog); -} - -void -empathy_contact_personal_dialog_show (GtkWindow *parent) -{ - GtkWidget *button; - GtkWidget *contact_widget; - - if (personal_dialog) { - gtk_window_present (GTK_WINDOW (personal_dialog)); - return; - } - - /* Create dialog */ - personal_dialog = gtk_dialog_new (); - gtk_window_set_resizable (GTK_WINDOW (personal_dialog), FALSE); - gtk_window_set_title (GTK_WINDOW (personal_dialog), _("Personal Information")); - - /* Close button */ - button = gtk_button_new_with_label (GTK_STOCK_CLOSE); - gtk_button_set_use_stock (GTK_BUTTON (button), TRUE); - gtk_dialog_add_action_widget (GTK_DIALOG (personal_dialog), - button, - GTK_RESPONSE_CLOSE); - gtk_widget_set_can_default (button, TRUE); - gtk_window_set_default (GTK_WINDOW (personal_dialog), button); - gtk_widget_show (button); - - /* Contact info widget */ - contact_widget = empathy_contact_widget_new (NULL, - EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT | - EMPATHY_CONTACT_WIDGET_EDIT_ALIAS | - EMPATHY_CONTACT_WIDGET_EDIT_AVATAR | - EMPATHY_CONTACT_WIDGET_EDIT_DETAILS); - gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (personal_dialog))), - contact_widget, - TRUE, TRUE, 0); - empathy_contact_widget_set_account_filter (contact_widget, - empathy_account_chooser_filter_is_connected, NULL); - gtk_widget_show (contact_widget); - - g_signal_connect (personal_dialog, "response", - G_CALLBACK (gtk_widget_destroy), NULL); - g_object_add_weak_pointer (G_OBJECT (personal_dialog), - (gpointer) &personal_dialog); - - if (parent) { - gtk_window_set_transient_for (GTK_WINDOW (personal_dialog), parent); - } - - gtk_widget_show (personal_dialog); -} - /* * New contact dialog */ diff --git a/libempathy-gtk/empathy-contact-dialogs.h b/libempathy-gtk/empathy-contact-dialogs.h index 5dbb7765..8eb78770 100644 --- a/libempathy-gtk/empathy-contact-dialogs.h +++ b/libempathy-gtk/empathy-contact-dialogs.h @@ -33,9 +33,6 @@ void empathy_subscription_dialog_show (EmpathyContact *contact, GtkWindow *parent); void empathy_contact_information_dialog_show (EmpathyContact *contact, GtkWindow *parent); -void empathy_contact_edit_dialog_show (EmpathyContact *contact, - GtkWindow *parent); -void empathy_contact_personal_dialog_show (GtkWindow *parent); void empathy_new_contact_dialog_show (GtkWindow *parent); void empathy_new_contact_dialog_show_with_contact (GtkWindow *parent, EmpathyContact *contact); diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c deleted file mode 100644 index dd9ea5c1..00000000 --- a/libempathy-gtk/empathy-contact-menu.c +++ /dev/null @@ -1,662 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2008 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - */ - -#include "config.h" - -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "empathy-contact-menu.h" -#include "empathy-images.h" -#include "empathy-log-window.h" -#include "empathy-contact-dialogs.h" -#include "empathy-ui-utils.h" -#include "empathy-share-my-desktop.h" -#include "empathy-call-utils.h" - -static GtkWidget *empathy_contact_block_menu_item_new (EmpathyContact *); - -GtkWidget * -empathy_contact_menu_new (EmpathyContact *contact, - EmpathyContactFeatureFlags features) -{ - GtkWidget *menu; - GtkMenuShell *shell; - GtkWidget *item; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - if (features == EMPATHY_CONTACT_FEATURE_NONE) { - return NULL; - } - - menu = gtk_menu_new (); - shell = GTK_MENU_SHELL (menu); - - /* Add Contact */ - item = empathy_contact_add_menu_item_new (contact); - if (item) { - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - } - - /* Chat */ - if (features & EMPATHY_CONTACT_FEATURE_CHAT) { - item = empathy_contact_chat_menu_item_new (contact); - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - } - - if (features & EMPATHY_CONTACT_FEATURE_CALL) { - /* Audio Call */ - item = empathy_contact_audio_call_menu_item_new (contact); - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - - /* Video Call */ - item = empathy_contact_video_call_menu_item_new (contact); - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - } - - /* Invite */ - item = empathy_contact_invite_menu_item_new (contact); - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - - /* File transfer */ - if (features & EMPATHY_CONTACT_FEATURE_FT) { - item = empathy_contact_file_transfer_menu_item_new (contact); - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - } - - /* Share my desktop */ - /* FIXME we should add the "Share my desktop" menu item if Vino is - a registered handler in MC5 */ - item = empathy_contact_share_my_desktop_menu_item_new (contact); - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - - /* Separator */ - if (features & (EMPATHY_CONTACT_FEATURE_EDIT | - EMPATHY_CONTACT_FEATURE_INFO)) { - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - } - - /* Edit */ - if (features & EMPATHY_CONTACT_FEATURE_EDIT) { - item = empathy_contact_edit_menu_item_new (contact); - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - } - - /* Log */ - if (features & EMPATHY_CONTACT_FEATURE_LOG) { - item = empathy_contact_log_menu_item_new (contact); - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - } - - /* Info */ - if (features & EMPATHY_CONTACT_FEATURE_INFO) { - item = empathy_contact_info_menu_item_new (contact); - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - } - - /* Separator & Block */ - if (features & EMPATHY_CONTACT_FEATURE_BLOCK && - (item = empathy_contact_block_menu_item_new (contact)) != NULL) { - GtkWidget *sep; - - sep = gtk_separator_menu_item_new (); - gtk_menu_shell_append (shell, sep); - gtk_widget_show (sep); - - gtk_menu_shell_append (shell, item); - gtk_widget_show (item); - } - - return menu; -} - -static void -empathy_contact_add_menu_item_activated (GtkMenuItem *item, - EmpathyContact *contact) -{ - GtkWidget *toplevel; - - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item)); - if (!gtk_widget_is_toplevel (toplevel) || !GTK_IS_WINDOW (toplevel)) { - toplevel = NULL; - } - - empathy_new_contact_dialog_show_with_contact (GTK_WINDOW (toplevel), - contact); -} - -GtkWidget * -empathy_contact_add_menu_item_new (EmpathyContact *contact) -{ - GtkWidget *item; - GtkWidget *image; - EmpathyContactManager *manager; - TpConnection *connection; - GList *l, *members; - gboolean found = FALSE; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - if (!empathy_contact_manager_initialized ()) { - return NULL; - } - - manager = empathy_contact_manager_dup_singleton (); - connection = empathy_contact_get_connection (contact); - - if (!tp_connection_get_can_change_contact_list (connection)) - return NULL; - - members = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (manager)); - for (l = members; l; l = l->next) { - if (!found && empathy_contact_equal (l->data, contact)) { - found = TRUE; - /* we keep iterating so that we don't leak contact - * refs */ - } - - g_object_unref (l->data); - } - g_list_free (members); - g_object_unref (manager); - - if (found) { - return NULL; - } - - item = gtk_image_menu_item_new_with_mnemonic (_("_Add Contact…")); - image = gtk_image_new_from_icon_name (GTK_STOCK_ADD, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - - g_signal_connect (item, "activate", - G_CALLBACK (empathy_contact_add_menu_item_activated), - contact); - - return item; -} - -static void -empathy_contact_block_menu_item_toggled (GtkCheckMenuItem *item, - EmpathyContact *contact) -{ - static guint block_signal = 0; - gboolean blocked, abusive; - TpContact *tp_contact; - - if (block_signal > 0) - return; - - blocked = gtk_check_menu_item_get_active (item); - - if (blocked) { - /* confirm the user really wishes to block the contact */ - GtkWidget *parent; - GdkPixbuf *avatar; - - /* gtk_menu_get_attach_widget () doesn't behave properly here - * for some reason */ - parent = g_object_get_data ( - G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (item))), - "window"); - - avatar = empathy_pixbuf_avatar_from_contact_scaled (contact, 48, 48); - - if (!empathy_block_contact_dialog_show (GTK_WINDOW (parent), - contact, avatar, &abusive)) - return; - } - - tp_contact = empathy_contact_get_tp_contact (contact); - - if (blocked) - tp_contact_block_async (tp_contact, abusive, NULL, NULL); - else - tp_contact_unblock_async (tp_contact, NULL, NULL); - - /* update the toggle with the blocked status */ - block_signal++; - gtk_check_menu_item_set_active (item, blocked); - block_signal--; -} - -static GtkWidget * -empathy_contact_block_menu_item_new (EmpathyContact *contact) -{ - GtkWidget *item; - TpConnection *connection; - TpContact *tp_contact; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - if (!empathy_contact_manager_initialized ()) { - return NULL; - } - - connection = empathy_contact_get_connection (contact); - - if (!tp_proxy_has_interface_by_id (connection, - TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING)) - return NULL; - - item = gtk_check_menu_item_new_with_mnemonic (_("_Block Contact")); - - tp_contact = empathy_contact_get_tp_contact (contact); - - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), - tp_contact_is_blocked (tp_contact)); - - g_signal_connect (item, "toggled", - G_CALLBACK (empathy_contact_block_menu_item_toggled), - contact); - - return item; -} - -static void -empathy_contact_chat_menu_item_activated (GtkMenuItem *item, - EmpathyContact *contact) -{ - empathy_chat_with_contact (contact, empathy_get_current_action_time ()); -} - -GtkWidget * -empathy_contact_chat_menu_item_new (EmpathyContact *contact) -{ - GtkWidget *item; - GtkWidget *image; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - item = gtk_image_menu_item_new_with_mnemonic (_("_Chat")); - image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_MESSAGE, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - gtk_widget_set_sensitive (item, !empathy_contact_is_user (contact)); - gtk_widget_show (image); - - g_signal_connect (item, "activate", - G_CALLBACK (empathy_contact_chat_menu_item_activated), - contact); - - return item; -} - -static void -empathy_contact_audio_call_menu_item_activated (GtkMenuItem *item, - EmpathyContact *contact) -{ - empathy_call_new_with_streams (empathy_contact_get_id (contact), - empathy_contact_get_account (contact), - TRUE, FALSE, - empathy_get_current_action_time ()); -} - -GtkWidget * -empathy_contact_audio_call_menu_item_new (EmpathyContact *contact) -{ - GtkWidget *item; - GtkWidget *image; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - item = gtk_image_menu_item_new_with_mnemonic (C_("menu item", "_Audio Call")); - image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VOIP, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - gtk_widget_set_sensitive (item, empathy_contact_can_voip_audio (contact) && - !empathy_contact_is_user (contact)); - gtk_widget_show (image); - - g_signal_connect (item, "activate", - G_CALLBACK (empathy_contact_audio_call_menu_item_activated), - contact); - - return item; -} - -static void -empathy_contact_video_call_menu_item_activated (GtkMenuItem *item, - EmpathyContact *contact) -{ - empathy_call_new_with_streams (empathy_contact_get_id (contact), - empathy_contact_get_account (contact), - TRUE, TRUE, - empathy_get_current_action_time ()); -} - -GtkWidget * -empathy_contact_video_call_menu_item_new (EmpathyContact *contact) -{ - GtkWidget *item; - GtkWidget *image; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - item = gtk_image_menu_item_new_with_mnemonic (C_("menu item", "_Video Call")); - image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VIDEO_CALL, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - gtk_widget_set_sensitive (item, empathy_contact_can_voip_video (contact) && - !empathy_contact_is_user (contact)); - gtk_widget_show (image); - - g_signal_connect (item, "activate", - G_CALLBACK (empathy_contact_video_call_menu_item_activated), - contact); - - return item; -} - -static void -contact_log_menu_item_activate_cb (EmpathyContact *contact) -{ - empathy_log_window_show (empathy_contact_get_account (contact), - empathy_contact_get_id (contact), - FALSE, NULL); -} - -GtkWidget * -empathy_contact_log_menu_item_new (EmpathyContact *contact) -{ - TplLogManager *manager; - TplEntity *entity; - gboolean have_log; - GtkWidget *item; - GtkWidget *image; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - manager = tpl_log_manager_dup_singleton (); - entity = tpl_entity_new_from_tp_contact (empathy_contact_get_tp_contact (contact), - TPL_ENTITY_CONTACT); - - have_log = tpl_log_manager_exists (manager, - empathy_contact_get_account (contact), - entity, - TPL_EVENT_MASK_TEXT); - - g_object_unref (entity); - g_object_unref (manager); - - item = gtk_image_menu_item_new_with_mnemonic (_("_Previous Conversations")); - image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_LOG, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - gtk_widget_set_sensitive (item, have_log); - gtk_widget_show (image); - - g_signal_connect_swapped (item, "activate", - G_CALLBACK (contact_log_menu_item_activate_cb), - contact); - - return item; -} - -GtkWidget * -empathy_contact_file_transfer_menu_item_new (EmpathyContact *contact) -{ - GtkWidget *item; - GtkWidget *image; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - item = gtk_image_menu_item_new_with_mnemonic (_("Send File")); - image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND, - GTK_ICON_SIZE_MENU); - gtk_widget_set_sensitive (item, empathy_contact_can_send_files (contact) && - !empathy_contact_is_user (contact)); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - gtk_widget_show (image); - - g_signal_connect_swapped (item, "activate", - G_CALLBACK (empathy_send_file_with_file_chooser), - contact); - - return item; -} - -GtkWidget * -empathy_contact_share_my_desktop_menu_item_new (EmpathyContact *contact) -{ - GtkWidget *item; - GtkWidget *image; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - item = gtk_image_menu_item_new_with_mnemonic (_("Share My Desktop")); - image = gtk_image_new_from_icon_name (GTK_STOCK_NETWORK, - GTK_ICON_SIZE_MENU); - gtk_widget_set_sensitive (item, empathy_contact_can_use_rfb_stream_tube ( - contact)); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - gtk_widget_show (image); - - g_signal_connect_swapped (item, "activate", - G_CALLBACK (empathy_share_my_desktop_share_with_contact), - contact); - - return item; -} - -static void -contact_info_menu_item_activate_cb (EmpathyContact *contact) -{ - empathy_contact_information_dialog_show (contact, NULL); -} - -GtkWidget * -empathy_contact_info_menu_item_new (EmpathyContact *contact) -{ - GtkWidget *item; - GtkWidget *image; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - item = gtk_image_menu_item_new_with_mnemonic (_("Infor_mation")); - image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_CONTACT_INFORMATION, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - gtk_widget_show (image); - - g_signal_connect_swapped (item, "activate", - G_CALLBACK (contact_info_menu_item_activate_cb), - contact); - - return item; -} - -static void -contact_edit_menu_item_activate_cb (EmpathyContact *contact) -{ - empathy_contact_edit_dialog_show (contact, NULL); -} - -GtkWidget * -empathy_contact_edit_menu_item_new (EmpathyContact *contact) -{ - GtkWidget *item; - GtkWidget *image; - gboolean enable = FALSE; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - if (empathy_contact_manager_initialized ()) { - TpConnection *connection; - - connection = empathy_contact_get_connection (contact); - - enable = (tp_connection_can_set_contact_alias (connection) || - tp_connection_get_group_storage (connection) != - TP_CONTACT_METADATA_STORAGE_TYPE_NONE); - } - - item = gtk_image_menu_item_new_with_mnemonic ( - C_("Edit contact (contextual menu)", - "_Edit")); - image = gtk_image_new_from_icon_name (GTK_STOCK_EDIT, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - gtk_widget_show (image); - - gtk_widget_set_sensitive (item, enable); - - g_signal_connect_swapped (item, "activate", - G_CALLBACK (contact_edit_menu_item_activate_cb), - contact); - - return item; -} - -typedef struct { - EmpathyContact *contact; - EmpathyChatroom *chatroom; -} RoomSubMenuData; - -static RoomSubMenuData * -room_sub_menu_data_new (EmpathyContact *contact, - EmpathyChatroom *chatroom) -{ - RoomSubMenuData *data; - - data = g_slice_new (RoomSubMenuData); - data->contact = g_object_ref (contact); - data->chatroom = g_object_ref (chatroom); - return data; -} - -static void -room_sub_menu_data_free (RoomSubMenuData *data) -{ - g_object_unref (data->contact); - g_object_unref (data->chatroom); - g_slice_free (RoomSubMenuData, data); -} - -static void -room_sub_menu_activate_cb (GtkWidget *item, - RoomSubMenuData *data) -{ - EmpathyTpChat *chat; - - chat = empathy_chatroom_get_tp_chat (data->chatroom); - if (chat == NULL) { - /* channel was invalidated. Ignoring */ - return; - } - - /* send invitation */ - empathy_contact_list_add (EMPATHY_CONTACT_LIST (chat), data->contact, - _("Inviting you to this room")); -} - -static GtkWidget * -create_room_sub_menu (EmpathyContact *contact, - EmpathyChatroom *chatroom) -{ - GtkWidget *item; - RoomSubMenuData *data; - - item = gtk_menu_item_new_with_label (empathy_chatroom_get_name (chatroom)); - data = room_sub_menu_data_new (contact, chatroom); - g_signal_connect_data (item, "activate", - G_CALLBACK (room_sub_menu_activate_cb), data, - (GClosureNotify) room_sub_menu_data_free, 0); - - return item; -} - -GtkWidget * -empathy_contact_invite_menu_item_new (EmpathyContact *contact) -{ - GtkWidget *item; - GtkWidget *image; - GtkWidget *room_item; - EmpathyChatroomManager *mgr; - GList *rooms, *l; - GtkWidget *submenu = NULL; - - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - item = gtk_image_menu_item_new_with_mnemonic (_("_Invite to Chat Room")); - image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_GROUP_MESSAGE, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - - if (empathy_contact_is_user (contact)) { - gtk_widget_set_sensitive (item, FALSE); - gtk_widget_show (image); - return item; - } - - mgr = empathy_chatroom_manager_dup_singleton (NULL); - rooms = empathy_chatroom_manager_get_chatrooms (mgr, - empathy_contact_get_account (contact)); - - for (l = rooms; l != NULL; l = g_list_next (l)) { - EmpathyChatroom *chatroom = l->data; - - if (empathy_chatroom_get_tp_chat (chatroom) != NULL) { - if (G_UNLIKELY (submenu == NULL)) - submenu = gtk_menu_new (); - - room_item = create_room_sub_menu (contact, chatroom); - gtk_menu_shell_append ((GtkMenuShell *) submenu, room_item); - gtk_widget_show (room_item); - } - } - - if (submenu) { - gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); - } else { - gtk_widget_set_sensitive (item, FALSE); - } - - gtk_widget_show (image); - - g_object_unref (mgr); - g_list_free (rooms); - - return item; -} - diff --git a/libempathy-gtk/empathy-contact-menu.h b/libempathy-gtk/empathy-contact-menu.h deleted file mode 100644 index b99e1410..00000000 --- a/libempathy-gtk/empathy-contact-menu.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2008 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - */ - -#ifndef __EMPATHY_CONTACT_MENU_H__ -#define __EMPATHY_CONTACT_MENU_H__ - -#include - -#include - -G_BEGIN_DECLS - -typedef enum { - EMPATHY_CONTACT_FEATURE_NONE = 0, - EMPATHY_CONTACT_FEATURE_CHAT = 1 << 0, - EMPATHY_CONTACT_FEATURE_CALL = 1 << 1, - EMPATHY_CONTACT_FEATURE_LOG = 1 << 2, - EMPATHY_CONTACT_FEATURE_EDIT = 1 << 3, - EMPATHY_CONTACT_FEATURE_INFO = 1 << 4, - EMPATHY_CONTACT_FEATURE_FT = 1 << 6, - EMPATHY_CONTACT_FEATURE_BLOCK = 1 << 7, - EMPATHY_CONTACT_FEATURE_ALL = (1 << 8) - 1, -} EmpathyContactFeatureFlags; - -GtkWidget * empathy_contact_menu_new (EmpathyContact *contact, - EmpathyContactFeatureFlags features); -GtkWidget * empathy_contact_add_menu_item_new (EmpathyContact *contact); -GtkWidget * empathy_contact_chat_menu_item_new (EmpathyContact *contact); -GtkWidget * empathy_contact_audio_call_menu_item_new (EmpathyContact *contact); -GtkWidget * empathy_contact_video_call_menu_item_new (EmpathyContact *contact); -GtkWidget * empathy_contact_log_menu_item_new (EmpathyContact *contact); -GtkWidget * empathy_contact_info_menu_item_new (EmpathyContact *contact); -GtkWidget * empathy_contact_edit_menu_item_new (EmpathyContact *contact); -GtkWidget * empathy_contact_invite_menu_item_new (EmpathyContact *contact); -GtkWidget * empathy_contact_file_transfer_menu_item_new (EmpathyContact *contact); -GtkWidget * empathy_contact_share_my_desktop_menu_item_new (EmpathyContact *contact); - -G_END_DECLS - -#endif /* __EMPATHY_CONTACT_MENU_H__ */ - diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 476fb621..b352ee12 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -37,7 +37,6 @@ #include #include -#include #include #include #include @@ -81,7 +80,6 @@ typedef struct { - EmpathyContactManager *manager; EmpathyContact *contact; EmpathyContactWidgetFlags flags; guint widget_id_timeout; @@ -90,7 +88,6 @@ typedef struct GtkWidget *vbox_contact_widget; /* Contact */ - GtkWidget *hbox_contact; GtkWidget *widget_avatar; GtkWidget *widget_account; GtkWidget *image_account; @@ -104,6 +101,7 @@ typedef struct GtkWidget *grid_contact; GtkWidget *vbox_avatar; GtkWidget *favourite_checkbox; + GtkWidget *label_details; /* Location */ GtkWidget *vbox_location; @@ -1335,19 +1333,6 @@ contact_widget_presence_notify_cb (EmpathyContactWidget *information) gtk_widget_show (information->image_state); } -static void -contact_widget_favourites_changed_cb (EmpathyContactManager *manager, - EmpathyContact *contact, - gboolean is_favourite, - EmpathyContactWidget *information) -{ - if (contact != information->contact) - return; - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON ( - information->favourite_checkbox), is_favourite); -} - static void contact_widget_remove_contact (EmpathyContactWidget *information) { @@ -1449,24 +1434,19 @@ contact_widget_contact_update (EmpathyContactWidget *information) contact_widget_presence_notify_cb (information); contact_widget_avatar_notify_cb (information); - if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE) - { - FolksPersona *persona = empathy_contact_get_persona ( - information->contact); - - if (persona != NULL && FOLKS_IS_FAVOURITE_DETAILS (persona)) - { - gboolean is_favourite = folks_favourite_details_get_is_favourite ( - FOLKS_FAVOURITE_DETAILS (persona)); - contact_widget_favourites_changed_cb (information->manager, - information->contact, is_favourite, information); - } - } - gtk_widget_show (information->label_alias); gtk_widget_show (information->widget_alias); - gtk_widget_show (information->hbox_presence); gtk_widget_show (information->widget_avatar); + + gtk_widget_set_visible (information->hbox_presence, + !(information->flags & EMPATHY_CONTACT_WIDGET_NO_STATUS)); + + if (empathy_contact_is_user (information->contact)) + gtk_label_set_text (GTK_LABEL (information->label_details), + _("Personal Details")); + else + gtk_label_set_text (GTK_LABEL (information->label_details), + _("Contact Details")); } else { @@ -1582,20 +1562,6 @@ contact_widget_id_focus_out_cb (GtkWidget *widget, return FALSE; } -static void -favourite_toggled_cb (GtkToggleButton *button, - EmpathyContactWidget *information) -{ - FolksPersona *persona = empathy_contact_get_persona (information->contact); - - if (persona != NULL && FOLKS_IS_FAVOURITE_DETAILS (persona)) - { - gboolean active = gtk_toggle_button_get_active (button); - folks_favourite_details_set_is_favourite ( - FOLKS_FAVOURITE_DETAILS (persona), active); - } -} - static void contact_widget_contact_setup (EmpathyContactWidget *information) { @@ -1737,25 +1703,6 @@ contact_widget_contact_setup (EmpathyContactWidget *information) gtk_label_set_selectable (GTK_LABEL (information->label_status), FALSE); } gtk_widget_show (information->widget_alias); - - /* Favorite */ - if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE) - { - information->favourite_checkbox = gtk_check_button_new_with_label ( - _("Favorite")); - - g_signal_connect (information->favourite_checkbox, "toggled", - G_CALLBACK (favourite_toggled_cb), information); - - gtk_grid_attach (GTK_GRID (information->grid_contact), - information->favourite_checkbox, 0, 3, 1, 1); - - information->fav_sig_id = g_signal_connect (information->manager, - "favourites-changed", - G_CALLBACK (contact_widget_favourites_changed_cb), information); - - gtk_widget_show (information->favourite_checkbox); - } } static void @@ -1769,11 +1716,6 @@ contact_widget_destroy_cb (GtkWidget *widget, g_source_remove (information->widget_id_timeout); } - if (information->fav_sig_id != 0) - g_signal_handler_disconnect (information->manager, information->fav_sig_id); - - g_object_unref (information->manager); - g_slice_free (EmpathyContactWidget, information); } @@ -1803,7 +1745,6 @@ empathy_contact_widget_new (EmpathyContact *contact, "libempathy-gtk"); gui = empathy_builder_get_file (filename, "vbox_contact_widget", &information->vbox_contact_widget, - "hbox_contact", &information->hbox_contact, "hbox_presence", &information->hbox_presence, "label_alias", &information->label_alias, "image_state", &information->image_state, @@ -1822,6 +1763,7 @@ empathy_contact_widget_new (EmpathyContact *contact, "vbox_client", &information->vbox_client, "grid_client", &information->grid_client, "hbox_client_requested", &information->hbox_client_requested, + "label_details", &information->label_details, NULL); g_free (filename); @@ -1834,8 +1776,6 @@ empathy_contact_widget_new (EmpathyContact *contact, "EmpathyContactWidget", information); - information->manager = empathy_contact_manager_dup_singleton (); - /* Create widgets */ contact_widget_contact_setup (information); contact_widget_details_setup (information); diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h index fb684a41..2533248b 100644 --- a/libempathy-gtk/empathy-contact-widget.h +++ b/libempathy-gtk/empathy-contact-widget.h @@ -61,9 +61,9 @@ typedef enum EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP = 1 << 5, EMPATHY_CONTACT_WIDGET_SHOW_LOCATION = 1 << 6, EMPATHY_CONTACT_WIDGET_NO_SET_ALIAS = 1 << 7, - EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE = 1 << 8, - EMPATHY_CONTACT_WIDGET_SHOW_DETAILS = 1 << 9, - EMPATHY_CONTACT_WIDGET_EDIT_DETAILS = 1 << 10, + EMPATHY_CONTACT_WIDGET_SHOW_DETAILS = 1 << 8, + EMPATHY_CONTACT_WIDGET_EDIT_DETAILS = 1 << 9, + EMPATHY_CONTACT_WIDGET_NO_STATUS = 1 << 10, } EmpathyContactWidgetFlags; GtkWidget * empathy_contact_widget_new (EmpathyContact *contact, diff --git a/libempathy-gtk/empathy-contact-widget.ui b/libempathy-gtk/empathy-contact-widget.ui index 96e9275e..a8d9fbe7 100644 --- a/libempathy-gtk/empathy-contact-widget.ui +++ b/libempathy-gtk/empathy-contact-widget.ui @@ -5,104 +5,75 @@ 6 - + True - 6 + 6 + 6 + + + True + 0 + Account: + + + + - + + True + 0 + Identifier: + + + 1 + 0 + + + + + True + 0 + Alias: + + + 2 + 0 + + + + True 6 - - True - 6 - 6 - - - True - 0 - Account: - - - - - - - True - 0 - Identifier: - - - 1 - 0 - - - - - True - 0 - Alias: - - - 2 - 0 - - - - - - - - - - - + + gtk-missing-image + False + False 0 - - - True - 6 - - - gtk-missing-image - - - False - False - 0 - - - - - - - - 1 - - - 0 + 3 + 0 - True - - - - - - False - False - 1 - - - + True + + + + + + 0 + 2 + 3 + + + 0 @@ -173,7 +144,7 @@ 6 - + True 0 Contact Details diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c index 695d1ee3..b995297b 100644 --- a/libempathy-gtk/empathy-contactinfo-utils.c +++ b/libempathy-gtk/empathy-contactinfo-utils.c @@ -314,7 +314,7 @@ empathy_contact_info_create_channel_list_label (TpAccount *account, g_string_append (label_markup, ", "); g_string_append_printf (label_markup, "%s", - escaped, channel_name); + escaped, escaped); g_free (escaped); } diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c index fa092b6d..5d87ef4f 100644 --- a/libempathy-gtk/empathy-groups-widget.c +++ b/libempathy-gtk/empathy-groups-widget.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include "empathy-groups-widget.h" #include "empathy-ui-utils.h" @@ -150,7 +150,7 @@ static void populate_data (EmpathyGroupsWidget *self) { EmpathyGroupsWidgetPriv *priv = GET_PRIV (self); - EmpathyContactManager *manager; + EmpathyConnectionAggregator *aggregator; GtkTreeIter iter; GeeSet *member_groups; GList *all_groups, *l; @@ -158,12 +158,12 @@ populate_data (EmpathyGroupsWidget *self) /* Remove the old groups */ gtk_list_store_clear (priv->group_store); - /* FIXME: We have to get the whole group list from EmpathyContactManager, as - * libfolks hasn't grown API to get the whole group list yet. (bgo#627398) */ - manager = empathy_contact_manager_dup_singleton (); - all_groups = empathy_contact_list_get_all_groups ( - EMPATHY_CONTACT_LIST (manager)); - g_object_unref (manager); + /* FIXME: We have to get the whole group list from + * EmpathyConnectionAggregator, as libfolks hasn't grown API to get the whole + * group list yet. (bgo#627398) */ + aggregator = empathy_connection_aggregator_dup_singleton (); + all_groups = empathy_connection_aggregator_get_all_groups (aggregator); + g_object_unref (aggregator); /* Get the list of groups that this #FolksGroupDetails is currently in */ member_groups = folks_group_details_get_groups (priv->group_details); @@ -182,8 +182,6 @@ populate_data (EmpathyGroupsWidget *self) COL_EDITABLE, TRUE, COL_ENABLED, enabled, -1); - - g_free (l->data); } g_list_free (all_groups); diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index ed566329..0aca78fd 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -33,7 +33,6 @@ #include #include -#include #include "empathy-individual-dialogs.h" #include "empathy-contact-widget.h" diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c deleted file mode 100644 index 42bfb205..00000000 --- a/libempathy-gtk/empathy-individual-information-dialog.c +++ /dev/null @@ -1,318 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2007-2010 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - * Philip Withnall - * Travis Reitter - */ - -#include - -#include -#include - -#include -#include - -#include -#include -#include - -#include -#include - -#include "empathy-individual-information-dialog.h" -#include "empathy-individual-widget.h" -#include "empathy-ui-utils.h" - -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog) -typedef struct { - FolksIndividual *individual; - GtkWidget *individual_widget; /* child widget */ - GtkWidget *label; /* child widget */ -} EmpathyIndividualInformationDialogPriv; - -enum { - PROP_0, - PROP_INDIVIDUAL, -}; - -/* Info dialogs currently open. - * Each dialog contains a referenced pointer to its Individual */ -static GList *information_dialogs = NULL; - -static void individual_information_dialog_set_individual ( - EmpathyIndividualInformationDialog *dialog, - FolksIndividual *individual); - -G_DEFINE_TYPE (EmpathyIndividualInformationDialog, - empathy_individual_information_dialog, GTK_TYPE_DIALOG); - -static void -individual_dialogs_response_cb (GtkDialog *dialog, - gint response, - GList **dialogs) -{ - *dialogs = g_list_remove (*dialogs, dialog); - gtk_widget_destroy (GTK_WIDGET (dialog)); -} - -static gint -individual_dialogs_find (GObject *object, - FolksIndividual *individual) -{ - EmpathyIndividualInformationDialogPriv *priv = GET_PRIV (object); - - return individual != priv->individual; -} - -void -empathy_individual_information_dialog_show (FolksIndividual *individual, - GtkWindow *parent) -{ - GtkWidget *dialog; - GList *l; - - g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual)); - g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent)); - - l = g_list_find_custom (information_dialogs, individual, - (GCompareFunc) individual_dialogs_find); - - if (l != NULL) - { - gtk_window_present (GTK_WINDOW (l->data)); - return; - } - - /* Create dialog */ - dialog = g_object_new (EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, - "individual", individual, - NULL); - - information_dialogs = g_list_prepend (information_dialogs, dialog); - gtk_widget_show (dialog); -} - -static void -individual_removed_cb (FolksIndividual *individual, - FolksIndividual *replacement_individual, - EmpathyIndividualInformationDialog *self) -{ - individual_information_dialog_set_individual (self, - replacement_individual); - - /* Destroy the dialogue */ - if (replacement_individual == NULL) - { - individual_dialogs_response_cb (GTK_DIALOG (self), - GTK_RESPONSE_DELETE_EVENT, &information_dialogs); - } -} - -static void -set_label_visibility (EmpathyIndividualInformationDialog *dialog) -{ - EmpathyIndividualInformationDialogPriv *priv = GET_PRIV (dialog); - guint num_personas = 0; - - /* Count how many Telepathy personas we have, to see whether we can - * unlink */ - if (priv->individual != NULL) - { - GeeSet *personas; - GeeIterator *iter; - - personas = folks_individual_get_personas (priv->individual); - iter = gee_iterable_iterator (GEE_ITERABLE (personas)); - while (gee_iterator_next (iter)) - { - FolksPersona *persona = gee_iterator_get (iter); - if (empathy_folks_persona_is_interesting (persona)) - num_personas++; - - g_clear_object (&persona); - } - g_clear_object (&iter); - } - - /* Only make the label visible if we have enough personas */ - gtk_widget_set_visible (priv->label, (num_personas > 1) ? TRUE : FALSE); -} - -static void -individual_information_dialog_set_individual ( - EmpathyIndividualInformationDialog *dialog, - FolksIndividual *individual) -{ - EmpathyIndividualInformationDialogPriv *priv; - - g_return_if_fail (EMPATHY_INDIVIDUAL_INFORMATION_DIALOG (dialog)); - g_return_if_fail (individual == NULL || FOLKS_IS_INDIVIDUAL (individual)); - - priv = GET_PRIV (dialog); - - /* Remove the old Individual */ - if (priv->individual != NULL) - { - g_signal_handlers_disconnect_by_func (priv->individual, - (GCallback) individual_removed_cb, dialog); - } - - tp_clear_object (&priv->individual); - - /* Add the new Individual */ - priv->individual = individual; - - if (individual != NULL) - { - g_object_ref (individual); - g_signal_connect (individual, "removed", - (GCallback) individual_removed_cb, dialog); - - /* Update the UI */ - gtk_window_set_title (GTK_WINDOW (dialog), - folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); - empathy_individual_widget_set_individual ( - EMPATHY_INDIVIDUAL_WIDGET (priv->individual_widget), individual); - set_label_visibility (dialog); - } -} - -static void -individual_information_dialog_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - EmpathyIndividualInformationDialogPriv *priv = GET_PRIV (object); - - switch (param_id) { - case PROP_INDIVIDUAL: - g_value_set_object (value, priv->individual); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - }; -} - -static void -individual_information_dialog_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - EmpathyIndividualInformationDialog *dialog = - EMPATHY_INDIVIDUAL_INFORMATION_DIALOG (object); - - switch (param_id) { - case PROP_INDIVIDUAL: - individual_information_dialog_set_individual (dialog, - FOLKS_INDIVIDUAL (g_value_get_object (value))); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - }; -} - -static void -individual_information_dialog_dispose (GObject *object) -{ - individual_information_dialog_set_individual ( - EMPATHY_INDIVIDUAL_INFORMATION_DIALOG (object), NULL); - - G_OBJECT_CLASS ( - empathy_individual_information_dialog_parent_class)->dispose (object); -} - -static void -empathy_individual_information_dialog_class_init ( - EmpathyIndividualInformationDialogClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->dispose = individual_information_dialog_dispose; - object_class->get_property = individual_information_dialog_get_property; - object_class->set_property = individual_information_dialog_set_property; - - g_object_class_install_property (object_class, - PROP_INDIVIDUAL, - g_param_spec_object ("individual", - "Folks Individual", - "Folks Individual to base the dialog upon", - FOLKS_TYPE_INDIVIDUAL, - G_PARAM_CONSTRUCT | - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS)); - - g_type_class_add_private (object_class, - sizeof (EmpathyIndividualInformationDialogPriv)); -} - -static void -empathy_individual_information_dialog_init ( - EmpathyIndividualInformationDialog *dialog) -{ - GtkWidget *button; - GtkBox *content_area; - gchar *label_string; - EmpathyIndividualInformationDialogPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE ( - dialog, EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, - EmpathyIndividualInformationDialogPriv); - - dialog->priv = priv; - priv->individual = NULL; - - gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); - - content_area = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))); - - /* Translators: the heading at the top of the Information dialogue */ - label_string = g_strdup_printf ("%s", _("Linked Contacts")); - priv->label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (priv->label), label_string); - g_free (label_string); - - gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5); - gtk_misc_set_padding (GTK_MISC (priv->label), 6, 6); - gtk_box_pack_start (content_area, priv->label, FALSE, TRUE, 0); - gtk_widget_show (priv->label); - - /* Individual widget */ - priv->individual_widget = empathy_individual_widget_new (priv->individual, - EMPATHY_INDIVIDUAL_WIDGET_SHOW_LOCATION | - EMPATHY_INDIVIDUAL_WIDGET_SHOW_DETAILS | - EMPATHY_INDIVIDUAL_WIDGET_SHOW_PERSONAS); - gtk_container_set_border_width (GTK_CONTAINER (priv->individual_widget), 6); - gtk_box_pack_start (content_area, priv->individual_widget, TRUE, TRUE, 0); - gtk_widget_show (priv->individual_widget); - - /* Close button */ - button = gtk_button_new_with_label (GTK_STOCK_CLOSE); - gtk_button_set_use_stock (GTK_BUTTON (button), TRUE); - gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, - GTK_RESPONSE_CLOSE); - gtk_widget_set_can_default (button, TRUE); - gtk_window_set_default (GTK_WINDOW (dialog), button); - gtk_widget_show (button); - - g_signal_connect (dialog, "response", - G_CALLBACK (individual_dialogs_response_cb), &information_dialogs); -} diff --git a/libempathy-gtk/empathy-individual-information-dialog.h b/libempathy-gtk/empathy-individual-information-dialog.h deleted file mode 100644 index aad26702..00000000 --- a/libempathy-gtk/empathy-individual-information-dialog.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2010 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Philip Withnall - * Travis Reitter - */ - -#ifndef __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__ -#define __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__ - -#include - -#include - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG (empathy_individual_information_dialog_get_type ()) -#define EMPATHY_INDIVIDUAL_INFORMATION_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, EmpathyIndividualInformationDialog)) -#define EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, EmpathyIndividualInformationDialogClass)) -#define EMPATHY_IS_INDIVIDUAL_INFORMATION_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG)) -#define EMPATHY_IS_INDIVIDUAL_INFORMATION_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG)) -#define EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, EmpathyIndividualInformationDialogClass)) - -typedef struct _EmpathyIndividualInformationDialog EmpathyIndividualInformationDialog; -typedef struct _EmpathyIndividualInformationDialogClass EmpathyIndividualInformationDialogClass; - -struct _EmpathyIndividualInformationDialog { - GtkDialog parent; - - /**/ - gpointer priv; -}; - -struct _EmpathyIndividualInformationDialogClass { - GtkDialogClass parent_class; -}; - -GType empathy_individual_information_dialog_get_type (void) G_GNUC_CONST; - -void empathy_individual_information_dialog_show (FolksIndividual *individual, - GtkWindow *parent); - -G_END_DECLS - -#endif /* __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__ */ diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c deleted file mode 100644 index 7de5e4ad..00000000 --- a/libempathy-gtk/empathy-individual-linker.c +++ /dev/null @@ -1,779 +0,0 @@ -/* - * Copyright (C) 2010 Collabora Ltd. - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * Authors: Philip Withnall - */ - -#include "config.h" - -#include - -#include -#include - -#include - -#include - -#include -#include - -#include "empathy-individual-linker.h" -#include "empathy-individual-store.h" -#include "empathy-individual-store-manager.h" -#include "empathy-individual-view.h" -#include "empathy-individual-widget.h" -#include "empathy-persona-store.h" -#include "empathy-persona-view.h" - -/** - * SECTION:empathy-individual-linker - * @title:EmpathyIndividualLinker - * @short_description: A widget used to link together #FolksIndividuals - * @include: libempathy-gtk/empathy-individual-linker.h - * - * #EmpathyIndividualLinker is a widget which allows selection of several - * #FolksIndividuals to link together to form a single new individual. - * The widget provides a preview of the linked individual. - */ - -/** - * EmpathyIndividualLinker: - * @parent: parent object - * - * Widget which extends #GtkBin to provide a list of #FolksIndividuals - * to link together. - */ - -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualLinker) - -typedef struct { - EmpathyIndividualStore *individual_store; /* owned */ - EmpathyIndividualView *individual_view; /* child widget */ - GtkWidget *preview_widget; /* child widget */ - EmpathyPersonaStore *persona_store; /* owned */ - GtkTreeViewColumn *toggle_column; /* child widget */ - GtkCellRenderer *toggle_renderer; /* child widget */ - GtkWidget *search_widget; /* child widget */ - - FolksIndividual *start_individual; /* owned, allow-none */ - FolksIndividual *new_individual; /* owned, allow-none */ - - /* Stores the Individuals whose Personas have been added to the - * new_individual */ - /* unowned Individual (borrowed from EmpathyIndividualStore) -> bool */ - GHashTable *changed_individuals; -} EmpathyIndividualLinkerPriv; - -enum { - PROP_START_INDIVIDUAL = 1, - PROP_HAS_CHANGED, -}; - -G_DEFINE_TYPE (EmpathyIndividualLinker, empathy_individual_linker, - GTK_TYPE_BOX); - -static void -contact_toggle_cell_data_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - EmpathyIndividualLinker *self) -{ - EmpathyIndividualLinkerPriv *priv; - FolksIndividual *individual; - gboolean is_group, individual_added; - - priv = GET_PRIV (self); - - gtk_tree_model_get (tree_model, iter, - EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, &is_group, - EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual, - -1); - - individual_added = GPOINTER_TO_UINT (g_hash_table_lookup ( - priv->changed_individuals, individual)); - - /* We don't want to show checkboxes next to the group rows. - * All checkboxes should be sensitive except the checkbox for the start - * individual, which should be permanently active and insensitive */ - g_object_set (cell, - "visible", !is_group, - "sensitive", individual != priv->start_individual, - "activatable", individual != priv->start_individual, - "active", individual_added || individual == priv->start_individual, - NULL); - - tp_clear_object (&individual); -} - -static void -update_toggle_renderers (EmpathyIndividualLinker *self) -{ - EmpathyIndividualLinkerPriv *priv = GET_PRIV (self); - - /* Re-setting the cell data func to the same function causes a refresh of the - * entire column, ensuring that each toggle button is correctly active or - * inactive. This is necessary because one Individual might appear multiple - * times in the list (in different groups), so toggling one instance of the - * Individual should toggle all of them. */ - gtk_tree_view_column_set_cell_data_func (priv->toggle_column, - priv->toggle_renderer, - (GtkTreeCellDataFunc) contact_toggle_cell_data_func, self, NULL); -} - -static void -link_individual (EmpathyIndividualLinker *self, - FolksIndividual *individual) -{ - EmpathyIndividualLinkerPriv *priv = GET_PRIV (self); - GeeSet *old_personas, *new_personas; - GeeHashSet *final_personas; - gboolean personas_changed; - - /* Add the individual to the link */ - g_hash_table_insert (priv->changed_individuals, individual, - GUINT_TO_POINTER (TRUE)); - - /* Add personas which are in @individual to priv->new_individual, adding them - * to the set of personas. */ - old_personas = folks_individual_get_personas (individual); - new_personas = folks_individual_get_personas (priv->new_individual); - final_personas = gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, - g_object_unref, g_direct_hash, g_direct_equal); - gee_collection_add_all (GEE_COLLECTION (final_personas), - GEE_COLLECTION (old_personas)); - personas_changed = gee_collection_add_all (GEE_COLLECTION (final_personas), - GEE_COLLECTION (new_personas)); - - /* avoid updating all values in the Individual if the set of personas doesn't - * actually change */ - if (personas_changed) - { - folks_individual_set_personas (priv->new_individual, - GEE_SET (final_personas)); - } - - g_clear_object (&final_personas); - - /* Update the toggle renderers, so that if this Individual is listed in - * another group in the EmpathyIndividualView, the toggle button for that - * group is updated. */ - update_toggle_renderers (self); - - g_object_notify (G_OBJECT (self), "has-changed"); -} - -static void -unlink_individual (EmpathyIndividualLinker *self, - FolksIndividual *individual) -{ - EmpathyIndividualLinkerPriv *priv = GET_PRIV (self); - GeeSet *removed_personas, *old_personas; - GeeHashSet *final_personas; - gboolean personas_changed; - - /* Remove the individual from the link */ - g_hash_table_remove (priv->changed_individuals, individual); - - /* Remove personas which are in @individual from priv->new_individual. */ - old_personas = folks_individual_get_personas (priv->new_individual); - removed_personas = folks_individual_get_personas (individual); - - final_personas = gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, - g_object_unref, g_direct_hash, g_direct_equal); - gee_collection_add_all (GEE_COLLECTION (final_personas), - GEE_COLLECTION (old_personas)); - personas_changed = gee_collection_remove_all (GEE_COLLECTION (final_personas), - GEE_COLLECTION (removed_personas)); - - if (personas_changed) - { - folks_individual_set_personas (priv->new_individual, - GEE_SET (final_personas)); - } - - g_clear_object (&final_personas); - - /* Update the toggle renderers, so that if this Individual is listed in - * another group in the EmpathyIndividualView, the toggle button for that - * group is updated. */ - update_toggle_renderers (self); - - g_object_notify (G_OBJECT (self), "has-changed"); -} - -static void -toggle_individual_row (EmpathyIndividualLinker *self, - GtkTreePath *path) -{ - EmpathyIndividualLinkerPriv *priv = GET_PRIV (self); - FolksIndividual *individual; - GtkTreeIter iter; - GtkTreeModel *tree_model; - gboolean individual_added; - - tree_model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->individual_view)); - - gtk_tree_model_get_iter (tree_model, &iter, path); - gtk_tree_model_get (tree_model, &iter, - EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual, - -1); - - if (individual == NULL) - return; - - individual_added = GPOINTER_TO_UINT (g_hash_table_lookup ( - priv->changed_individuals, individual)); - - /* Toggle the Individual's linked status */ - if (individual_added) - unlink_individual (self, individual); - else - link_individual (self, individual); - - g_object_unref (individual); -} - -static void -row_activated_cb (EmpathyIndividualView *view, - GtkTreePath *path, - GtkTreeViewColumn *column, - EmpathyIndividualLinker *self) -{ - toggle_individual_row (self, path); -} - -static void -row_toggled_cb (GtkCellRendererToggle *cell_renderer, - const gchar *path, - EmpathyIndividualLinker *self) -{ - GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); - toggle_individual_row (self, tree_path); - gtk_tree_path_free (tree_path); -} - -static gboolean -individual_view_drag_motion_cb (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - guint time_) -{ - EmpathyIndividualView *view = EMPATHY_INDIVIDUAL_VIEW (widget); - GdkAtom target; - - target = gtk_drag_dest_find_target (GTK_WIDGET (view), context, NULL); - - if (target == gdk_atom_intern_static_string ("text/x-persona-id")) - { - GtkTreePath *path; - - /* FIXME: It doesn't make sense for us to highlight a specific row or - * position to drop a Persona in, so just highlight the entire widget. - * Since I can't find a way to do this, just highlight the first possible - * position in the tree. */ - gdk_drag_status (context, gdk_drag_context_get_suggested_action (context), - time_); - - path = gtk_tree_path_new_first (); - gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (view), path, - GTK_TREE_VIEW_DROP_BEFORE); - gtk_tree_path_free (path); - - return TRUE; - } - - /* Unknown or unhandled drag target */ - gdk_drag_status (context, GDK_ACTION_DEFAULT, time_); - gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (view), NULL, 0); - - return FALSE; -} - -static gboolean -individual_view_drag_persona_received_cb (EmpathyIndividualView *view, - GdkDragAction action, - FolksPersona *persona, - FolksIndividual *individual, - EmpathyIndividualLinker *self) -{ - EmpathyIndividualLinkerPriv *priv = GET_PRIV (self); - - /* A Persona has been dragged onto the EmpathyIndividualView (from the - * EmpathyPersonaView), so we try to remove the Individual which contains - * the Persona from the link. */ - if (individual != priv->start_individual) - { - unlink_individual (self, individual); - return TRUE; - } - - return FALSE; -} - -static gboolean -persona_view_drag_individual_received_cb (EmpathyPersonaView *view, - GdkDragAction action, - FolksIndividual *individual, - EmpathyIndividualLinker *self) -{ - /* An Individual has been dragged onto the EmpathyPersonaView (from the - * EmpathyIndividualView), so we try to add the Individual to the link. */ - link_individual (self, individual); - - return TRUE; -} - -static void -set_up (EmpathyIndividualLinker *self) -{ - EmpathyIndividualLinkerPriv *priv; - EmpathyIndividualManager *individual_manager; - GtkWidget *top_vbox; - GtkPaned *paned; - GtkWidget *label, *scrolled_window; - GtkBox *vbox; - EmpathyPersonaView *persona_view; - gchar *tmp; - GtkWidget *alignment; - - priv = GET_PRIV (self); - - top_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - - /* Layout panes */ - - paned = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_HORIZONTAL)); - - /* Left column heading */ - alignment = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 6); - gtk_widget_show (alignment); - - vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6)); - label = gtk_label_new (NULL); - tmp = g_strdup_printf ("%s", _("Select contacts to link")); - gtk_label_set_markup (GTK_LABEL (label), tmp); - g_free (tmp); - gtk_box_pack_start (vbox, label, FALSE, TRUE, 0); - gtk_widget_show (label); - - /* Individual selector */ - individual_manager = empathy_individual_manager_dup_singleton (); - priv->individual_store = EMPATHY_INDIVIDUAL_STORE ( - empathy_individual_store_manager_new (individual_manager)); - g_object_unref (individual_manager); - - empathy_individual_store_set_show_protocols (priv->individual_store, FALSE); - - priv->individual_view = empathy_individual_view_new (priv->individual_store, - EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DRAG | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DROP | - EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP, - EMPATHY_INDIVIDUAL_FEATURE_NONE); - empathy_individual_view_set_show_offline (priv->individual_view, TRUE); - empathy_individual_view_set_show_untrusted (priv->individual_view, FALSE); - - g_signal_connect (priv->individual_view, "row-activated", - (GCallback) row_activated_cb, self); - g_signal_connect (priv->individual_view, "drag-motion", - (GCallback) individual_view_drag_motion_cb, self); - g_signal_connect (priv->individual_view, "drag-persona-received", - (GCallback) individual_view_drag_persona_received_cb, self); - - /* Add a checkbox column to the selector */ - priv->toggle_renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect (priv->toggle_renderer, "toggled", - (GCallback) row_toggled_cb, self); - - priv->toggle_column = gtk_tree_view_column_new (); - gtk_tree_view_column_pack_start (priv->toggle_column, priv->toggle_renderer, - FALSE); - gtk_tree_view_column_set_cell_data_func (priv->toggle_column, - priv->toggle_renderer, - (GtkTreeCellDataFunc) contact_toggle_cell_data_func, self, NULL); - - gtk_tree_view_insert_column (GTK_TREE_VIEW (priv->individual_view), - priv->toggle_column, 0); - - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_SHADOW_IN); - gtk_container_add (GTK_CONTAINER (scrolled_window), - GTK_WIDGET (priv->individual_view)); - gtk_widget_show (GTK_WIDGET (priv->individual_view)); - - gtk_box_pack_start (vbox, scrolled_window, TRUE, TRUE, 0); - gtk_widget_show (scrolled_window); - - /* Live search */ - priv->search_widget = empathy_live_search_new ( - GTK_WIDGET (priv->individual_view)); - empathy_individual_view_set_live_search (priv->individual_view, - EMPATHY_LIVE_SEARCH (priv->search_widget)); - - gtk_box_pack_end (vbox, priv->search_widget, FALSE, TRUE, 0); - - gtk_container_add (GTK_CONTAINER (alignment), GTK_WIDGET (vbox)); - gtk_paned_pack1 (paned, alignment, TRUE, FALSE); - gtk_widget_show (GTK_WIDGET (vbox)); - - /* Right column heading */ - alignment = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 6, 0); - gtk_widget_show (alignment); - - vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6)); - label = gtk_label_new (NULL); - tmp = g_strdup_printf ("%s", _("New contact preview")); - gtk_label_set_markup (GTK_LABEL (label), tmp); - g_free (tmp); - gtk_box_pack_start (vbox, label, FALSE, TRUE, 0); - gtk_widget_show (label); - - /* New individual preview */ - priv->preview_widget = empathy_individual_widget_new (priv->new_individual, - EMPATHY_INDIVIDUAL_WIDGET_SHOW_DETAILS); - gtk_box_pack_start (vbox, priv->preview_widget, FALSE, TRUE, 0); - gtk_widget_show (priv->preview_widget); - - /* Persona list */ - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_SHADOW_IN); - - priv->persona_store = empathy_persona_store_new (priv->new_individual); - empathy_persona_store_set_show_protocols (priv->persona_store, TRUE); - persona_view = empathy_persona_view_new (priv->persona_store, - EMPATHY_PERSONA_VIEW_FEATURE_ALL); - empathy_persona_view_set_show_offline (persona_view, TRUE); - - g_signal_connect (persona_view, "drag-individual-received", - (GCallback) persona_view_drag_individual_received_cb, self); - - gtk_container_add (GTK_CONTAINER (scrolled_window), - GTK_WIDGET (persona_view)); - gtk_widget_show (GTK_WIDGET (persona_view)); - - gtk_box_pack_start (vbox, scrolled_window, TRUE, TRUE, 0); - gtk_widget_show (scrolled_window); - - gtk_container_add (GTK_CONTAINER (alignment), GTK_WIDGET (vbox)); - gtk_paned_pack2 (paned, alignment, TRUE, FALSE); - gtk_widget_show (GTK_WIDGET (vbox)); - - gtk_widget_show (GTK_WIDGET (paned)); - - /* Footer label */ - label = gtk_label_new (NULL); - tmp = g_strdup_printf ("%s", - _("Contacts selected in the list on the left will be linked together.")); - gtk_label_set_markup (GTK_LABEL (label), tmp); - g_free (tmp); - gtk_widget_show (label); - - gtk_box_pack_start (GTK_BOX (top_vbox), GTK_WIDGET (paned), TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, TRUE, 0); - - /* Add the main vbox to the bin */ - gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (top_vbox), TRUE, TRUE, 0); - gtk_widget_show (GTK_WIDGET (top_vbox)); -} - -static void -empathy_individual_linker_init (EmpathyIndividualLinker *self) -{ - EmpathyIndividualLinkerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - EMPATHY_TYPE_INDIVIDUAL_LINKER, EmpathyIndividualLinkerPriv); - - self->priv = priv; - - priv->changed_individuals = g_hash_table_new (NULL, NULL); - - set_up (self); -} - -static void -get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - EmpathyIndividualLinkerPriv *priv; - - priv = GET_PRIV (object); - - switch (param_id) - { - case PROP_START_INDIVIDUAL: - g_value_set_object (value, priv->start_individual); - break; - case PROP_HAS_CHANGED: - g_value_set_boolean (value, empathy_individual_linker_get_has_changed ( - EMPATHY_INDIVIDUAL_LINKER (object))); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (param_id) - { - case PROP_START_INDIVIDUAL: - empathy_individual_linker_set_start_individual ( - EMPATHY_INDIVIDUAL_LINKER (object), g_value_get_object (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -dispose (GObject *object) -{ - EmpathyIndividualLinkerPriv *priv = GET_PRIV (object); - - tp_clear_object (&priv->individual_store); - tp_clear_object (&priv->persona_store); - tp_clear_object (&priv->start_individual); - tp_clear_object (&priv->new_individual); - - G_OBJECT_CLASS (empathy_individual_linker_parent_class)->dispose (object); -} - -static void -finalize (GObject *object) -{ - EmpathyIndividualLinkerPriv *priv = GET_PRIV (object); - - g_hash_table_unref (priv->changed_individuals); - - G_OBJECT_CLASS (empathy_individual_linker_parent_class)->finalize (object); -} - -static void -empathy_individual_linker_class_init (EmpathyIndividualLinkerClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->get_property = get_property; - object_class->set_property = set_property; - object_class->dispose = dispose; - object_class->finalize = finalize; - - /** - * EmpathyIndividualLinker:start-individual: - * - * The #FolksIndividual to link other individuals to. This individual is - * selected by default in the list of individuals, and cannot be unselected. - * This ensures that empathy_individual_linker_get_linked_personas() will - * always return at least one persona to link. - */ - g_object_class_install_property (object_class, PROP_START_INDIVIDUAL, - g_param_spec_object ("start-individual", - "Start Individual", - "The #FolksIndividual to link other individuals to.", - FOLKS_TYPE_INDIVIDUAL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - * EmpathyIndividualLinker:has-changed: - * - * Whether #FolksIndividuals have been added to or removed from - * the linked individual currently displayed in the widget. - * - * This will be %FALSE after the widget is initialised, and set to %TRUE when - * an individual is checked in the individual view on the left of the widget. - * If the individual is later unchecked, this will be reset to %FALSE, etc. - */ - g_object_class_install_property (object_class, PROP_HAS_CHANGED, - g_param_spec_boolean ("has-changed", - "Changed?", - "Whether individuals have been added to or removed from the linked " - "individual currently displayed in the widget.", - FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - - g_type_class_add_private (object_class, sizeof (EmpathyIndividualLinkerPriv)); -} - -/** - * empathy_individual_linker_new: - * @start_individual: (allow-none): the #FolksIndividual to link to, or %NULL - * - * Creates a new #EmpathyIndividualLinker. - * - * Return value: a new #EmpathyIndividualLinker - */ -GtkWidget * -empathy_individual_linker_new (FolksIndividual *start_individual) -{ - g_return_val_if_fail (start_individual == NULL || - FOLKS_IS_INDIVIDUAL (start_individual), NULL); - - return g_object_new (EMPATHY_TYPE_INDIVIDUAL_LINKER, - "start-individual", start_individual, - NULL); -} - -/** - * empathy_individual_linker_get_start_individual: - * @self: an #EmpathyIndividualLinker - * - * Get the value of #EmpathyIndividualLinker:start-individual. - * - * Return value: (transfer none): the start individual for linking, or %NULL - */ -FolksIndividual * -empathy_individual_linker_get_start_individual (EmpathyIndividualLinker *self) -{ - g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_LINKER (self), NULL); - - return GET_PRIV (self)->start_individual; -} - -/** - * empathy_individual_linker_set_start_individual: - * @self: an #EmpathyIndividualLinker - * @individual: (allow-none): the start individual, or %NULL - * - * Set the value of #EmpathyIndividualLinker:start-individual to @individual. - */ -void -empathy_individual_linker_set_start_individual (EmpathyIndividualLinker *self, - FolksIndividual *individual) -{ - EmpathyIndividualLinkerPriv *priv; - - g_return_if_fail (EMPATHY_IS_INDIVIDUAL_LINKER (self)); - g_return_if_fail (individual == NULL || FOLKS_IS_INDIVIDUAL (individual)); - - priv = GET_PRIV (self); - - tp_clear_object (&priv->start_individual); - tp_clear_object (&priv->new_individual); - g_hash_table_remove_all (priv->changed_individuals); - - if (individual != NULL) - { - priv->start_individual = g_object_ref (individual); - priv->new_individual = folks_individual_new ( - folks_individual_get_personas (individual)); - empathy_individual_view_set_store (priv->individual_view, - priv->individual_store); - } - else - { - priv->start_individual = NULL; - priv->new_individual = NULL; - - /* We only display Individuals in the individual view if we have a - * new_individual to link them into */ - empathy_individual_view_set_store (priv->individual_view, NULL); - } - - empathy_individual_widget_set_individual ( - EMPATHY_INDIVIDUAL_WIDGET (priv->preview_widget), priv->new_individual); - empathy_persona_store_set_individual (priv->persona_store, - priv->new_individual); - - g_object_freeze_notify (G_OBJECT (self)); - g_object_notify (G_OBJECT (self), "start-individual"); - g_object_notify (G_OBJECT (self), "has-changed"); - g_object_thaw_notify (G_OBJECT (self)); -} - -/** - * empathy_individual_linker_get_linked_personas: - * @self: an #EmpathyIndividualLinker - * - * Return a list of the #FolksPersonas which comprise the linked - * individual currently displayed in the widget. - * - * The return value is guaranteed to contain at least one element. - * - * Return value: (transfer none) (element-type Folks.Persona): a set of - * #FolksPersonas to link together - */ -GeeSet * -empathy_individual_linker_get_linked_personas (EmpathyIndividualLinker *self) -{ - EmpathyIndividualLinkerPriv *priv; - GeeSet *personas; - - g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_LINKER (self), NULL); - - priv = GET_PRIV (self); - - if (priv->new_individual == NULL) - return NULL; - - personas = folks_individual_get_personas (priv->new_individual); - g_assert (personas != NULL); - return personas; -} - -/** - * empathy_individual_linker_get_has_changed: - * @self: an #EmpathyIndividualLinker - * - * Return whether #FolksIndividuals have been added to or removed from - * the linked individual currently displayed in the widget. - * - * This will be %FALSE after the widget is initialised, and set to %TRUE when - * an individual is checked in the individual view on the left of the widget. - * If the individual is later unchecked, this will be reset to %FALSE, etc. - * - * Return value: %TRUE if the linked individual has been changed, %FALSE - * otherwise - */ -gboolean -empathy_individual_linker_get_has_changed (EmpathyIndividualLinker *self) -{ - EmpathyIndividualLinkerPriv *priv; - - g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_LINKER (self), FALSE); - - priv = GET_PRIV (self); - - return (g_hash_table_size (priv->changed_individuals) > 0) ? TRUE : FALSE; -} - -void -empathy_individual_linker_set_search_text (EmpathyIndividualLinker *self, - const gchar *search_text) -{ - g_return_if_fail (EMPATHY_IS_INDIVIDUAL_LINKER (self)); - - empathy_live_search_set_text ( - EMPATHY_LIVE_SEARCH (GET_PRIV (self)->search_widget), search_text); -} diff --git a/libempathy-gtk/empathy-individual-linker.h b/libempathy-gtk/empathy-individual-linker.h deleted file mode 100644 index 3079fa09..00000000 --- a/libempathy-gtk/empathy-individual-linker.h +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2010 Collabora Ltd. - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * Authors: Philip Withnall - */ - -#ifndef __EMPATHY_INDIVIDUAL_LINKER_H__ -#define __EMPATHY_INDIVIDUAL_LINKER_H__ - -#include - -#include - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_INDIVIDUAL_LINKER (empathy_individual_linker_get_type ()) -#define EMPATHY_INDIVIDUAL_LINKER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \ - EMPATHY_TYPE_INDIVIDUAL_LINKER, EmpathyIndividualLinker)) -#define EMPATHY_INDIVIDUAL_LINKER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), \ - EMPATHY_TYPE_INDIVIDUAL_LINKER, EmpathyIndividualLinkerClass)) -#define EMPATHY_IS_INDIVIDUAL_LINKER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \ - EMPATHY_TYPE_INDIVIDUAL_LINKER)) -#define EMPATHY_IS_INDIVIDUAL_LINKER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \ - EMPATHY_TYPE_INDIVIDUAL_LINKER)) -#define EMPATHY_INDIVIDUAL_LINKER_GET_CLASS(o) ( \ - G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDIVIDUAL_LINKER, \ - EmpathyIndividualLinkerClass)) - -typedef struct { - GtkBox parent; - - /**/ - gpointer priv; -} EmpathyIndividualLinker; - -typedef struct { - GtkBoxClass parent_class; -} EmpathyIndividualLinkerClass; - -GType empathy_individual_linker_get_type (void) G_GNUC_CONST; -GtkWidget * empathy_individual_linker_new (FolksIndividual *start_individual); - -FolksIndividual * empathy_individual_linker_get_start_individual ( - EmpathyIndividualLinker *self); -void empathy_individual_linker_set_start_individual ( - EmpathyIndividualLinker *self, - FolksIndividual *individual); - -GeeSet * empathy_individual_linker_get_linked_personas ( - EmpathyIndividualLinker *self); - -gboolean empathy_individual_linker_get_has_changed ( - EmpathyIndividualLinker *self); - -void empathy_individual_linker_set_search_text (EmpathyIndividualLinker *self, - const gchar *search_text); - -G_END_DECLS - -#endif /* __EMPATHY_INDIVIDUAL_LINKER_H__ */ diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index e19fde3d..7b8da52d 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -26,6 +26,8 @@ #include #include +#include + #include #include @@ -37,6 +39,7 @@ #include #include #include +#include #include "empathy-account-selector-dialog.h" #include "empathy-individual-menu.h" @@ -44,11 +47,10 @@ #include "empathy-log-window.h" #include "empathy-contact-dialogs.h" #include "empathy-gtk-enum-types.h" +#include "empathy-individual-dialogs.h" #include "empathy-individual-edit-dialog.h" -#include "empathy-individual-information-dialog.h" #include "empathy-ui-utils.h" #include "empathy-share-my-desktop.h" -#include "empathy-linking-dialog.h" #include "empathy-call-utils.h" #include "empathy-individual-store-channel.h" @@ -60,7 +62,7 @@ typedef struct { FolksIndividual *individual; /* owned */ EmpathyIndividualFeatureFlags features; - EmpathyIndividualStore *store; + EmpathyIndividualStore *store; /* may be NULL */ } EmpathyIndividualMenuPriv; enum { @@ -69,15 +71,33 @@ enum { PROP_STORE, }; -enum { - SIGNAL_LINK_CONTACTS_ACTIVATED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL]; - G_DEFINE_TYPE (EmpathyIndividualMenu, empathy_individual_menu, GTK_TYPE_MENU); +static GtkWidget * empathy_individual_chat_menu_item_new ( + FolksIndividual *individual); +static GtkWidget * empathy_individual_sms_menu_item_new ( + FolksIndividual *individual); +static GtkWidget * empathy_individual_log_menu_item_new ( + FolksIndividual *individual); +static GtkWidget * empathy_individual_info_menu_item_new ( + FolksIndividual *individual); +static GtkWidget * empathy_individual_edit_menu_item_new ( + FolksIndividual *individual); +static GtkWidget * empathy_individual_invite_menu_item_new ( + FolksIndividual *individual, + EmpathyContact *contact); +static GtkWidget * empathy_individual_file_transfer_menu_item_new ( + FolksIndividual *individual); +static GtkWidget * empathy_individual_share_my_desktop_menu_item_new ( + FolksIndividual *individual); +static GtkWidget * empathy_individual_favourite_menu_item_new ( + FolksIndividual *individual); +static GtkWidget * empathy_individual_add_menu_item_new ( + EmpathyIndividualMenu *self, + FolksIndividual *individual); +static GtkWidget * empathy_individiual_block_menu_item_new ( + FolksIndividual *individual); + static void individual_menu_add_personas (GtkMenuShell *menu, FolksIndividual *individual, @@ -117,7 +137,6 @@ individual_menu_add_personas (GtkMenuShell *menu, gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show (item); - personas = folks_individual_get_personas (individual); for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter)) { GtkWidget *image; @@ -130,6 +149,8 @@ individual_menu_add_personas (GtkMenuShell *menu, FolksPersonaStore *store; const gchar *account; GtkWidget *action; + /* Individual containing only persona */ + FolksIndividual *single_individual; if (!empathy_folks_persona_is_interesting (FOLKS_PERSONA (persona))) goto while_finish; @@ -139,6 +160,8 @@ individual_menu_add_personas (GtkMenuShell *menu, goto while_finish; contact = empathy_contact_dup_from_tp_contact (tp_contact); + single_individual = empathy_create_individual_from_tp_contact ( + tp_contact); store = folks_persona_get_store (FOLKS_PERSONA (persona)); account = folks_persona_store_get_display_name (store); @@ -162,7 +185,7 @@ individual_menu_add_personas (GtkMenuShell *menu, /* Chat */ if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT) { - action = empathy_individual_chat_menu_item_new (NULL, contact); + action = empathy_individual_chat_menu_item_new (single_individual); gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action); gtk_widget_show (action); } @@ -170,7 +193,7 @@ individual_menu_add_personas (GtkMenuShell *menu, /* SMS */ if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS) { - action = empathy_individual_sms_menu_item_new (NULL, contact); + action = empathy_individual_sms_menu_item_new (single_individual); gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action); gtk_widget_show (action); } @@ -178,12 +201,14 @@ individual_menu_add_personas (GtkMenuShell *menu, if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL) { /* Audio Call */ - action = empathy_individual_audio_call_menu_item_new (NULL, contact); + action = empathy_individual_audio_call_menu_item_new ( + single_individual); gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action); gtk_widget_show (action); /* Video Call */ - action = empathy_individual_video_call_menu_item_new (NULL, contact); + action = empathy_individual_video_call_menu_item_new ( + single_individual); gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action); gtk_widget_show (action); } @@ -191,7 +216,7 @@ individual_menu_add_personas (GtkMenuShell *menu, /* Log */ if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG) { - action = empathy_individual_log_menu_item_new (NULL, contact); + action = empathy_individual_log_menu_item_new (single_individual); gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action); gtk_widget_show (action); } @@ -202,21 +227,37 @@ individual_menu_add_personas (GtkMenuShell *menu, gtk_widget_show (action); /* File transfer */ - action = empathy_individual_file_transfer_menu_item_new (NULL, contact); + action = empathy_individual_file_transfer_menu_item_new ( + single_individual); gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action); gtk_widget_show (action); /* Share my desktop */ - action = empathy_individual_share_my_desktop_menu_item_new (NULL, - contact); + action = empathy_individual_share_my_desktop_menu_item_new ( + single_individual); gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action); gtk_widget_show (action); + /* Block */ + if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK && + (item = empathy_individiual_block_menu_item_new (single_individual)) + != NULL) { + GtkWidget *sep; + + sep = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), sep); + gtk_widget_show (sep); + + gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), item); + gtk_widget_show (item); + } + gtk_menu_shell_append (GTK_MENU_SHELL (menu), contact_item); gtk_widget_show (contact_item); g_free (label); g_object_unref (contact); + g_object_unref (single_individual); while_finish: g_clear_object (&persona); @@ -225,16 +266,6 @@ while_finish: g_clear_object (&iter); } -static void -individual_link_menu_item_activate_cb (EmpathyIndividualMenu *self) -{ - EmpathyIndividualMenuPriv *priv = GET_PRIV (self); - GtkWidget *dialog; - - dialog = empathy_linking_dialog_show (priv->individual, NULL); - g_signal_emit (self, signals[SIGNAL_LINK_CONTACTS_ACTIVATED], 0, dialog); -} - static void empathy_individual_menu_init (EmpathyIndividualMenu *self) { @@ -443,6 +474,210 @@ add_phone_numbers (EmpathyIndividualMenu *self) } } +/* return a list of TpContact supporting the blocking iface */ +static GList * +get_contacts_supporting_blocking (FolksIndividual *individual) +{ + GeeSet *personas; + GeeIterator *iter; + GList *result = NULL; + + personas = folks_individual_get_personas (individual); + + iter = gee_iterable_iterator (GEE_ITERABLE (personas)); + while (gee_iterator_next (iter)) + { + TpfPersona *persona = gee_iterator_get (iter); + TpContact *contact; + TpConnection *conn; + + if (!TPF_IS_PERSONA (persona)) + continue; + + contact = tpf_persona_get_contact (persona); + if (contact == NULL) + continue; + + conn = tp_contact_get_connection (contact); + + if (tp_proxy_has_interface_by_id (conn, + TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING)) + result = g_list_prepend (result, contact); + } + + g_clear_object (&iter); + + return result; +} + +typedef struct +{ + gboolean blocked; + GtkWidget *parent; +} GotAvatarCtx; + +static GotAvatarCtx * +got_avatar_ctx_new (gboolean blocked, + GtkWidget *parent) +{ + GotAvatarCtx *ctx = g_slice_new0 (GotAvatarCtx); + + ctx->blocked = blocked; + ctx->parent = parent != NULL ? g_object_ref (parent) : NULL; + return ctx; +} + +static void +got_avatar_ctx_free (GotAvatarCtx *ctx) +{ + g_clear_object (&ctx->parent); + g_slice_free (GotAvatarCtx, ctx); +} + +static void +got_avatar (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + FolksIndividual *individual = FOLKS_INDIVIDUAL (source_object); + GotAvatarCtx *ctx = user_data; + GdkPixbuf *avatar; + GError *error = NULL; + gboolean abusive = FALSE; + EmpathyIndividualManager *manager; + + avatar = empathy_pixbuf_avatar_from_individual_scaled_finish (individual, + result, &error); + + if (error != NULL) + { + DEBUG ("Could not get avatar: %s", error->message); + g_error_free (error); + } + + if (ctx->blocked) { + /* confirm the user really wishes to block the contact */ + if (!empathy_block_individual_dialog_show (GTK_WINDOW (ctx->parent), + individual, avatar, &abusive)) + goto out; + } + + manager = empathy_individual_manager_dup_singleton (); + + empathy_individual_manager_set_blocked (manager, individual, + ctx->blocked, abusive); + + g_object_unref (manager); + +out: + g_clear_object (&avatar); + got_avatar_ctx_free (ctx); +} + +static void +empathy_individual_block_menu_item_toggled (GtkCheckMenuItem *item, + FolksIndividual *individual) +{ + GotAvatarCtx *ctx; + gboolean blocked; + GtkWidget *parent; + + /* @item may be destroyed while the async call is running to get the things + * we need from it right now. */ + blocked = gtk_check_menu_item_get_active (item); + + parent = g_object_get_data ( + G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (item))), + "window"); + + ctx = got_avatar_ctx_new (blocked, parent); + + empathy_pixbuf_avatar_from_individual_scaled_async (individual, + 48, 48, NULL, got_avatar, ctx); +} + +static void +update_block_menu_item (GtkWidget *item, + FolksIndividual *individual) +{ + GList *contacts, *l; + gboolean is_blocked = TRUE; + + contacts = get_contacts_supporting_blocking (individual); + + if (contacts == NULL) + is_blocked = FALSE; + + /* Check the menu item if all his personas are blocked */ + for (l = contacts; l != NULL; l = g_list_next (l)) + { + TpContact *contact = l->data; + + if (!tp_contact_is_blocked (contact)) + { + is_blocked = FALSE; + break; + } + } + + g_signal_handlers_block_by_func (item, + empathy_individual_block_menu_item_toggled, individual); + + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), is_blocked); + + g_signal_handlers_unblock_by_func (item, + empathy_individual_block_menu_item_toggled, individual); + + g_list_free (contacts); +} + +static void +contact_blocked_changed_cb (TpContact *contact, + GParamSpec *spec, + GtkWidget *item) +{ + FolksIndividual *individual; + + individual = g_object_get_data (G_OBJECT (item), "individual"); + + update_block_menu_item (item, individual); +} + +static GtkWidget * +empathy_individiual_block_menu_item_new (FolksIndividual *individual) +{ + GtkWidget *item; + GList *contacts, *l; + + contacts = get_contacts_supporting_blocking (individual); + + /* Can't block, no persona supports blocking */ + if (contacts == NULL) + return NULL; + + item = gtk_check_menu_item_new_with_mnemonic (_("_Block Contact")); + + g_object_set_data_full (G_OBJECT (item), "individual", + g_object_ref (individual), g_object_unref); + + for (l = contacts; l != NULL; l = g_list_next (l)) + { + TpContact *contact = l->data; + + tp_g_signal_connect_object (contact, "notify::is-blocked", + G_CALLBACK (contact_blocked_changed_cb), item, 0); + } + + g_signal_connect (item, "toggled", + G_CALLBACK (empathy_individual_block_menu_item_toggled), individual); + + update_block_menu_item (item, individual); + + g_list_free (contacts); + + return item; +} + static void constructed (GObject *object) { @@ -472,7 +707,7 @@ constructed (GObject *object) /* Chat */ if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT) { - item = empathy_individual_chat_menu_item_new (individual, NULL); + item = empathy_individual_chat_menu_item_new (individual); if (item != NULL) { gtk_menu_shell_append (shell, item); @@ -483,7 +718,7 @@ constructed (GObject *object) /* SMS */ if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS) { - item = empathy_individual_sms_menu_item_new (individual, NULL); + item = empathy_individual_sms_menu_item_new (individual); if (item != NULL) { gtk_menu_shell_append (shell, item); @@ -494,12 +729,12 @@ constructed (GObject *object) if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL) { /* Audio Call */ - item = empathy_individual_audio_call_menu_item_new (individual, NULL); + item = empathy_individual_audio_call_menu_item_new (individual); gtk_menu_shell_append (shell, item); gtk_widget_show (item); /* Video Call */ - item = empathy_individual_video_call_menu_item_new (individual, NULL); + item = empathy_individual_video_call_menu_item_new (individual); gtk_menu_shell_append (shell, item); gtk_widget_show (item); } @@ -513,14 +748,14 @@ constructed (GObject *object) gtk_widget_show (item); /* File transfer */ - item = empathy_individual_file_transfer_menu_item_new (individual, NULL); + item = empathy_individual_file_transfer_menu_item_new (individual); gtk_menu_shell_append (shell, item); gtk_widget_show (item); /* Share my desktop */ /* FIXME we should add the "Share my desktop" menu item if Vino is a registered handler in MC5 */ - item = empathy_individual_share_my_desktop_menu_item_new (individual, NULL); + item = empathy_individual_share_my_desktop_menu_item_new (individual); gtk_menu_shell_append (shell, item); gtk_widget_show (item); @@ -530,8 +765,7 @@ constructed (GObject *object) /* Separator */ if (features & (EMPATHY_INDIVIDUAL_FEATURE_EDIT | EMPATHY_INDIVIDUAL_FEATURE_INFO | - EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE | - EMPATHY_INDIVIDUAL_FEATURE_LINK)) + EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE)) { item = gtk_separator_menu_item_new (); gtk_menu_shell_append (shell, item); @@ -546,22 +780,10 @@ constructed (GObject *object) gtk_widget_show (item); } - /* Link */ - if (features & EMPATHY_INDIVIDUAL_FEATURE_LINK) - { - item = empathy_individual_link_menu_item_new (individual); - gtk_menu_shell_append (shell, item); - - g_signal_connect_swapped (item, "activate", - (GCallback) individual_link_menu_item_activate_cb, object); - - gtk_widget_show (item); - } - /* Log */ if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG) { - item = empathy_individual_log_menu_item_new (individual, NULL); + item = empathy_individual_log_menu_item_new (individual); gtk_menu_shell_append (shell, item); gtk_widget_show (item); } @@ -581,6 +803,19 @@ constructed (GObject *object) gtk_menu_shell_append (shell, item); gtk_widget_show (item); } + + /* Separator & Block */ + if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK && + (item = empathy_individiual_block_menu_item_new (individual)) != NULL) { + GtkWidget *sep; + + sep = gtk_separator_menu_item_new (); + gtk_menu_shell_append (shell, sep); + gtk_widget_show (sep); + + gtk_menu_shell_append (shell, item); + gtk_widget_show (item); + } } static void @@ -690,12 +925,6 @@ empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass) EMPATHY_TYPE_INDIVIDUAL_STORE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - signals[SIGNAL_LINK_CONTACTS_ACTIVATED] = - g_signal_new ("link-contacts-activated", G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, 1, EMPATHY_TYPE_LINKING_DIALOG); - g_type_class_add_private (object_class, sizeof (EmpathyIndividualMenuPriv)); } @@ -705,7 +934,8 @@ empathy_individual_menu_new (FolksIndividual *individual, EmpathyIndividualStore *store) { g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL); - g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_STORE (store), NULL); + g_return_val_if_fail (store == NULL || + EMPATHY_IS_INDIVIDUAL_STORE (store), NULL); g_return_val_if_fail (features != EMPATHY_INDIVIDUAL_FEATURE_NONE, NULL); return g_object_new (EMPATHY_TYPE_INDIVIDUAL_MENU, @@ -775,17 +1005,14 @@ empathy_individual_chat_menu_item_activated (GtkMenuItem *item, empathy_chat_with_contact (contact, empathy_get_current_action_time ()); } -GtkWidget * -empathy_individual_chat_menu_item_new (FolksIndividual *individual, - EmpathyContact *contact) +static GtkWidget * +empathy_individual_chat_menu_item_new (FolksIndividual *individual) { GtkWidget *item; GtkWidget *image; - g_return_val_if_fail ((FOLKS_IS_INDIVIDUAL (individual) && - empathy_folks_individual_contains_contact (individual)) || - EMPATHY_IS_CONTACT (contact), - NULL); + g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) && + empathy_folks_individual_contains_contact (individual), NULL); item = gtk_image_menu_item_new_with_mnemonic (_("_Chat")); image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_MESSAGE, @@ -793,18 +1020,9 @@ empathy_individual_chat_menu_item_new (FolksIndividual *individual, gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_widget_show (image); - if (contact != NULL) - { - menu_item_set_contact (item, contact, - G_CALLBACK (empathy_individual_chat_menu_item_activated), - EMPATHY_ACTION_CHAT); - } - else - { - menu_item_set_first_contact (item, individual, - G_CALLBACK (empathy_individual_chat_menu_item_activated), - EMPATHY_ACTION_CHAT); - } + menu_item_set_first_contact (item, individual, + G_CALLBACK (empathy_individual_chat_menu_item_activated), + EMPATHY_ACTION_CHAT); return item; } @@ -822,17 +1040,14 @@ empathy_individual_sms_menu_item_activated (GtkMenuItem *item, NULL, NULL); } -GtkWidget * -empathy_individual_sms_menu_item_new (FolksIndividual *individual, - EmpathyContact *contact) +static GtkWidget * +empathy_individual_sms_menu_item_new (FolksIndividual *individual) { GtkWidget *item; GtkWidget *image; - g_return_val_if_fail ((FOLKS_IS_INDIVIDUAL (individual) && - empathy_folks_individual_contains_contact (individual)) || - EMPATHY_IS_CONTACT (contact), - NULL); + g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) && + empathy_folks_individual_contains_contact (individual), NULL); item = gtk_image_menu_item_new_with_mnemonic (_("_SMS")); image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_SMS, @@ -840,18 +1055,9 @@ empathy_individual_sms_menu_item_new (FolksIndividual *individual, gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_widget_show (image); - if (contact != NULL) - { - menu_item_set_contact (item, contact, - G_CALLBACK (empathy_individual_sms_menu_item_activated), - EMPATHY_ACTION_SMS); - } - else - { - menu_item_set_first_contact (item, individual, - G_CALLBACK (empathy_individual_sms_menu_item_activated), - EMPATHY_ACTION_SMS); - } + menu_item_set_first_contact (item, individual, + G_CALLBACK (empathy_individual_sms_menu_item_activated), + EMPATHY_ACTION_SMS); return item; } @@ -869,33 +1075,21 @@ empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item, } GtkWidget * -empathy_individual_audio_call_menu_item_new (FolksIndividual *individual, - EmpathyContact *contact) +empathy_individual_audio_call_menu_item_new (FolksIndividual *individual) { GtkWidget *item; GtkWidget *image; - g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) || - EMPATHY_IS_CONTACT (contact), - NULL); + g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL); item = gtk_image_menu_item_new_with_mnemonic (C_("menu item", "_Audio Call")); image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VOIP, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_widget_show (image); - if (contact != NULL) - { - menu_item_set_contact (item, contact, - G_CALLBACK (empathy_individual_audio_call_menu_item_activated), - EMPATHY_ACTION_AUDIO_CALL); - } - else - { - menu_item_set_first_contact (item, individual, - G_CALLBACK (empathy_individual_audio_call_menu_item_activated), - EMPATHY_ACTION_AUDIO_CALL); - } + menu_item_set_first_contact (item, individual, + G_CALLBACK (empathy_individual_audio_call_menu_item_activated), + EMPATHY_ACTION_AUDIO_CALL); return item; } @@ -913,16 +1107,13 @@ empathy_individual_video_call_menu_item_activated (GtkMenuItem *item, } GtkWidget * -empathy_individual_video_call_menu_item_new (FolksIndividual *individual, - EmpathyContact *contact) +empathy_individual_video_call_menu_item_new (FolksIndividual *individual) { GtkWidget *item; GtkWidget *image; EmpathyCameraMonitor *monitor; - g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) || - EMPATHY_IS_CONTACT (contact), - NULL); + g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL); item = gtk_image_menu_item_new_with_mnemonic (C_("menu item", "_Video Call")); image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VIDEO_CALL, @@ -930,18 +1121,9 @@ empathy_individual_video_call_menu_item_new (FolksIndividual *individual, gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_widget_show (image); - if (contact != NULL) - { - menu_item_set_contact (item, contact, - G_CALLBACK (empathy_individual_video_call_menu_item_activated), - EMPATHY_ACTION_VIDEO_CALL); - } - else - { - menu_item_set_first_contact (item, individual, - G_CALLBACK (empathy_individual_video_call_menu_item_activated), - EMPATHY_ACTION_VIDEO_CALL); - } + menu_item_set_first_contact (item, individual, + G_CALLBACK (empathy_individual_video_call_menu_item_activated), + EMPATHY_ACTION_VIDEO_CALL); /* Only follow available cameras if the contact can do Video calls */ if (gtk_widget_get_sensitive (item)) @@ -966,34 +1148,22 @@ empathy_individual_log_menu_item_activated (GtkMenuItem *item, empathy_contact_get_id (contact), FALSE, NULL); } -GtkWidget * -empathy_individual_log_menu_item_new (FolksIndividual *individual, - EmpathyContact *contact) +static GtkWidget * +empathy_individual_log_menu_item_new (FolksIndividual *individual) { GtkWidget *item; GtkWidget *image; - g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) || - EMPATHY_IS_CONTACT (contact), - NULL); + g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL); item = gtk_image_menu_item_new_with_mnemonic (_("_Previous Conversations")); image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_LOG, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_widget_show (image); - if (contact != NULL) - { - menu_item_set_contact (item, contact, - G_CALLBACK (empathy_individual_log_menu_item_activated), - EMPATHY_ACTION_VIEW_LOGS); - } - else - { - menu_item_set_first_contact (item, individual, - G_CALLBACK (empathy_individual_log_menu_item_activated), - EMPATHY_ACTION_VIEW_LOGS); - } + menu_item_set_first_contact (item, individual, + G_CALLBACK (empathy_individual_log_menu_item_activated), + EMPATHY_ACTION_VIEW_LOGS); return item; } @@ -1007,16 +1177,13 @@ empathy_individual_file_transfer_menu_item_activated (GtkMenuItem *item, empathy_send_file_with_file_chooser (contact); } -GtkWidget * -empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual, - EmpathyContact *contact) +static GtkWidget * +empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual) { GtkWidget *item; GtkWidget *image; - g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) || - EMPATHY_IS_CONTACT (contact), - NULL); + g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL); item = gtk_image_menu_item_new_with_mnemonic (_("Send File")); image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND, @@ -1024,18 +1191,9 @@ empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual, gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_widget_show (image); - if (contact != NULL) - { - menu_item_set_contact (item, contact, - G_CALLBACK (empathy_individual_file_transfer_menu_item_activated), - EMPATHY_ACTION_SEND_FILE); - } - else - { - menu_item_set_first_contact (item, individual, - G_CALLBACK (empathy_individual_file_transfer_menu_item_activated), - EMPATHY_ACTION_SEND_FILE); - } + menu_item_set_first_contact (item, individual, + G_CALLBACK (empathy_individual_file_transfer_menu_item_activated), + EMPATHY_ACTION_SEND_FILE); return item; } @@ -1049,34 +1207,22 @@ empathy_individual_share_my_desktop_menu_item_activated (GtkMenuItem *item, empathy_share_my_desktop_share_with_contact (contact); } -GtkWidget * -empathy_individual_share_my_desktop_menu_item_new (FolksIndividual *individual, - EmpathyContact *contact) +static GtkWidget * +empathy_individual_share_my_desktop_menu_item_new (FolksIndividual *individual) { GtkWidget *item; GtkWidget *image; - g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) || - EMPATHY_IS_CONTACT (contact), - NULL); + g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL); item = gtk_image_menu_item_new_with_mnemonic (_("Share My Desktop")); image = gtk_image_new_from_icon_name (GTK_STOCK_NETWORK, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_widget_show (image); - if (contact != NULL) - { - menu_item_set_contact (item, contact, - G_CALLBACK (empathy_individual_share_my_desktop_menu_item_activated), - EMPATHY_ACTION_SHARE_MY_DESKTOP); - } - else - { - menu_item_set_first_contact (item, individual, - G_CALLBACK (empathy_individual_share_my_desktop_menu_item_activated), - EMPATHY_ACTION_SHARE_MY_DESKTOP); - } + menu_item_set_first_contact (item, individual, + G_CALLBACK (empathy_individual_share_my_desktop_menu_item_activated), + EMPATHY_ACTION_SHARE_MY_DESKTOP); return item; } @@ -1090,7 +1236,7 @@ favourite_menu_item_toggled_cb (GtkCheckMenuItem *item, gtk_check_menu_item_get_active (item)); } -GtkWidget * +static GtkWidget * empathy_individual_favourite_menu_item_new (FolksIndividual *individual) { GtkWidget *item; @@ -1108,12 +1254,120 @@ empathy_individual_favourite_menu_item_new (FolksIndividual *individual) } static void -individual_info_menu_item_activate_cb (FolksIndividual *individual) +show_gnome_contacts_error_dialog (void) { - empathy_individual_information_dialog_show (individual, NULL); + GtkWidget *dialog; + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, + _("gnome-contacts not installed")); + + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("Please install gnome-contacts to access contacts details.")); + + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); + + gtk_widget_show (dialog); } -GtkWidget * +static void +start_gnome_contacts (FolksIndividual *individual, + gboolean try_installing); + +static void +install_gnome_contacts_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + FolksIndividual *individual = user_data; + GError *error = NULL; + + if (!empathy_pkg_kit_install_packages_finish (result, &error)) + { + DEBUG ("Failed to install gnome-contacts: %s", error->message); + g_error_free (error); + + show_gnome_contacts_error_dialog (); + goto out; + } + + DEBUG ("gnome-contacts installed"); + + start_gnome_contacts (individual, FALSE); + +out: + g_object_unref (individual); +} + +static void +start_gnome_contacts (FolksIndividual *individual, + gboolean try_installing) +{ + GDesktopAppInfo *desktop_info; + gchar *cmd; + GAppInfo *app_info; + GError *error = NULL; + GdkAppLaunchContext *context = NULL; + GdkDisplay *display; + + g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual)); + + /* Start gnome-contacts */ + display = gdk_display_get_default (); + context = gdk_display_get_app_launch_context (display); + + desktop_info = g_desktop_app_info_new ("gnome-contacts.desktop"); + if (desktop_info == NULL) + { + if (try_installing) + { + const gchar *packages[] = { "gnome-contacts", NULL }; + + DEBUG ("gnome-contacts not installed; try to install it"); + + empathy_pkg_kit_install_packages_async (0, packages, NULL, + NULL, install_gnome_contacts_cb, g_object_ref (individual)); + } + else + { + show_gnome_contacts_error_dialog (); + } + + return; + } + + /* glib doesn't have API to start a desktop file with args... (#637875) */ + cmd = g_strdup_printf ("%s -i %s", g_app_info_get_commandline ( + (GAppInfo *) desktop_info), folks_individual_get_id (individual)); + + app_info = g_app_info_create_from_commandline (cmd, NULL, 0, &error); + if (app_info == NULL) + { + DEBUG ("Failed to create app_info: %s", error->message); + g_error_free (error); + return; + } + + if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context, + &error)) + { + g_critical ("Failed to start gnome-contacts: %s", error->message); + g_error_free (error); + } + + g_object_unref (desktop_info); + g_object_unref (app_info); +} + +static void +individual_info_menu_item_activate_cb (GtkMenuItem *item, + FolksIndividual *individual) +{ + start_gnome_contacts (individual, TRUE); +} + +static GtkWidget * empathy_individual_info_menu_item_new (FolksIndividual *individual) { GtkWidget *item; @@ -1129,7 +1383,7 @@ empathy_individual_info_menu_item_new (FolksIndividual *individual) gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_widget_show (image); - g_signal_connect_swapped (item, "activate", + g_signal_connect (item, "activate", G_CALLBACK (individual_info_menu_item_activate_cb), individual); @@ -1142,7 +1396,7 @@ individual_edit_menu_item_activate_cb (FolksIndividual *individual) empathy_individual_edit_dialog_show (individual, NULL); } -GtkWidget * +static GtkWidget * empathy_individual_edit_menu_item_new (FolksIndividual *individual) { EmpathyIndividualManager *manager; @@ -1187,31 +1441,6 @@ empathy_individual_edit_menu_item_new (FolksIndividual *individual) return item; } -GtkWidget * -empathy_individual_link_menu_item_new (FolksIndividual *individual) -{ - GtkWidget *item; - /*GtkWidget *image;*/ - - g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL); - - item = gtk_image_menu_item_new_with_mnemonic ( - /* Translators: this is a verb meaning "to connect two contacts together - * to form a meta-contact". */ - C_("Link individual (contextual menu)", "_Link Contacts…")); - /* TODO */ - /*image = gtk_image_new_from_icon_name (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - gtk_widget_show (image);*/ - - /* Only allow trusted Individuals to be linked */ - gtk_widget_set_sensitive (item, - folks_individual_get_trust_level (individual) == - FOLKS_TRUST_LEVEL_PERSONAS); - - return item; -} - typedef struct { FolksIndividual *individual; @@ -1337,7 +1566,7 @@ create_room_sub_menu (FolksIndividual *individual, return item; } -GtkWidget * +static GtkWidget * empathy_individual_invite_menu_item_new (FolksIndividual *individual, EmpathyContact *contact) { @@ -1479,7 +1708,7 @@ add_menu_item_activated (GtkMenuItem *item, g_object_unref (contact); } -GtkWidget * +static GtkWidget * empathy_individual_add_menu_item_new (EmpathyIndividualMenu *self, FolksIndividual *individual) { diff --git a/libempathy-gtk/empathy-individual-menu.h b/libempathy-gtk/empathy-individual-menu.h index 31acc156..a2187da6 100644 --- a/libempathy-gtk/empathy-individual-menu.h +++ b/libempathy-gtk/empathy-individual-menu.h @@ -37,11 +37,10 @@ typedef enum { EMPATHY_INDIVIDUAL_FEATURE_EDIT = 1 << 3, EMPATHY_INDIVIDUAL_FEATURE_INFO = 1 << 4, EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE = 1 << 5, - EMPATHY_INDIVIDUAL_FEATURE_LINK = 1 << 6, - EMPATHY_INDIVIDUAL_FEATURE_SMS = 1 << 7, - EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE = 1 << 8, - EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT = 1 << 9, - EMPATHY_INDIVIDUAL_FEATURE_ALL = (1 << 10) - 1, + EMPATHY_INDIVIDUAL_FEATURE_SMS = 1 << 6, + EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE = 1 << 7, + EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT = 1 << 8, + EMPATHY_INDIVIDUAL_FEATURE_BLOCK = 1 << 9, } EmpathyIndividualFeatureFlags; #define EMPATHY_TYPE_INDIVIDUAL_MENU (empathy_individual_menu_get_type ()) @@ -73,33 +72,10 @@ GType empathy_individual_menu_get_type (void) G_GNUC_CONST; GtkWidget * empathy_individual_menu_new (FolksIndividual *individual, EmpathyIndividualFeatureFlags features, EmpathyIndividualStore *store); -GtkWidget * empathy_individual_chat_menu_item_new (FolksIndividual *individual, - EmpathyContact *contact); -GtkWidget * empathy_individual_sms_menu_item_new (FolksIndividual *individual, - EmpathyContact *contact); + GtkWidget * empathy_individual_audio_call_menu_item_new ( - FolksIndividual *individual, - EmpathyContact *contact); -GtkWidget * empathy_individual_video_call_menu_item_new ( - FolksIndividual *individual, - EmpathyContact *contact); -GtkWidget * empathy_individual_log_menu_item_new (FolksIndividual *individual, - EmpathyContact *contact); -GtkWidget * empathy_individual_info_menu_item_new (FolksIndividual *individual); -GtkWidget * empathy_individual_edit_menu_item_new (FolksIndividual *individual); -GtkWidget * empathy_individual_link_menu_item_new (FolksIndividual *individual); -GtkWidget * empathy_individual_invite_menu_item_new ( - FolksIndividual *individual, - EmpathyContact *contact); -GtkWidget * empathy_individual_file_transfer_menu_item_new ( - FolksIndividual *individual, - EmpathyContact *contact); -GtkWidget * empathy_individual_share_my_desktop_menu_item_new ( - FolksIndividual *individual, - EmpathyContact *contact); -GtkWidget * empathy_individual_favourite_menu_item_new ( FolksIndividual *individual); -GtkWidget * empathy_individual_add_menu_item_new (EmpathyIndividualMenu *self, +GtkWidget * empathy_individual_video_call_menu_item_new ( FolksIndividual *individual); G_END_DECLS diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c index 75284602..76ff74e2 100644 --- a/libempathy-gtk/empathy-individual-store-channel.c +++ b/libempathy-gtk/empathy-individual-store-channel.c @@ -82,6 +82,8 @@ add_members (EmpathyIndividualStoreChannel *self, continue; individual = empathy_create_individual_from_tp_contact (contact); + if (individual == NULL) + return; DEBUG ("%s joined channel %s", tp_contact_get_identifier (contact), tp_proxy_get_object_path (self->priv->channel)); diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index aa3f6334..c22e1114 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -330,94 +330,100 @@ void empathy_individual_store_add_individual (EmpathyIndividualStore *self, FolksIndividual *individual) { - GtkTreeIter iter; - GeeIterator *group_iter = NULL; + GtkTreeIter iter, iter_group; + GeeSet *group_set = NULL; + gboolean grouped = FALSE; if (EMP_STR_EMPTY (folks_alias_details_get_alias ( FOLKS_ALIAS_DETAILS (individual)))) return; - if (self->priv->show_groups) + if (!self->priv->show_groups) { - GeeSet *group_set = NULL; - - group_set = folks_group_details_get_groups ( - FOLKS_GROUP_DETAILS (individual)); + /* add our individual to the toplevel of the store */ + add_individual_to_store (GTK_TREE_STORE (self), &iter, NULL, + individual); - if (gee_collection_get_size (GEE_COLLECTION (group_set)) > 0) - group_iter = gee_iterable_iterator (GEE_ITERABLE (group_set)); + goto finally; } - /* fall-back groups, in case there are no named groups */ - if (group_iter == NULL) + group_set = folks_group_details_get_groups ( + FOLKS_GROUP_DETAILS (individual)); + + if (gee_collection_get_size (GEE_COLLECTION (group_set)) > 0) + { + /* add the contact to its groups */ + GeeIterator *group_iter = + gee_iterable_iterator (GEE_ITERABLE (group_set)); + + while (group_iter != NULL && gee_iterator_next (group_iter)) + { + gchar *group_name = gee_iterator_get (group_iter); + + individual_store_get_group (self, group_name, &iter_group, + NULL, NULL, FALSE); + + add_individual_to_store (GTK_TREE_STORE (self), &iter, &iter_group, + individual); + grouped = TRUE; + + g_free (group_name); + } + + g_clear_object (&group_iter); + } + else { - GtkTreeIter iter_group, *parent; + /* fall-back groups, in case there are no named groups */ EmpathyContact *contact; TpConnection *connection; - gchar *protocol_name = NULL; - - parent = &iter_group; + const gchar *protocol_name = NULL; contact = empathy_contact_dup_from_folks_individual (individual); if (contact != NULL) { connection = empathy_contact_get_connection (contact); - tp_connection_parse_object_path (connection, &protocol_name, NULL); + protocol_name = tp_connection_get_protocol_name (connection); } - if (!self->priv->show_groups) - parent = NULL; - else if (!tp_strdiff (protocol_name, "local-xmpp")) + if (!tp_strdiff (protocol_name, "local-xmpp")) { /* these are People Nearby */ individual_store_get_group (self, EMPATHY_INDIVIDUAL_STORE_PEOPLE_NEARBY, &iter_group, NULL, NULL, TRUE); + add_individual_to_store (GTK_TREE_STORE (self), &iter, &iter_group, + individual); + grouped = TRUE; } - else - { - individual_store_get_group (self, - EMPATHY_INDIVIDUAL_STORE_UNGROUPED, - &iter_group, NULL, NULL, TRUE); - } - - add_individual_to_store (GTK_TREE_STORE (self), &iter, parent, - individual); - g_free (protocol_name); g_clear_object (&contact); } - /* Else add to each group. */ - while (group_iter != NULL && gee_iterator_next (group_iter)) + if (folks_favourite_details_get_is_favourite ( + FOLKS_FAVOURITE_DETAILS (individual))) { - gchar *group_name = gee_iterator_get (group_iter); - GtkTreeIter iter_group; - - individual_store_get_group (self, group_name, &iter_group, NULL, NULL, - FALSE); + /* Add contact to the fake 'Favorites' group */ + individual_store_get_group (self, EMPATHY_INDIVIDUAL_STORE_FAVORITE, + &iter_group, NULL, NULL, TRUE); add_individual_to_store (GTK_TREE_STORE (self), &iter, &iter_group, individual); - - g_free (group_name); + grouped = TRUE; } - g_clear_object (&group_iter); - if (self->priv->show_groups && - folks_favourite_details_get_is_favourite ( - FOLKS_FAVOURITE_DETAILS (individual))) + if (!grouped) { - /* Add contact to the fake 'Favorites' group */ - GtkTreeIter iter_group; - - individual_store_get_group (self, EMPATHY_INDIVIDUAL_STORE_FAVORITE, + /* Else add the contact to 'Ungrouped' */ + individual_store_get_group (self, + EMPATHY_INDIVIDUAL_STORE_UNGROUPED, &iter_group, NULL, NULL, TRUE); - add_individual_to_store (GTK_TREE_STORE (self), &iter, &iter_group, individual); } + +finally: individual_store_contact_update (self, individual); } diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 64aaf5a0..34ca7c09 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -46,10 +46,9 @@ #include "empathy-individual-view.h" #include "empathy-individual-menu.h" #include "empathy-individual-store.h" -#include "empathy-contact-dialogs.h" +#include "empathy-individual-edit-dialog.h" #include "empathy-individual-dialogs.h" #include "empathy-images.h" -#include "empathy-linking-dialog.h" #include "empathy-cell-renderer-expander.h" #include "empathy-cell-renderer-text.h" #include "empathy-cell-renderer-activatable.h" @@ -219,8 +218,10 @@ individual_view_query_tooltip_cb (EmpathyIndividualView *view, EMPATHY_INDIVIDUAL_WIDGET_SHOW_CLIENT_TYPES); gtk_container_set_border_width (GTK_CONTAINER (priv->tooltip_widget), 8); g_object_ref (priv->tooltip_widget); - g_signal_connect (priv->tooltip_widget, "destroy", - G_CALLBACK (individual_view_tooltip_destroy_cb), view); + + tp_g_signal_connect_object (priv->tooltip_widget, "destroy", + G_CALLBACK (individual_view_tooltip_destroy_cb), view, 0); + gtk_widget_show (priv->tooltip_widget); } else @@ -890,6 +891,12 @@ individual_view_drag_end (GtkWidget *widget, gtk_tree_row_reference_free (priv->drag_row); priv->drag_row = NULL; } + + if (priv->auto_scroll_timeout_id != 0) + { + g_source_remove (priv->auto_scroll_timeout_id); + priv->auto_scroll_timeout_id = 0; + } } static gboolean @@ -988,7 +995,6 @@ individual_view_key_press_event_cb (EmpathyIndividualView *view, g_idle_add (individual_view_popup_menu_idle_cb, data); } else if (event->keyval == GDK_KEY_F2) { FolksIndividual *individual; - EmpathyContact *contact; g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), FALSE); @@ -996,15 +1002,9 @@ individual_view_key_press_event_cb (EmpathyIndividualView *view, if (individual == NULL) return FALSE; - contact = empathy_contact_dup_from_folks_individual (individual); - if (contact == NULL) { - g_object_unref (individual); - return FALSE; - } - empathy_contact_edit_dialog_show (contact, NULL); + empathy_individual_edit_dialog_show (individual, NULL); g_object_unref (individual); - g_object_unref (contact); } return FALSE; @@ -1080,12 +1080,12 @@ individual_view_call_activated_cb (EmpathyCellRendererActivatable *cell, shell = GTK_MENU_SHELL (menu); /* audio */ - item = empathy_individual_audio_call_menu_item_new (individual, NULL); + item = empathy_individual_audio_call_menu_item_new (individual); gtk_menu_shell_append (shell, item); gtk_widget_show (item); /* video */ - item = empathy_individual_video_call_menu_item_new (individual, NULL); + item = empathy_individual_video_call_menu_item_new (individual); gtk_menu_shell_append (shell, item); gtk_widget_show (item); @@ -1642,54 +1642,6 @@ individual_view_row_has_child_toggled_cb (GtkTreeModel *model, g_free (name); } -/* FIXME: This is a workaround for bgo#621076 */ -static void -individual_view_verify_group_visibility (EmpathyIndividualView *view, - GtkTreePath *path) -{ - EmpathyIndividualViewPriv *priv = GET_PRIV (view); - GtkTreeModel *model; - GtkTreePath *parent_path; - GtkTreeIter parent_iter; - - if (gtk_tree_path_get_depth (path) < 2) - return; - - /* A group row is visible if and only if at least one if its child is visible. - * So when a row is inserted/deleted/changed in the base model, that could - * modify the visibility of its parent in the filter model. - */ - - model = GTK_TREE_MODEL (priv->store); - parent_path = gtk_tree_path_copy (path); - gtk_tree_path_up (parent_path); - if (gtk_tree_model_get_iter (model, &parent_iter, parent_path)) - { - /* This tells the filter to verify the visibility of that row, and - * show/hide it if necessary */ - gtk_tree_model_row_changed (GTK_TREE_MODEL (priv->store), - parent_path, &parent_iter); - } - gtk_tree_path_free (parent_path); -} - -static void -individual_view_store_row_changed_cb (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - EmpathyIndividualView *view) -{ - individual_view_verify_group_visibility (view, path); -} - -static void -individual_view_store_row_deleted_cb (GtkTreeModel *model, - GtkTreePath *path, - EmpathyIndividualView *view) -{ - individual_view_verify_group_visibility (view, path); -} - static gboolean individual_view_is_visible_individual (EmpathyIndividualView *self, FolksIndividual *individual, @@ -1820,14 +1772,6 @@ individual_view_filter_visible_func (GtkTreeModel *model, g_object_unref (individual); g_free (group); - /* FIXME: Work around bgo#626552/bgo#621076 */ - if (visible) - { - GtkTreePath *path = gtk_tree_model_get_path (model, iter); - individual_view_verify_group_visibility (self, path); - gtk_tree_path_free (path); - } - return visible; } @@ -2592,19 +2536,6 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem, } } -static void -individual_menu_link_contacts_activated_cb (EmpathyIndividualMenu *menu, - EmpathyLinkingDialog *linking_dialog, - EmpathyIndividualView *self) -{ - EmpathyIndividualViewPriv *priv = GET_PRIV (self); - EmpathyIndividualLinker *linker; - - linker = empathy_linking_dialog_get_individual_linker (linking_dialog); - empathy_individual_linker_set_search_text (linker, - empathy_live_search_get_text (EMPATHY_LIVE_SEARCH (priv->search_widget))); -} - GtkWidget * empathy_individual_view_get_individual_menu (EmpathyIndividualView *view) { @@ -2679,12 +2610,6 @@ empathy_individual_view_get_individual_menu (EmpathyIndividualView *view) G_CALLBACK (individual_view_remove_activate_cb), view); } - /* Connect to EmpathyIndividualMenu::link-contacts-activated so that we can - * set the live search text on the new linking dialogue to be the same as - * our own. */ - g_signal_connect (menu, "link-contacts-activated", - (GCallback) individual_menu_link_contacts_activated_cb, view); - out: g_object_unref (individual); @@ -2825,11 +2750,6 @@ empathy_individual_view_set_store (EmpathyIndividualView *self, /* Destroy the old filter and remove the old store */ if (priv->store != NULL) { - g_signal_handlers_disconnect_by_func (priv->store, - individual_view_store_row_changed_cb, self); - g_signal_handlers_disconnect_by_func (priv->store, - individual_view_store_row_deleted_cb, self); - g_signal_handlers_disconnect_by_func (priv->filter, individual_view_row_has_child_toggled_cb, self); @@ -2856,13 +2776,6 @@ empathy_individual_view_set_store (EmpathyIndividualView *self, G_CALLBACK (individual_view_row_has_child_toggled_cb), self); gtk_tree_view_set_model (GTK_TREE_VIEW (self), GTK_TREE_MODEL (priv->filter)); - - tp_g_signal_connect_object (priv->store, "row-changed", - G_CALLBACK (individual_view_store_row_changed_cb), self, 0); - tp_g_signal_connect_object (priv->store, "row-inserted", - G_CALLBACK (individual_view_store_row_changed_cb), self, 0); - tp_g_signal_connect_object (priv->store, "row-deleted", - G_CALLBACK (individual_view_store_row_deleted_cb), self, 0); } } diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h index 00506daf..87dd20c7 100644 --- a/libempathy-gtk/empathy-individual-view.h +++ b/libempathy-gtk/empathy-individual-view.h @@ -63,7 +63,6 @@ typedef enum EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_CALL = 1 << 8, EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP = 1 << 9, EMPATHY_INDIVIDUAL_VIEW_FEATURE_FILE_DROP = 1 << 10, - EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL = (1 << 11) - 1, } EmpathyIndividualViewFeatureFlags; struct _EmpathyIndividualView diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 5a1c559d..3cbd1d5e 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -680,8 +680,7 @@ location_update (EmpathyIndividualWidget *self) #ifdef HAVE_LIBCHAMPLAIN if ((g_hash_table_lookup (location, EMPATHY_LOCATION_LAT) != NULL) && - (g_hash_table_lookup (location, EMPATHY_LOCATION_LON) != NULL) && - !(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP)) + (g_hash_table_lookup (location, EMPATHY_LOCATION_LON) != NULL)) { /* Cannot be displayed in tooltips until Clutter-Gtk can deal with such * windows */ @@ -1675,6 +1674,17 @@ individual_grid_destroy (EmpathyIndividualWidget *self) gtk_container_remove (GTK_CONTAINER (priv->vbox_individual), GTK_WIDGET (priv->individual_grid)); + +#ifdef HAVE_LIBCHAMPLAIN + if (priv->map_view_embed != NULL) + { + gtk_container_remove (GTK_CONTAINER (priv->viewport_map), + priv->map_view_embed); + + priv->map_view_embed = NULL; + } +#endif + priv->individual_grid = NULL; } diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c index 9d29aff4..755eb584 100644 --- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c +++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c @@ -132,6 +132,9 @@ dup_selected_network (EmpathyIrcNetworkChooserDialog *self, GtkTreeModel *model; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview)); + if (selection == NULL) + return NULL; + if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return NULL; @@ -157,7 +160,7 @@ treeview_changed_cb (GtkTreeView *treeview, network = dup_selected_network (self, NULL); if (network == priv->network) { - g_object_unref (network); + g_clear_object (&network); return; } diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c index 7a6bd789..74c9685e 100644 --- a/libempathy-gtk/empathy-irc-network-chooser.c +++ b/libempathy-gtk/empathy-irc-network-chooser.c @@ -118,6 +118,40 @@ unset_server_params (EmpathyIrcNetworkChooser *self) empathy_account_settings_unset (priv->settings, "use-ssl"); } +static gchar * +dup_network_service (EmpathyIrcNetwork *network) +{ + /* Account.Service has to be a lower case alphanumeric string which may + * also contain '-' but not start with it. */ +#define VALID G_CSET_a_2_z G_CSET_DIGITS "-" + gchar *service, *tmp; + + service = g_strdup (empathy_irc_network_get_name (network)); + service = g_strstrip (service); + + if (tp_str_empty (service)) + { + g_free (service); + return NULL; + } + + tmp = service; + service = g_ascii_strdown (service, -1); + g_free (tmp); + + service = g_strcanon (service, VALID, '-'); + + if (service[0] == '-') + { + tmp = service; + service = g_strdup (service + 1); + + g_free (tmp); + } + + return service; +} + static void update_server_params (EmpathyIrcNetworkChooser *self) { @@ -139,6 +173,7 @@ update_server_params (EmpathyIrcNetworkChooser *self) gchar *address; guint port; gboolean ssl; + gchar *service; g_object_get (server, "address", &address, @@ -153,7 +188,13 @@ update_server_params (EmpathyIrcNetworkChooser *self) DEBUG ("Setting use-ssl to %s", ssl ? "TRUE": "FALSE" ); empathy_account_settings_set_boolean (priv->settings, "use-ssl", ssl); + /* Set Account.Service */ + service = dup_network_service (priv->network); + DEBUG ("Setting Service to %s", service); + empathy_account_settings_set_service (priv->settings, service); + g_free (address); + g_free (service); } else { diff --git a/libempathy-gtk/empathy-linking-dialog.c b/libempathy-gtk/empathy-linking-dialog.c deleted file mode 100644 index 350bfdc2..00000000 --- a/libempathy-gtk/empathy-linking-dialog.c +++ /dev/null @@ -1,276 +0,0 @@ -/* - * Copyright (C) 2010 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Philip Withnall - */ - -#include - -#include -#include - -#include -#include - -#include -#include - -#include -#include - -#include "empathy-linking-dialog.h" -#include "empathy-individual-linker.h" -#include "empathy-ui-utils.h" - -/** - * SECTION:empathy-individual-widget - * @title:EmpathyLinkingDialog - * @short_description: A dialog used to link individuals together - * @include: libempathy-empathy-linking-dialog.h - * - * #EmpathyLinkingDialog is a dialog which allows selection of individuals to - * link together, and preview of the newly linked individual. When submitted, it - * pushes the new links to backing storage. - */ - -/** - * EmpathyLinkingDialog: - * @parent: parent object - * - * Widget which displays appropriate widgets with details about an individual, - * also allowing changing these details, if desired. - * - * Currently, it's just a thin wrapper around #EmpathyContactWidget, and - * displays the details of the first eligible persona found in the individual. - */ - -static GtkWidget *linking_dialog = NULL; - -/* Fairly arbitrary response ID for the "Unlink" button */ -#define RESPONSE_UNLINK 5 - -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLinkingDialog) - -typedef struct { - EmpathyIndividualLinker *linker; /* child widget */ - GtkWidget *link_button; /* child widget */ -} EmpathyLinkingDialogPriv; - -G_DEFINE_TYPE (EmpathyLinkingDialog, empathy_linking_dialog, - GTK_TYPE_DIALOG); - -static void -linker_notify_has_changed_cb (EmpathyIndividualLinker *linker, - GParamSpec *pspec, - EmpathyLinkingDialog *self) -{ - EmpathyLinkingDialogPriv *priv = GET_PRIV (self); - - /* Only make the "Link" button sensitive if the linked Individual has been - * changed. */ - gtk_widget_set_sensitive (priv->link_button, - empathy_individual_linker_get_has_changed (linker)); -} - -static void -empathy_linking_dialog_class_init (EmpathyLinkingDialogClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (object_class, sizeof (EmpathyLinkingDialogPriv)); -} - -static void -empathy_linking_dialog_init (EmpathyLinkingDialog *self) -{ - EmpathyLinkingDialogPriv *priv; - GtkDialog *dialog; - GtkWidget *button; - GtkBox *content_area; - - priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - EMPATHY_TYPE_LINKING_DIALOG, EmpathyLinkingDialogPriv); - self->priv = priv; - - dialog = GTK_DIALOG (self); - - /* Set up dialog */ - gtk_window_set_resizable (GTK_WINDOW (self), TRUE); - /* Translators: this is the title of the linking dialogue (reached by - * right-clicking on a contact and selecting "Link…"). "Link" in this title - * is a verb. */ - gtk_window_set_title (GTK_WINDOW (self), _("Link Contacts")); - gtk_widget_set_size_request (GTK_WIDGET (self), 600, 500); - - /* Unlink button */ - button = gtk_button_new_with_mnemonic ( - C_("Unlink individual (button)", "_Unlink…")); - gtk_widget_set_tooltip_text (button, _("Completely split the displayed " - "linked contacts into the separate contacts.")); - gtk_dialog_add_action_widget (dialog, button, RESPONSE_UNLINK); - gtk_widget_show (button); - - /* Cancel button */ - button = gtk_button_new_with_label (GTK_STOCK_CANCEL); - gtk_button_set_use_stock (GTK_BUTTON (button), TRUE); - gtk_dialog_add_action_widget (dialog, button, GTK_RESPONSE_CANCEL); - gtk_widget_show (button); - - /* Add button */ - /* Translators: this is an action button in the linking dialogue. "Link" is - * used here as a verb meaning "to connect two contacts to form a - * meta-contact". */ - priv->link_button = gtk_button_new_with_mnemonic (_("_Link")); - gtk_dialog_add_action_widget (dialog, priv->link_button, GTK_RESPONSE_OK); - gtk_widget_show (priv->link_button); - - /* Linker widget */ - priv->linker = - EMPATHY_INDIVIDUAL_LINKER (empathy_individual_linker_new (NULL)); - g_signal_connect (priv->linker, "notify::has-changed", - (GCallback) linker_notify_has_changed_cb, self); - - gtk_container_set_border_width (GTK_CONTAINER (priv->linker), 8); - content_area = GTK_BOX (gtk_dialog_get_content_area (dialog)); - gtk_box_pack_start (content_area, GTK_WIDGET (priv->linker), TRUE, TRUE, 0); - gtk_widget_show (GTK_WIDGET (priv->linker)); -} - -static void -linking_response_cb (EmpathyLinkingDialog *self, - gint response, - gpointer user_data) -{ - EmpathyLinkingDialogPriv *priv = GET_PRIV (self); - - if (response == GTK_RESPONSE_OK) - { - EmpathyIndividualManager *manager; - GeeSet *personas; - - manager = empathy_individual_manager_dup_singleton (); - - personas = empathy_individual_linker_get_linked_personas (priv->linker); - empathy_individual_manager_link_personas (manager, personas); - - g_object_unref (manager); - } - else if (response == RESPONSE_UNLINK) - { - EmpathyIndividualManager *manager; - FolksIndividual *individual; - GtkWidget *dialog; - - individual = - empathy_individual_linker_get_start_individual (priv->linker); - - /* Show a confirmation dialogue first */ - dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, - _("Unlink linked contacts '%s'?"), - folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("Are you sure you want to unlink these linked contacts? This will " - "completely split the linked contacts into separate contacts.")); - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - C_("Unlink individual (button)", "_Unlink"), GTK_RESPONSE_OK, - NULL); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK) - { - gtk_widget_destroy (dialog); - return; - } - - gtk_widget_destroy (dialog); - - manager = empathy_individual_manager_dup_singleton (); - empathy_individual_manager_unlink_individual (manager, individual); - g_object_unref (manager); - } - - linking_dialog = NULL; - gtk_widget_destroy (GTK_WIDGET (self)); -} - -/** - * empathy_linking_dialog_show: - * @individual: the #FolksIndividual to start linking against - * @parent: a parent window for the dialogue, or %NULL - * - * Create and show the linking dialogue, with @individual selected as the - * individual to link to. If the dialogue is already being shown, raise it and - * reset it so the start individual is @individual. - * - * Return value: the linking dialog - */ -GtkWidget * -empathy_linking_dialog_show (FolksIndividual *individual, - GtkWindow *parent) -{ - EmpathyLinkingDialogPriv *priv; - GeeSet *personas; - GeeIterator *iter; - guint num_personas = 0; - - /* Create the dialogue if it doesn't exist */ - if (linking_dialog == NULL) - { - linking_dialog = GTK_WIDGET (g_object_new (EMPATHY_TYPE_LINKING_DIALOG, - NULL)); - - g_signal_connect (linking_dialog, "response", - (GCallback) linking_response_cb, NULL); - } - - priv = GET_PRIV (linking_dialog); - - if (parent != NULL) - gtk_window_set_transient_for (GTK_WINDOW (linking_dialog), parent); - - empathy_individual_linker_set_start_individual (priv->linker, individual); - - /* Count how many Telepathy personas we have, to see whether we can - * unlink */ - personas = folks_individual_get_personas (individual); - iter = gee_iterable_iterator (GEE_ITERABLE (personas)); - while (gee_iterator_next (iter)) - { - FolksPersona *persona = gee_iterator_get (iter); - if (empathy_folks_persona_is_interesting (persona)) - num_personas++; - - g_clear_object (&persona); - } - g_clear_object (&iter); - - /* Only make the "Unlink" button sensitive if we have enough personas */ - gtk_dialog_set_response_sensitive (GTK_DIALOG (linking_dialog), - RESPONSE_UNLINK, (num_personas > 1) ? TRUE : FALSE); - - gtk_window_present (GTK_WINDOW (linking_dialog)); - - return linking_dialog; -} - -EmpathyIndividualLinker * -empathy_linking_dialog_get_individual_linker (EmpathyLinkingDialog *self) -{ - g_return_val_if_fail (EMPATHY_IS_LINKING_DIALOG (self), NULL); - - return GET_PRIV (self)->linker; -} diff --git a/libempathy-gtk/empathy-linking-dialog.h b/libempathy-gtk/empathy-linking-dialog.h deleted file mode 100644 index fb47641c..00000000 --- a/libempathy-gtk/empathy-linking-dialog.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2010 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Philip Withnall - */ - -#ifndef __EMPATHY_LINKING_DIALOG_H__ -#define __EMPATHY_LINKING_DIALOG_H__ - -#include - -#include - -#include "empathy-individual-linker.h" - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_LINKING_DIALOG (empathy_linking_dialog_get_type ()) -#define EMPATHY_LINKING_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \ - EMPATHY_TYPE_LINKING_DIALOG, EmpathyLinkingDialog)) -#define EMPATHY_LINKING_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), \ - EMPATHY_TYPE_LINKING_DIALOG, EmpathyLinkingDialogClass)) -#define EMPATHY_IS_LINKING_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \ - EMPATHY_TYPE_LINKING_DIALOG)) -#define EMPATHY_IS_LINKING_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \ - EMPATHY_TYPE_LINKING_DIALOG)) -#define EMPATHY_LINKING_DIALOG_GET_CLASS(o) ( \ - G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_LINKING_DIALOG, \ - EmpathyLinkingDialogClass)) - -typedef struct { - GtkDialog parent; - - /**/ - gpointer priv; -} EmpathyLinkingDialog; - -typedef struct { - GtkDialogClass parent_class; -} EmpathyLinkingDialogClass; - -GType empathy_linking_dialog_get_type (void) G_GNUC_CONST; - -GtkWidget * empathy_linking_dialog_show (FolksIndividual *individual, - GtkWindow *parent); - -EmpathyIndividualLinker * empathy_linking_dialog_get_individual_linker ( - EmpathyLinkingDialog *self); - -G_END_DECLS - -#endif /* __EMPATHY_LINKING_DIALOG_H__ */ diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c new file mode 100644 index 00000000..3a6c8ee1 --- /dev/null +++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c @@ -0,0 +1,309 @@ +/* + * empathy-local-xmpp-assistant-widget.h - Source for + * EmpathyLocalXmppAssistantWidget + * + * Copyright (C) 2012 - Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with This library. If not, see . + */ + +#include "config.h" +#include "empathy-local-xmpp-assistant-widget.h" + +#include + +#if HAVE_EDS +#include +#endif + +#include + +#include +#include + +#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT +#include + +G_DEFINE_TYPE (EmpathyLocalXmppAssistantWidget, + empathy_local_xmpp_assistant_widget, GTK_TYPE_GRID) + +enum { + SIG_VALID = 1, + LAST_SIGNAL +}; + +static gulong signals[LAST_SIGNAL] = { 0, }; + +struct _EmpathyLocalXmppAssistantWidgetPrivate +{ + EmpathyAccountSettings *settings; +}; + +static void +empathy_local_xmpp_assistant_widget_init (EmpathyLocalXmppAssistantWidget *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), + EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET, + EmpathyLocalXmppAssistantWidgetPrivate); +} + +static EmpathyAccountSettings * +create_salut_account_settings (void) +{ + EmpathyAccountSettings *settings; +#if HAVE_EDS + EBook *book; + EContact *contact; + gchar *nickname = NULL; + gchar *first_name = NULL; + gchar *last_name = NULL; + gchar *email = NULL; + gchar *jid = NULL; + GError *error = NULL; +#endif + + settings = empathy_account_settings_new ("salut", "local-xmpp", NULL, + _("People nearby")); + +#if HAVE_EDS + /* Get self EContact from EDS */ + if (!e_book_get_self (&contact, &book, &error)) + { + DEBUG ("Failed to get self econtact: %s", error->message); + g_error_free (error); + return settings; + } + + nickname = e_contact_get (contact, E_CONTACT_NICKNAME); + first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME); + last_name = e_contact_get (contact, E_CONTACT_FAMILY_NAME); + email = e_contact_get (contact, E_CONTACT_EMAIL_1); + jid = e_contact_get (contact, E_CONTACT_IM_JABBER_HOME_1); + + if (!tp_strdiff (nickname, "nickname")) + { + g_free (nickname); + nickname = NULL; + } + + DEBUG ("Salut account created:\nnickname=%s\nfirst-name=%s\n" + "last-name=%s\nemail=%s\njid=%s\n", + nickname, first_name, last_name, email, jid); + + empathy_account_settings_set_string (settings, + "nickname", nickname ? nickname : ""); + empathy_account_settings_set_string (settings, + "first-name", first_name ? first_name : ""); + empathy_account_settings_set_string (settings, + "last-name", last_name ? last_name : ""); + empathy_account_settings_set_string (settings, "email", email ? email : ""); + empathy_account_settings_set_string (settings, "jid", jid ? jid : ""); + + g_free (nickname); + g_free (first_name); + g_free (last_name); + g_free (email); + g_free (jid); + g_object_unref (contact); + g_object_unref (book); +#endif + + return settings; +} + +static void +handle_apply_cb (EmpathyAccountWidget *widget_object, + gboolean is_valid, + EmpathyLocalXmppAssistantWidget *self) +{ + g_signal_emit (self, signals[SIG_VALID], 0, is_valid); +} + +static void +empathy_local_xmpp_assistant_widget_constructed (GObject *object) +{ + EmpathyLocalXmppAssistantWidget *self = (EmpathyLocalXmppAssistantWidget *) + object; + GtkWidget *w; + GdkPixbuf *pix; + GtkWidget *account_widget; + EmpathyAccountWidget *widget_object; + gchar *markup; + + G_OBJECT_CLASS (empathy_local_xmpp_assistant_widget_parent_class)-> + constructed (object); + + gtk_container_set_border_width (GTK_CONTAINER (self), 12); + + w = gtk_label_new ( + _("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.")); + gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5); + gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); + gtk_grid_attach (GTK_GRID (self), w, 0, 0, 1, 1); + gtk_widget_show (w); + + pix = empathy_pixbuf_from_icon_name_sized ("im-local-xmpp", 48); + w = gtk_image_new_from_pixbuf (pix); + gtk_grid_attach (GTK_GRID (self), w, 1, 0, 1, 1); + gtk_widget_show (w); + + g_object_unref (pix); + + self->priv->settings = create_salut_account_settings (); + + widget_object = empathy_account_widget_new_for_protocol (self->priv->settings, + TRUE); + empathy_account_widget_hide_buttons (widget_object); + + account_widget = empathy_account_widget_get_widget (widget_object); + + g_signal_connect (widget_object, "handle-apply", + G_CALLBACK (handle_apply_cb), self); + + gtk_grid_attach (GTK_GRID (self), account_widget, 0, 1, 2, 1); + gtk_widget_show (account_widget); + + w = gtk_label_new (NULL); + markup = g_strdup_printf ( + "%s", + _("You can change these details later or disable this feature " + "by choosing Edit → Accounts " + "in the Contact List.")); + gtk_label_set_markup (GTK_LABEL (w), markup); + g_free (markup); + gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5); + gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); + gtk_grid_attach (GTK_GRID (self), w, 0, 2, 2, 1); + gtk_widget_show (w); +} + +static void +empathy_local_xmpp_assistant_widget_dispose (GObject *object) +{ + EmpathyLocalXmppAssistantWidget *self = (EmpathyLocalXmppAssistantWidget *) + object; + + g_clear_object (&self->priv->settings); + + G_OBJECT_CLASS (empathy_local_xmpp_assistant_widget_parent_class)-> + dispose (object); +} + +static void +empathy_local_xmpp_assistant_widget_class_init ( + EmpathyLocalXmppAssistantWidgetClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->constructed = empathy_local_xmpp_assistant_widget_constructed; + object_class->dispose = empathy_local_xmpp_assistant_widget_dispose; + + signals[SIG_VALID] = + g_signal_new ("valid", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, 0, NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + + g_type_class_add_private (object_class, + sizeof (EmpathyLocalXmppAssistantWidgetPrivate)); +} + +GtkWidget * +empathy_local_xmpp_assistant_widget_new () +{ + return g_object_new (EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET, + "row-spacing", 12, + NULL); +} + +static void +account_enabled_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + TpAccount *account = TP_ACCOUNT (source); + GError *error = NULL; + TpAccountManager *account_mgr; + + if (!tp_account_set_enabled_finish (account, result, &error)) + { + DEBUG ("Failed to enable account: %s", error->message); + g_error_free (error); + return; + } + + account_mgr = tp_account_manager_dup (); + + empathy_connect_new_account (account, account_mgr); + + g_object_unref (account_mgr); +} + +static void +apply_account_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source); + TpAccount *account; + GError *error = NULL; + + if (!empathy_account_settings_apply_finish (settings, result, NULL, &error)) + { + DEBUG ("Failed to create account: %s", error->message); + g_error_free (error); + return; + } + + /* enable the newly created account */ + account = empathy_account_settings_get_account (settings); + tp_account_set_enabled_async (account, TRUE, account_enabled_cb, NULL); +} + +void +empathy_local_xmpp_assistant_widget_create_account ( + EmpathyLocalXmppAssistantWidget *self) +{ + empathy_account_settings_apply_async (self->priv->settings, + apply_account_cb, NULL); +} + +gboolean +empathy_local_xmpp_assistant_widget_should_create_account ( + TpAccountManager *manager) +{ + gboolean salut_created = FALSE; + GList *accounts, *l; + + accounts = tp_account_manager_get_valid_accounts (manager); + + for (l = accounts; l != NULL; l = g_list_next (l)) + { + TpAccount *account = TP_ACCOUNT (l->data); + + if (!tp_strdiff (tp_account_get_protocol (account), "local-xmpp")) + { + salut_created = TRUE; + break; + } + } + + g_list_free (accounts); + + return !salut_created; +} diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h new file mode 100644 index 00000000..35343bd4 --- /dev/null +++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h @@ -0,0 +1,63 @@ +/* + * empathy-local-xmpp-assistant-widget.h - Source for + * EmpathyLocalXmppAssistantWidget + * + * Copyright (C) 2012 - Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with This library. If not, see . + */ + +#ifndef __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__ +#define __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__ + +#include + +#include + +G_BEGIN_DECLS + +#define EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET (empathy_local_xmpp_assistant_widget_get_type ()) +#define EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET, EmpathyLocalXmppAssistantWidget)) +#define EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET, EmpathyLocalXmppAssistantWidgetClass)) +#define EMPATHY_IS_LOCAL_XMPP_ASSISTANT_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET)) +#define EMPATHY_IS_LOCAL_XMPP_ASSISTANT_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET)) +#define EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET, EmpathyLocalXmppAssistantWidgetClass)) + +typedef struct _EmpathyLocalXmppAssistantWidget EmpathyLocalXmppAssistantWidget; +typedef struct _EmpathyLocalXmppAssistantWidgetClass EmpathyLocalXmppAssistantWidgetClass; +typedef struct _EmpathyLocalXmppAssistantWidgetPrivate EmpathyLocalXmppAssistantWidgetPrivate; + +struct _EmpathyLocalXmppAssistantWidget { + GtkGrid parent; + + EmpathyLocalXmppAssistantWidgetPrivate *priv; +}; + +struct _EmpathyLocalXmppAssistantWidgetClass { + GtkGridClass parent_class; +}; + +GType empathy_local_xmpp_assistant_widget_get_type (void) G_GNUC_CONST; + +GtkWidget * empathy_local_xmpp_assistant_widget_new (void); + +void empathy_local_xmpp_assistant_widget_create_account ( + EmpathyLocalXmppAssistantWidget *self); + +gboolean empathy_local_xmpp_assistant_widget_should_create_account ( + TpAccountManager *manager); + +G_END_DECLS + +#endif /* __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__ */ diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index af375f1b..51a47c7a 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -62,6 +62,7 @@ #include "empathy-theme-manager.h" #include "empathy-ui-utils.h" #include "empathy-webkit-utils.h" +#include "empathy-geometry.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include @@ -773,6 +774,8 @@ empathy_log_window_init (EmpathyLogWindow *self) log_window_update_buttons_sensitivity (self); gtk_widget_show (GTK_WIDGET (self)); + + empathy_geometry_bind (GTK_WINDOW (self), "log-window"); } GtkWidget * @@ -2069,31 +2072,78 @@ log_window_search_entry_icon_pressed_cb (GtkEntry *entry, "", -1); } +static void +do_update_buttons_sensitivity (EmpathyLogWindow *self) +{ + EmpathyCapabilities capabilities; + gboolean profile, chat, call, video; + + tp_clear_object (&self->priv->button_video_binding); + + if (self->priv->selected_contact != NULL) + { + capabilities = empathy_contact_get_capabilities ( + self->priv->selected_contact); + + profile = chat = TRUE; + call = capabilities & EMPATHY_CAPABILITIES_AUDIO; + video = capabilities & EMPATHY_CAPABILITIES_VIDEO; + } + else + { + profile = chat = call = video = FALSE; + } + + gtk_widget_set_sensitive (self->priv->button_profile, profile); + gtk_widget_set_sensitive (self->priv->button_chat, chat); + gtk_widget_set_sensitive (self->priv->button_call, call); + + if (video) + { + self->priv->button_video_binding = g_object_bind_property ( + self->priv->camera_monitor, "available", + self->priv->button_video, "sensitive", + G_BINDING_SYNC_CREATE); + } + else + { + /* Don't override the binding */ + gtk_widget_set_sensitive (self->priv->button_video, video); + } +} + +static void +contact_capabilities_changed_cb (EmpathyContact *contact, + GParamSpec *spec, + EmpathyLogWindow *self) +{ + do_update_buttons_sensitivity (self); +} + static void log_window_update_buttons_sensitivity (EmpathyLogWindow *self) { GtkTreeView *view; GtkTreeModel *model; GtkTreeSelection *selection; - EmpathyCapabilities capabilities; TpAccount *account; TplEntity *target; GtkTreeIter iter; GList *paths; GtkTreePath *path; - gboolean profile, chat, call, video; - profile = chat = call = video = FALSE; + if (self->priv->selected_contact != NULL) + { + g_signal_handlers_disconnect_by_func (self->priv->selected_contact, + contact_capabilities_changed_cb, self); - tp_clear_object (&self->priv->button_video_binding); - tp_clear_object (&self->priv->selected_contact); + tp_clear_object (&self->priv->selected_contact); + } view = GTK_TREE_VIEW (self->priv->treeview_who); model = gtk_tree_view_get_model (view); selection = gtk_tree_view_get_selection (view); - profile = chat = call = video = FALSE; - if (!gtk_tree_model_get_iter_first (model, &iter)) goto events; @@ -2121,12 +2171,6 @@ log_window_update_buttons_sensitivity (EmpathyLogWindow *self) g_object_unref (account); g_object_unref (target); - capabilities = empathy_contact_get_capabilities (self->priv->selected_contact); - - profile = chat = TRUE; - call = capabilities & EMPATHY_CAPABILITIES_AUDIO; - video = capabilities & EMPATHY_CAPABILITIES_VIDEO; - goto out; events: @@ -2136,29 +2180,16 @@ log_window_update_buttons_sensitivity (EmpathyLogWindow *self) if (self->priv->events_contact != NULL) self->priv->selected_contact = g_object_ref (self->priv->events_contact); - else - goto out; - - capabilities = empathy_contact_get_capabilities (self->priv->selected_contact); - - profile = chat = TRUE; - call = capabilities & EMPATHY_CAPABILITIES_AUDIO; - video = capabilities & EMPATHY_CAPABILITIES_VIDEO; - - if (video) - self->priv->button_video_binding = g_object_bind_property ( - self->priv->camera_monitor, "available", - self->priv->button_video, "sensitive", - G_BINDING_SYNC_CREATE); out: - gtk_widget_set_sensitive (self->priv->button_profile, profile); - gtk_widget_set_sensitive (self->priv->button_chat, chat); - gtk_widget_set_sensitive (self->priv->button_call, call); + if (self->priv->selected_contact != NULL) + { + tp_g_signal_connect_object (self->priv->selected_contact, + "notify::capabilities", G_CALLBACK (contact_capabilities_changed_cb), + self, 0); + } - /* Don't override the binding */ - if (!video) - gtk_widget_set_sensitive (self->priv->button_video, video); + do_update_buttons_sensitivity (self); } static void diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c new file mode 100644 index 00000000..cab22ea4 --- /dev/null +++ b/libempathy-gtk/empathy-new-account-dialog.c @@ -0,0 +1,212 @@ +/* + * empathy-new-account-dialog.c - Source for EmpathyNewAccountDialog + * + * Copyright (C) 2011 - Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with This library. If not, see . + */ + +#include "config.h" +#include "empathy-new-account-dialog.h" + +#include + +#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT +#include + +#include +#include + +G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \ + GTK_TYPE_DIALOG) + +struct _EmpathyNewAccountDialogPrivate +{ + GtkWidget *chooser; + GtkWidget *current_account_widget; + GtkWidget *main_vbox; + GtkWidget *connect_button; + + EmpathyAccountWidget *current_widget_object; + EmpathyAccountSettings *settings; +}; + +static void +account_created_cb (EmpathyAccountWidget *widget, + TpAccount *account, + EmpathyNewAccountDialog *self) +{ + gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK); +} + +static void +cancelled_cb (EmpathyAccountWidget *widget, + EmpathyNewAccountDialog *self) +{ + gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_CANCEL); +} + +static void +protocol_changed_cb (GtkComboBox *chooser, + EmpathyNewAccountDialog *self) +{ + EmpathyAccountSettings *settings; + GtkWidget *account_widget; + EmpathyAccountWidget *widget_object; + gchar *password = NULL, *account = NULL; + + settings = empathy_protocol_chooser_create_account_settings ( + EMPATHY_PROTOCOL_CHOOSER (chooser)); + + if (settings == NULL) + return; + + /* Save "account" and "password" parameters */ + if (self->priv->settings != NULL) + { + account = g_strdup (empathy_account_settings_get_string ( + self->priv->settings, "account")); + + password = g_strdup (empathy_account_settings_get_string ( + self->priv->settings, "password")); + + g_object_unref (self->priv->settings); + } + + widget_object = empathy_account_widget_new_for_protocol (settings, TRUE); + account_widget = empathy_account_widget_get_widget (widget_object); + + if (self->priv->current_account_widget != NULL) + { + g_signal_handlers_disconnect_by_func (self->priv->current_widget_object, + account_created_cb, self); + g_signal_handlers_disconnect_by_func (self->priv->current_widget_object, + cancelled_cb, self); + + gtk_widget_destroy (self->priv->current_account_widget); + } + + self->priv->current_account_widget = account_widget; + self->priv->current_widget_object = widget_object; + + self->priv->settings = settings; + + g_signal_connect (self->priv->current_widget_object, "account-created", + G_CALLBACK (account_created_cb), self); + g_signal_connect (self->priv->current_widget_object, "cancelled", + G_CALLBACK (cancelled_cb), self); + + /* Restore "account" and "password" parameters in the new widget */ + if (account != NULL) + { + empathy_account_widget_set_account_param (widget_object, account); + g_free (account); + } + + if (password != NULL) + { + empathy_account_widget_set_password_param (widget_object, password); + g_free (password); + } + + gtk_box_pack_start (GTK_BOX (self->priv->main_vbox), account_widget, + FALSE, FALSE, 0); + gtk_widget_show (account_widget); +} + +static void +empathy_new_account_dialog_init (EmpathyNewAccountDialog *self) +{ + GtkWidget *w, *hbox, *content; + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + EMPATHY_TYPE_NEW_ACCOUNT_DIALOG, EmpathyNewAccountDialogPrivate); + + self->priv->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); + gtk_container_set_border_width (GTK_CONTAINER (self->priv->main_vbox), 12); + gtk_widget_show (self->priv->main_vbox); + + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + gtk_box_pack_start (GTK_BOX (self->priv->main_vbox), hbox, FALSE, FALSE, 0); + gtk_widget_show (hbox); + + w = gtk_label_new (_("What kind of chat account do you have?")); + gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0); + gtk_widget_show (w); + + w = gtk_alignment_new (0, 0, 0, 0); + gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0); + gtk_box_pack_start (GTK_BOX (self->priv->main_vbox), w, FALSE, FALSE, 0); + gtk_widget_show (w); + + self->priv->chooser = empathy_protocol_chooser_new (); + gtk_box_pack_start (GTK_BOX (hbox), self->priv->chooser, FALSE, FALSE, 0); + gtk_widget_show (self->priv->chooser); + + content = gtk_dialog_get_content_area (GTK_DIALOG (self)); + gtk_container_add (GTK_CONTAINER (content), self->priv->main_vbox); + + g_signal_connect (self->priv->chooser, "changed", + G_CALLBACK (protocol_changed_cb), self); + + /* trigger show the first account widget */ + protocol_changed_cb (GTK_COMBO_BOX (self->priv->chooser), self); + + gtk_window_set_title (GTK_WINDOW (self), _("Adding new account")); +} + +static void +empathy_new_account_dialog_dispose (GObject *object) +{ + EmpathyNewAccountDialog *self = (EmpathyNewAccountDialog *) object; + + g_clear_object (&self->priv->settings); + + G_OBJECT_CLASS (empathy_new_account_dialog_parent_class)->dispose (object); +} + +static void +empathy_new_account_dialog_class_init (EmpathyNewAccountDialogClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->dispose = empathy_new_account_dialog_dispose; + + g_type_class_add_private (object_class, + sizeof (EmpathyNewAccountDialogPrivate)); +} + +GtkWidget * +empathy_new_account_dialog_new (GtkWindow *parent) +{ + GtkWidget *result; + + g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL); + + result = g_object_new (EMPATHY_TYPE_NEW_ACCOUNT_DIALOG, + "modal", TRUE, + "destroy-with-parent", TRUE, + NULL); + + if (parent != NULL) + gtk_window_set_transient_for (GTK_WINDOW (result), parent); + + return result; +} + +EmpathyAccountSettings * +empathy_new_account_dialog_get_settings (EmpathyNewAccountDialog *self) +{ + return self->priv->settings; +} diff --git a/libempathy-gtk/empathy-new-account-dialog.h b/libempathy-gtk/empathy-new-account-dialog.h new file mode 100644 index 00000000..07fc22f9 --- /dev/null +++ b/libempathy-gtk/empathy-new-account-dialog.h @@ -0,0 +1,59 @@ +/* + * empathy-new-account-dialog.h - Source for EmpathyNewAccountDialog + * + * Copyright (C) 2011 - Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with This library. If not, see . + */ + +#ifndef ___EMPATHY_NEW_ACCOUNT_DIALOG_H__ +#define ___EMPATHY_NEW_ACCOUNT_DIALOG_H__ + +#include + +#include + +G_BEGIN_DECLS + +#define EMPATHY_TYPE_NEW_ACCOUNT_DIALOG (empathy_new_account_dialog_get_type ()) +#define EMPATHY_NEW_ACCOUNT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_NEW_ACCOUNT_DIALOG, EmpathyNewAccountDialog)) +#define EMPATHY_NEW_ACCOUNT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_NEW_ACCOUNT_DIALOG, EmpathyNewAccountDialogClass)) +#define EMPATHY_IS_NEW_ACCOUNT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_NEW_ACCOUNT_DIALOG)) +#define EMPATHY_IS_NEW_ACCOUNT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_NEW_ACCOUNT_DIALOG)) +#define EMPATHY_NEW_ACCOUNT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_NEW_ACCOUNT_DIALOG, EmpathyNewAccountDialogClass)) + +typedef struct _EmpathyNewAccountDialog EmpathyNewAccountDialog; +typedef struct _EmpathyNewAccountDialogClass EmpathyNewAccountDialogClass; +typedef struct _EmpathyNewAccountDialogPrivate EmpathyNewAccountDialogPrivate; + +struct _EmpathyNewAccountDialog { + GtkDialog parent; + + EmpathyNewAccountDialogPrivate *priv; +}; + +struct _EmpathyNewAccountDialogClass { + GtkDialogClass parent_class; +}; + +GType empathy_new_account_dialog_get_type (void) G_GNUC_CONST; + +GtkWidget * empathy_new_account_dialog_new (GtkWindow *parent); + +EmpathyAccountSettings * empathy_new_account_dialog_get_settings ( + EmpathyNewAccountDialog *self); + +G_END_DECLS + +#endif /* ___EMPATHY_NEW_ACCOUNT_DIALOG_H__ */ diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c index 6c55f095..0fecedde 100644 --- a/libempathy-gtk/empathy-new-call-dialog.c +++ b/libempathy-gtk/empathy-new-call-dialog.c @@ -32,7 +32,6 @@ #include #include -#include #include #include diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 8ed1712a..3fcff98f 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -29,7 +29,6 @@ #include #include -#include #include #include diff --git a/libempathy-gtk/empathy-persona-store.c b/libempathy-gtk/empathy-persona-store.c deleted file mode 100644 index a48fa121..00000000 --- a/libempathy-gtk/empathy-persona-store.c +++ /dev/null @@ -1,1215 +0,0 @@ -/* - * Copyright (C) 2005-2007 Imendio AB - * Copyright (C) 2007-2008, 2010 Collabora Ltd. - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * Authors: Mikael Hallendal - * Martyn Russell - * Xavier Claessens - * Philip Withnall - * - * Based off EmpathyContactListStore. - */ - -#include "config.h" - -#include - -#include -#include -#include - -#include - -#include -#include - -#include - -#include "empathy-persona-store.h" -#include "empathy-gtk-enum-types.h" -#include "empathy-ui-utils.h" - -#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include - -/* Active users are those which have recently changed state - * (e.g. online, offline or from normal to a busy state). */ - -/* Time in seconds user is shown as active */ -#define ACTIVE_USER_SHOW_TIME 7 - -/* Time in seconds after connecting which we wait before active users are - * enabled */ -#define ACTIVE_USER_WAIT_TO_ENABLE_TIME 5 - -static void add_persona (EmpathyPersonaStore *self, - FolksPersona *persona); -static GtkTreePath * find_persona (EmpathyPersonaStore *self, - FolksPersona *persona); -static void update_persona (EmpathyPersonaStore *self, - FolksPersona *persona); -static void remove_persona (EmpathyPersonaStore *self, - FolksPersona *persona); - -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyPersonaStore) - -typedef struct -{ - FolksIndividual *individual; /* owned */ - GHashTable *personas; /* owned Persona -> owned GtkTreeRowReference */ - - gboolean show_avatars; - gboolean show_protocols; - gboolean show_active; - EmpathyPersonaStoreSort sort_criterion; - - guint inhibit_active; - guint setup_idle_id; - - GHashTable *status_icons; /* owned icon name -> owned GdkPixbuf */ -} EmpathyPersonaStorePriv; - -enum { - PROP_0, - PROP_INDIVIDUAL, - PROP_SHOW_AVATARS, - PROP_SHOW_PROTOCOLS, - PROP_SORT_CRITERION -}; - -G_DEFINE_TYPE (EmpathyPersonaStore, empathy_persona_store, GTK_TYPE_LIST_STORE); - -static gboolean -inhibit_active_cb (EmpathyPersonaStore *store) -{ - EmpathyPersonaStorePriv *priv; - - priv = GET_PRIV (store); - - priv->show_active = TRUE; - priv->inhibit_active = 0; - - return FALSE; -} - -typedef struct { - EmpathyPersonaStore *store; - FolksPersona *persona; - gboolean remove; - guint timeout; -} ShowActiveData; - -static void persona_active_free (ShowActiveData *data); - -static void -persona_active_invalidated (ShowActiveData *data, - GObject *old_object) -{ - /* Remove the timeout and free the struct, since the persona or persona - * store has disappeared. */ - g_source_remove (data->timeout); - - if (old_object == (GObject *) data->store) - data->store = NULL; - else if (old_object == (GObject *) data->persona) - data->persona = NULL; - else - g_assert_not_reached (); - - persona_active_free (data); -} - -static ShowActiveData * -persona_active_new (EmpathyPersonaStore *self, - FolksPersona *persona, - gboolean remove_) -{ - ShowActiveData *data; - - DEBUG ("Contact:'%s' now active, and %s be removed", - folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona)), - remove_ ? "WILL" : "WILL NOT"); - - data = g_slice_new0 (ShowActiveData); - - /* We don't actually want to force either the PersonaStore or the - * Persona to stay alive, since the user could quit Empathy or disable - * the account before the persona_active timeout is fired. */ - g_object_weak_ref (G_OBJECT (self), - (GWeakNotify) persona_active_invalidated, data); - g_object_weak_ref (G_OBJECT (persona), - (GWeakNotify) persona_active_invalidated, data); - - data->store = self; - data->persona = persona; - data->remove = remove_; - - return data; -} - -static void -persona_active_free (ShowActiveData *data) -{ - if (data->store != NULL) - { - g_object_weak_unref (G_OBJECT (data->store), - (GWeakNotify) persona_active_invalidated, data); - } - - if (data->persona != NULL) - { - g_object_weak_unref (G_OBJECT (data->persona), - (GWeakNotify) persona_active_invalidated, data); - } - - g_slice_free (ShowActiveData, data); -} - -static void -persona_set_active (EmpathyPersonaStore *self, - FolksPersona *persona, - gboolean active, - gboolean set_changed) -{ - GtkTreePath *path; - GtkTreeIter iter; - - path = find_persona (self, persona); - if (path == NULL) - return; - - gtk_tree_model_get_iter (GTK_TREE_MODEL (self), &iter, path); - gtk_list_store_set (GTK_LIST_STORE (self), &iter, - EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, active, - -1); - - DEBUG ("Set item %s", active ? "active" : "inactive"); - - if (set_changed) - gtk_tree_model_row_changed (GTK_TREE_MODEL (self), path, &iter); - - gtk_tree_path_free (path); -} - -static gboolean -persona_active_cb (ShowActiveData *data) -{ - const gchar *alias = - folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (data->persona)); - - if (data->remove) - { - DEBUG ("Contact:'%s' active timeout, removing item", alias); - remove_persona (data->store, data->persona); - } - - DEBUG ("Contact:'%s' no longer active", alias); - persona_set_active (data->store, data->persona, FALSE, TRUE); - - persona_active_free (data); - - return FALSE; -} - -static void -persona_updated_cb (FolksPersona *persona, - GParamSpec *pspec, - EmpathyPersonaStore *self) -{ - DEBUG ("Contact:'%s' updated, checking roster is in sync...", - folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona))); - - update_persona (self, persona); -} - -static void -add_persona_and_connect (EmpathyPersonaStore *self, - FolksPersona *persona) -{ - /* We don't want any non-Telepathy personas */ - if (!TPF_IS_PERSONA (persona)) - return; - - g_signal_connect (persona, "notify::presence", - (GCallback) persona_updated_cb, self); - g_signal_connect (persona, "notify::presence-message", - (GCallback) persona_updated_cb, self); - g_signal_connect (persona, "notify::alias", - (GCallback) persona_updated_cb, self); - g_signal_connect (persona, "notify::avatar", - (GCallback) persona_updated_cb, self); - - add_persona (self, persona); -} - -static void -remove_persona_and_disconnect (EmpathyPersonaStore *self, - FolksPersona *persona) -{ - if (!TPF_IS_PERSONA (persona)) - return; - - g_signal_handlers_disconnect_by_func (persona, - (GCallback) persona_updated_cb, self); - - remove_persona (self, persona); -} - -static void -add_persona (EmpathyPersonaStore *self, - FolksPersona *persona) -{ - EmpathyPersonaStorePriv *priv; - GtkTreeIter iter; - GtkTreePath *path; - FolksPersonaStore *store; - TpContact *tp_contact; - EmpathyContact *contact; - const gchar *alias; - - if (!TPF_IS_PERSONA (persona)) - return; - - priv = GET_PRIV (self); - - alias = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona)); - if (EMP_STR_EMPTY (alias)) - return; - - tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona)); - if (tp_contact == NULL) - return; - - contact = empathy_contact_dup_from_tp_contact (tp_contact); - store = folks_persona_get_store (persona); - - gtk_list_store_insert_with_values (GTK_LIST_STORE (self), &iter, 0, - EMPATHY_PERSONA_STORE_COL_NAME, alias, - EMPATHY_PERSONA_STORE_COL_ACCOUNT_NAME, - folks_persona_store_get_display_name (store), - EMPATHY_PERSONA_STORE_COL_DISPLAY_ID, - folks_persona_get_display_id (persona), - EMPATHY_PERSONA_STORE_COL_PERSONA, persona, - EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL, - empathy_contact_get_capabilities (contact) & - EMPATHY_CAPABILITIES_AUDIO, - EMPATHY_PERSONA_STORE_COL_CAN_VIDEO_CALL, - empathy_contact_get_capabilities (contact) & - EMPATHY_CAPABILITIES_VIDEO, - -1); - - g_object_unref (contact); - - path = gtk_tree_model_get_path (GTK_TREE_MODEL (self), &iter); - g_hash_table_replace (priv->personas, g_object_ref (persona), - gtk_tree_row_reference_new (GTK_TREE_MODEL (self), path)); - gtk_tree_path_free (path); - - update_persona (self, persona); -} - -static void -remove_persona (EmpathyPersonaStore *self, - FolksPersona *persona) -{ - EmpathyPersonaStorePriv *priv; - GtkTreePath *path; - GtkTreeIter iter; - - if (!TPF_IS_PERSONA (persona)) - return; - - priv = GET_PRIV (self); - - path = find_persona (self, persona); - if (path == NULL) - return; - - g_hash_table_remove (priv->personas, persona); - - gtk_tree_model_get_iter (GTK_TREE_MODEL (self), &iter, path); - gtk_list_store_remove (GTK_LIST_STORE (self), &iter); - gtk_tree_path_free (path); -} - -static GdkPixbuf * -get_persona_status_icon (EmpathyPersonaStore *self, - FolksPersona *persona) -{ - EmpathyPersonaStorePriv *priv = GET_PRIV (self); - TpContact *tp_contact; - EmpathyContact *contact; - const gchar *protocol_name = NULL; - gchar *icon_name = NULL; - GdkPixbuf *pixbuf_status = NULL; - const gchar *status_icon_name = NULL; - - tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona)); - if (tp_contact == NULL) - return NULL; - - contact = empathy_contact_dup_from_tp_contact (tp_contact); - - status_icon_name = empathy_icon_name_for_contact (contact); - if (status_icon_name == NULL) - { - g_object_unref (contact); - return NULL; - } - - if (priv->show_protocols) - { - protocol_name = empathy_protocol_name_for_contact (contact); - icon_name = g_strdup_printf ("%s-%s", status_icon_name, protocol_name); - } - else - { - icon_name = g_strdup_printf ("%s", status_icon_name); - } - - pixbuf_status = g_hash_table_lookup (priv->status_icons, icon_name); - - if (pixbuf_status == NULL) - { - pixbuf_status = empathy_pixbuf_contact_status_icon_with_icon_name ( - contact, status_icon_name, priv->show_protocols); - - if (pixbuf_status != NULL) - { - g_hash_table_insert (priv->status_icons, g_strdup (icon_name), - pixbuf_status); - } - } - - g_object_unref (contact); - g_free (icon_name); - - return pixbuf_status; -} - -static void -update_persona (EmpathyPersonaStore *self, - FolksPersona *persona) -{ - EmpathyPersonaStorePriv *priv = GET_PRIV (self); - GtkTreePath *path; - gboolean do_set_active = FALSE; - gboolean do_set_refresh = FALSE; - const gchar *alias; - - path = find_persona (self, persona); - alias = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona)); - - if (path == NULL) - { - DEBUG ("Contact:'%s' in list:NO, should be:YES", alias); - - add_persona (self, persona); - - if (priv->show_active) - { - do_set_active = TRUE; - DEBUG ("Set active (contact added)"); - } - } - else - { - FolksPersonaStore *store; - TpContact *tp_contact; - EmpathyContact *contact; - GtkTreeIter iter; - GdkPixbuf *pixbuf_avatar = NULL; - GdkPixbuf *pixbuf_status; - gboolean now_online = FALSE; - gboolean was_online = TRUE; - - DEBUG ("Contact:'%s' in list:YES, should be:YES", alias); - - gtk_tree_model_get_iter (GTK_TREE_MODEL (self), &iter, path); - gtk_tree_path_free (path); - - /* Get online state now. */ - now_online = folks_presence_details_is_online ( - FOLKS_PRESENCE_DETAILS (persona)); - - /* Get online state before. */ - gtk_tree_model_get (GTK_TREE_MODEL (self), &iter, - EMPATHY_PERSONA_STORE_COL_IS_ONLINE, &was_online, - -1); - - /* Is this really an update or an online/offline. */ - if (priv->show_active) - { - if (was_online != now_online) - { - do_set_active = TRUE; - do_set_refresh = TRUE; - - DEBUG ("Set active (contact updated %s)", - was_online ? "online -> offline" : "offline -> online"); - } - else - { - /* Was TRUE for presence updates. */ - /* do_set_active = FALSE; */ - do_set_refresh = TRUE; - DEBUG ("Set active (contact updated)"); - } - } - - /* We still need to use EmpathyContact for the capabilities stuff */ - tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona)); - if (tp_contact != NULL) - { - contact = empathy_contact_dup_from_tp_contact (tp_contact); - store = folks_persona_get_store (persona); - - pixbuf_avatar = empathy_pixbuf_avatar_from_contact_scaled (contact, - 32, 32); - pixbuf_status = get_persona_status_icon (self, persona); - - gtk_list_store_set (GTK_LIST_STORE (self), &iter, - EMPATHY_PERSONA_STORE_COL_ICON_STATUS, pixbuf_status, - EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR, pixbuf_avatar, - EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR_VISIBLE, - priv->show_avatars, - EMPATHY_PERSONA_STORE_COL_NAME, alias, - EMPATHY_PERSONA_STORE_COL_ACCOUNT_NAME, - folks_persona_store_get_display_name (store), - EMPATHY_PERSONA_STORE_COL_DISPLAY_ID, - folks_persona_get_display_id (persona), - EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE, - folks_presence_details_get_presence_type ( - FOLKS_PRESENCE_DETAILS (persona)), - EMPATHY_PERSONA_STORE_COL_STATUS, - folks_presence_details_get_presence_message ( - FOLKS_PRESENCE_DETAILS (persona)), - EMPATHY_PERSONA_STORE_COL_IS_ONLINE, now_online, - EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL, - empathy_contact_get_capabilities (contact) & - EMPATHY_CAPABILITIES_AUDIO, - EMPATHY_PERSONA_STORE_COL_CAN_VIDEO_CALL, - empathy_contact_get_capabilities (contact) & - EMPATHY_CAPABILITIES_VIDEO, - -1); - - g_object_unref (contact); - } - - if (pixbuf_avatar) - g_object_unref (pixbuf_avatar); - } - - if (priv->show_active && do_set_active) - { - persona_set_active (self, persona, do_set_active, do_set_refresh); - - if (do_set_active) - { - ShowActiveData *data; - - data = persona_active_new (self, persona, FALSE); - data->timeout = g_timeout_add_seconds (ACTIVE_USER_SHOW_TIME, - (GSourceFunc) persona_active_cb, - data); - } - } - - /* FIXME: when someone goes online then offline quickly, the - * first timeout sets the user to be inactive and the second - * timeout removes the user from the contact list, really we - * should remove the first timeout. - */ -} - -static void -individual_personas_changed_cb (GObject *object, - GeeSet *added, - GeeSet *removed, - EmpathyPersonaStore *self) -{ - GeeIterator *iter; - - /* One of the personas' row references might hold the last reference to the - * PersonaStore, so we need to keep a reference ourselves so we don't get - * finalised. */ - g_object_ref (self); - - /* Remove the old personas. */ - iter = gee_iterable_iterator (GEE_ITERABLE (removed)); - while (gee_iterator_next (iter)) - { - FolksPersona *persona = gee_iterator_get (iter); - remove_persona_and_disconnect (self, persona); - g_clear_object (&persona); - } - g_clear_object (&iter); - - /* Add each of the new personas to the tree model */ - iter = gee_iterable_iterator (GEE_ITERABLE (added)); - while (gee_iterator_next (iter)) - { - FolksPersona *persona = gee_iterator_get (iter); - add_persona_and_connect (self, persona); - g_clear_object (&persona); - } - g_clear_object (&iter); - - g_object_unref (self); -} - -static gint -sort_personas (FolksPersona *persona_a, - FolksPersona *persona_b) -{ - EmpathyContact *contact; - TpAccount *account_a, *account_b; - TpContact *tp_contact_a, *tp_contact_b; - gint ret_val; - - g_return_val_if_fail (persona_a != NULL || persona_b != NULL, 0); - - /* alias */ - ret_val = g_utf8_collate ( - folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona_a)), - folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona_b))); - - if (ret_val != 0) - goto out; - - /* identifier */ - ret_val = g_utf8_collate (folks_persona_get_display_id (persona_a), - folks_persona_get_display_id (persona_b)); - - if (ret_val != 0) - goto out; - - tp_contact_a = tpf_persona_get_contact (TPF_PERSONA (persona_a)); - tp_contact_b = tpf_persona_get_contact (TPF_PERSONA (persona_b)); - - /* handle the case that one or more of these personas are from the cache */ - if (tp_contact_a == NULL || tp_contact_b == NULL) - { - ret_val = (tp_contact_a != NULL ? 1 : -1); - goto out; - } - - contact = empathy_contact_dup_from_tp_contact (tp_contact_a); - account_a = empathy_contact_get_account (contact); - g_object_unref (contact); - - contact = empathy_contact_dup_from_tp_contact (tp_contact_b); - account_b = empathy_contact_get_account (contact); - g_object_unref (contact); - - /* protocol */ - ret_val = strcmp (tp_account_get_protocol (account_a), - tp_account_get_protocol (account_b)); - - if (ret_val != 0) - goto out; - - /* account ID */ - ret_val = strcmp (tp_proxy_get_object_path (account_a), - tp_proxy_get_object_path (account_b)); - -out: - return ret_val; -} - -static gint -state_sort_func (GtkTreeModel *model, - GtkTreeIter *iter_a, - GtkTreeIter *iter_b, - gpointer user_data) -{ - gint ret_val; - gchar *name_a, *name_b; - FolksPersona *persona_a, *persona_b; - - gtk_tree_model_get (model, iter_a, - EMPATHY_PERSONA_STORE_COL_NAME, &name_a, - EMPATHY_PERSONA_STORE_COL_PERSONA, &persona_a, - -1); - gtk_tree_model_get (model, iter_b, - EMPATHY_PERSONA_STORE_COL_NAME, &name_b, - EMPATHY_PERSONA_STORE_COL_PERSONA, &persona_b, - -1); - - if (persona_a == NULL || persona_b == NULL) { - ret_val = 0; - goto free_and_out; - } - - /* If we managed to get this far, we can start looking at - * the presences. - */ - ret_val = -tp_connection_presence_type_cmp_availability ( - folks_presence_details_get_presence_type ( - FOLKS_PRESENCE_DETAILS (persona_a)), - folks_presence_details_get_presence_type ( - FOLKS_PRESENCE_DETAILS (persona_b))); - - if (ret_val == 0) { - /* Fallback: compare by name et al. */ - ret_val = sort_personas (persona_a, persona_b); - } - -free_and_out: - g_free (name_a); - g_free (name_b); - - tp_clear_object (&persona_a); - tp_clear_object (&persona_b); - - return ret_val; -} - -static gint -name_sort_func (GtkTreeModel *model, - GtkTreeIter *iter_a, - GtkTreeIter *iter_b, - gpointer user_data) -{ - gchar *name_a, *name_b; - FolksPersona *persona_a, *persona_b; - gint ret_val; - - gtk_tree_model_get (model, iter_a, - EMPATHY_PERSONA_STORE_COL_NAME, &name_a, - EMPATHY_PERSONA_STORE_COL_PERSONA, &persona_a, - -1); - gtk_tree_model_get (model, iter_b, - EMPATHY_PERSONA_STORE_COL_NAME, &name_b, - EMPATHY_PERSONA_STORE_COL_PERSONA, &persona_b, - -1); - - if (persona_a == NULL || persona_b == NULL) - ret_val = 0; - else - ret_val = sort_personas (persona_a, persona_b); - - tp_clear_object (&persona_a); - tp_clear_object (&persona_b); - - return ret_val; -} - -static GtkTreePath * -find_persona (EmpathyPersonaStore *self, - FolksPersona *persona) -{ - EmpathyPersonaStorePriv *priv = GET_PRIV (self); - GtkTreeRowReference *row; - - row = g_hash_table_lookup (priv->personas, persona); - if (row == NULL) - return NULL; - - return gtk_tree_row_reference_get_path (row); -} - -static gboolean -update_list_mode_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - EmpathyPersonaStore *self) -{ - EmpathyPersonaStorePriv *priv; - FolksPersona *persona; - GdkPixbuf *pixbuf_status; - - priv = GET_PRIV (self); - - gtk_tree_model_get (model, iter, - EMPATHY_PERSONA_STORE_COL_PERSONA, &persona, - -1); - - if (persona == NULL) - return FALSE; - - /* get icon from hash_table */ - pixbuf_status = get_persona_status_icon (self, persona); - - gtk_list_store_set (GTK_LIST_STORE (self), iter, - EMPATHY_PERSONA_STORE_COL_ICON_STATUS, pixbuf_status, - EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR_VISIBLE, priv->show_avatars, - -1); - - tp_clear_object (&persona); - - return FALSE; -} - -static void -set_up (EmpathyPersonaStore *self) -{ - EmpathyPersonaStorePriv *priv; - GType types[] = { - GDK_TYPE_PIXBUF, /* Status pixbuf */ - GDK_TYPE_PIXBUF, /* Avatar pixbuf */ - G_TYPE_BOOLEAN, /* Avatar pixbuf visible */ - G_TYPE_STRING, /* Name */ - G_TYPE_STRING, /* Account name */ - G_TYPE_STRING, /* Display ID */ - G_TYPE_UINT, /* Presence type */ - G_TYPE_STRING, /* Status string */ - FOLKS_TYPE_PERSONA, /* Persona */ - G_TYPE_BOOLEAN, /* Is active */ - G_TYPE_BOOLEAN, /* Is online */ - G_TYPE_BOOLEAN, /* Can make audio calls */ - G_TYPE_BOOLEAN, /* Can make video calls */ - }; - - priv = GET_PRIV (self); - - gtk_list_store_set_column_types (GTK_LIST_STORE (self), - EMPATHY_PERSONA_STORE_COL_COUNT, types); - - /* Set up sorting */ - gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (self), - EMPATHY_PERSONA_STORE_COL_NAME, name_sort_func, self, NULL); - gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (self), - EMPATHY_PERSONA_STORE_COL_STATUS, state_sort_func, self, NULL); - - priv->sort_criterion = EMPATHY_PERSONA_STORE_SORT_NAME; - empathy_persona_store_set_sort_criterion (self, priv->sort_criterion); -} - -static void -empathy_persona_store_init (EmpathyPersonaStore *self) -{ - EmpathyPersonaStorePriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - EMPATHY_TYPE_PERSONA_STORE, EmpathyPersonaStorePriv); - - self->priv = priv; - - priv->show_avatars = TRUE; - priv->show_protocols = FALSE; - priv->inhibit_active = g_timeout_add_seconds (ACTIVE_USER_WAIT_TO_ENABLE_TIME, - (GSourceFunc) inhibit_active_cb, self); - - priv->status_icons = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, - g_object_unref); - priv->personas = g_hash_table_new_full (g_direct_hash, g_direct_equal, - g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - - set_up (self); -} - -static void -get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - EmpathyPersonaStorePriv *priv = GET_PRIV (object); - - switch (param_id) - { - case PROP_INDIVIDUAL: - g_value_set_object (value, priv->individual); - break; - case PROP_SHOW_AVATARS: - g_value_set_boolean (value, priv->show_avatars); - break; - case PROP_SHOW_PROTOCOLS: - g_value_set_boolean (value, priv->show_protocols); - break; - case PROP_SORT_CRITERION: - g_value_set_enum (value, priv->sort_criterion); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - EmpathyPersonaStore *self = EMPATHY_PERSONA_STORE (object); - - switch (param_id) - { - case PROP_INDIVIDUAL: - empathy_persona_store_set_individual (self, g_value_get_object (value)); - break; - case PROP_SHOW_AVATARS: - empathy_persona_store_set_show_avatars (self, - g_value_get_boolean (value)); - break; - case PROP_SHOW_PROTOCOLS: - empathy_persona_store_set_show_protocols (self, - g_value_get_boolean (value)); - break; - case PROP_SORT_CRITERION: - empathy_persona_store_set_sort_criterion (self, - g_value_get_enum (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -dispose (GObject *object) -{ - EmpathyPersonaStorePriv *priv = GET_PRIV (object); - - empathy_persona_store_set_individual (EMPATHY_PERSONA_STORE (object), NULL); - - if (priv->inhibit_active != 0) - { - g_source_remove (priv->inhibit_active); - priv->inhibit_active = 0; - } - - if (priv->setup_idle_id != 0) - { - g_source_remove (priv->setup_idle_id); - priv->setup_idle_id = 0; - } - - G_OBJECT_CLASS (empathy_persona_store_parent_class)->dispose (object); -} - -static void -finalize (GObject *object) -{ - EmpathyPersonaStorePriv *priv = GET_PRIV (object); - - g_hash_table_unref (priv->status_icons); - g_hash_table_unref (priv->personas); - - G_OBJECT_CLASS (empathy_persona_store_parent_class)->finalize (object); -} - -static void -empathy_persona_store_class_init (EmpathyPersonaStoreClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->get_property = get_property; - object_class->set_property = set_property; - object_class->dispose = dispose; - object_class->finalize = finalize; - - /** - * EmpathyPersonaStore:individual: - * - * The #FolksIndividual whose personas should be listed by the store. This - * may be %NULL, which results in an empty store. - */ - g_object_class_install_property (object_class, PROP_INDIVIDUAL, - g_param_spec_object ("individual", - "Individual", - "The FolksIndividual whose Personas should be listed by the store.", - FOLKS_TYPE_INDIVIDUAL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - * EmpathyPersonaStore:show-avatars: - * - * Whether the store should display avatars for personas. This is a property - * of the store rather than of #EmpathyPersonaView for efficiency reasons. - */ - g_object_class_install_property (object_class, PROP_SHOW_AVATARS, - g_param_spec_boolean ("show-avatars", - "Show Avatars", - "Whether the store should display avatars for personas.", - TRUE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - * EmpathyPersonaStore:show-protocols: - * - * Whether the store should display protocol icons for personas. This is a - * property of the store rather than of #EmpathyPersonaView because it is - * closely tied in with #EmpathyPersonaStore:show-avatars. - */ - g_object_class_install_property (object_class, PROP_SHOW_PROTOCOLS, - g_param_spec_boolean ("show-protocols", - "Show Protocols", - "Whether the store should display protocol icons for personas.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - * EmpathyPersonaStore:sort-criterion: - * - * The criterion used to sort the personas in the store. - */ - g_object_class_install_property (object_class, PROP_SORT_CRITERION, - g_param_spec_enum ("sort-criterion", - "Sort criterion", - "The sort criterion to use for sorting the persona list", - EMPATHY_TYPE_PERSONA_STORE_SORT, - EMPATHY_PERSONA_STORE_SORT_NAME, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - g_type_class_add_private (object_class, sizeof (EmpathyPersonaStorePriv)); -} - -/** - * empathy_persona_store_new: - * @individual: the #FolksIndividual whose personas should be used in the store, - * or %NULL - * - * Create a new #EmpathyPersonaStore with the personas from the given - * @individual. - * - * Return value: a new #EmpathyPersonaStore - */ -EmpathyPersonaStore * -empathy_persona_store_new (FolksIndividual *individual) -{ - g_return_val_if_fail (individual == NULL || FOLKS_IS_INDIVIDUAL (individual), - NULL); - - return g_object_new (EMPATHY_TYPE_PERSONA_STORE, - "individual", individual, NULL); -} - -/** - * empathy_persona_store_get_individual: - * @self: an #EmpathyPersonaStore - * - * Get the value of #EmpathyPersonaStore:individual. - * - * Return value: the individual being displayed by the store, or %NULL - */ -FolksIndividual * -empathy_persona_store_get_individual (EmpathyPersonaStore *self) -{ - g_return_val_if_fail (EMPATHY_IS_PERSONA_STORE (self), NULL); - - return GET_PRIV (self)->individual; -} - -/** - * empathy_persona_store_set_individual: - * @self: an #EmpathyPersonaStore - * @individual: the new individual to display in the store, or %NULL - * - * Set #EmpathyPersonaStore:individual to @individual, replacing the personas - * which were in the store with the personas belonging to @individual, or with - * nothing if @individual is %NULL. - */ -void -empathy_persona_store_set_individual (EmpathyPersonaStore *self, - FolksIndividual *individual) -{ - EmpathyPersonaStorePriv *priv; - - g_return_if_fail (EMPATHY_IS_PERSONA_STORE (self)); - g_return_if_fail (individual == NULL || FOLKS_IS_INDIVIDUAL (individual)); - - priv = GET_PRIV (self); - - /* Remove the old individual */ - if (priv->individual != NULL) - { - GeeSet *personas; - GeeIterator *iter; - - g_signal_handlers_disconnect_by_func (priv->individual, - (GCallback) individual_personas_changed_cb, self); - - /* Disconnect from and remove all personas belonging to this individual */ - personas = folks_individual_get_personas (priv->individual); - iter = gee_iterable_iterator (GEE_ITERABLE (personas)); - while (gee_iterator_next (iter)) - { - FolksPersona *persona = gee_iterator_get (iter); - remove_persona_and_disconnect (self, persona); - g_clear_object (&persona); - } - g_clear_object (&iter); - - g_object_unref (priv->individual); - } - - priv->individual = individual; - - /* Add the new individual */ - if (individual != NULL) - { - GeeSet *personas; - GeeIterator *iter; - - g_object_ref (individual); - - g_signal_connect (individual, "personas-changed", - (GCallback) individual_personas_changed_cb, self); - - /* Add pre-existing Personas */ - - personas = folks_individual_get_personas (individual); - iter = gee_iterable_iterator (GEE_ITERABLE (personas)); - while (gee_iterator_next (iter)) - { - FolksPersona *persona = gee_iterator_get (iter); - add_persona_and_connect (self, persona); - g_clear_object (&persona); - } - g_clear_object (&iter); - } - - g_object_notify (G_OBJECT (self), "individual"); -} - -/** - * empathy_persona_store_get_show_avatars: - * @self: an #EmpathyPersonaStore - * - * Get the value of #EmpathyPersonaStore:show-avatars. - * - * Return value: %TRUE if avatars are made available by the store, %FALSE - * otherwise - */ -gboolean -empathy_persona_store_get_show_avatars (EmpathyPersonaStore *self) -{ - g_return_val_if_fail (EMPATHY_IS_PERSONA_STORE (self), TRUE); - - return GET_PRIV (self)->show_avatars; -} - -/** - * empathy_persona_store_set_show_avatars: - * @self: an #EmpathyPersonaStore - * @show_avatars: %TRUE to make avatars available through the store, %FALSE - * otherwise - * - * Set #EmpathyPersonaStore:show-avatars to @show_avatars. - */ -void -empathy_persona_store_set_show_avatars (EmpathyPersonaStore *self, - gboolean show_avatars) -{ - EmpathyPersonaStorePriv *priv; - - g_return_if_fail (EMPATHY_IS_PERSONA_STORE (self)); - - priv = GET_PRIV (self); - priv->show_avatars = show_avatars; - - gtk_tree_model_foreach (GTK_TREE_MODEL (self), - (GtkTreeModelForeachFunc) update_list_mode_foreach, self); - - g_object_notify (G_OBJECT (self), "show-avatars"); -} - -/** - * empathy_persona_store_get_show_protocols: - * @self: an #EmpathyPersonaStore - * - * Get the value of #EmpathyPersonaStore:show-protocols. - * - * Return value: %TRUE if protocol images are made available by the store, - * %FALSE otherwise - */ -gboolean -empathy_persona_store_get_show_protocols (EmpathyPersonaStore *self) -{ - g_return_val_if_fail (EMPATHY_IS_PERSONA_STORE (self), TRUE); - - return GET_PRIV (self)->show_protocols; -} - -/** - * empathy_persona_store_set_show_protocols: - * @self: an #EmpathyPersonaStore - * @show_protocols: %TRUE to make protocol images available through the store, - * %FALSE otherwise - * - * Set #EmpathyPersonaStore:show-protocols to @show_protocols. - */ -void -empathy_persona_store_set_show_protocols (EmpathyPersonaStore *self, - gboolean show_protocols) -{ - EmpathyPersonaStorePriv *priv; - - g_return_if_fail (EMPATHY_IS_PERSONA_STORE (self)); - - priv = GET_PRIV (self); - priv->show_protocols = show_protocols; - - gtk_tree_model_foreach (GTK_TREE_MODEL (self), - (GtkTreeModelForeachFunc) update_list_mode_foreach, self); - - g_object_notify (G_OBJECT (self), "show-protocols"); -} - -/** - * empathy_persona_store_get_sort_criterion: - * @self: an #EmpathyPersonaStore - * - * Get the value of #EmpathyPersonaStore:sort-criterion. - * - * Return value: the criterion used to sort the personas in the store - */ -EmpathyPersonaStoreSort -empathy_persona_store_get_sort_criterion (EmpathyPersonaStore *self) -{ - g_return_val_if_fail (EMPATHY_IS_PERSONA_STORE (self), 0); - - return GET_PRIV (self)->sort_criterion; -} - -/** - * empathy_persona_store_set_sort_criterion: - * @self: an #EmpathyPersonaStore - * @show_avatars: a criterion to be used to sort personas in the store - * - * Set #EmpathyPersonaStore:sort-criterion to @sort_criterion. - */ -void -empathy_persona_store_set_sort_criterion (EmpathyPersonaStore *self, - EmpathyPersonaStoreSort sort_criterion) -{ - EmpathyPersonaStorePriv *priv; - - g_return_if_fail (EMPATHY_IS_PERSONA_STORE (self)); - - priv = GET_PRIV (self); - priv->sort_criterion = sort_criterion; - - switch (sort_criterion) - { - case EMPATHY_PERSONA_STORE_SORT_STATE: - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self), - EMPATHY_PERSONA_STORE_COL_STATUS, GTK_SORT_ASCENDING); - break; - case EMPATHY_PERSONA_STORE_SORT_NAME: - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self), - EMPATHY_PERSONA_STORE_COL_NAME, GTK_SORT_ASCENDING); - break; - default: - g_assert_not_reached (); - break; - } - - g_object_notify (G_OBJECT (self), "sort-criterion"); -} diff --git a/libempathy-gtk/empathy-persona-store.h b/libempathy-gtk/empathy-persona-store.h deleted file mode 100644 index 892f8fa7..00000000 --- a/libempathy-gtk/empathy-persona-store.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2005-2007 Imendio AB - * Copyright (C) 2007-2008, 2010 Collabora Ltd. - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * Authors: Mikael Hallendal - * Martyn Russell - * Xavier Claessens - * Philip Withnall - * - * Based off EmpathyContactListStore. - */ - -#ifndef __EMPATHY_PERSONA_STORE_H__ -#define __EMPATHY_PERSONA_STORE_H__ - -#include - -#include - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_PERSONA_STORE (empathy_persona_store_get_type ()) -#define EMPATHY_PERSONA_STORE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \ - EMPATHY_TYPE_PERSONA_STORE, EmpathyPersonaStore)) -#define EMPATHY_PERSONA_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \ - EMPATHY_TYPE_PERSONA_STORE, EmpathyPersonaStoreClass)) -#define EMPATHY_IS_PERSONA_STORE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \ - EMPATHY_TYPE_PERSONA_STORE)) -#define EMPATHY_IS_PERSONA_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \ - EMPATHY_TYPE_PERSONA_STORE)) -#define EMPATHY_PERSONA_STORE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \ - EMPATHY_TYPE_PERSONA_STORE, EmpathyPersonaStoreClass)) - -typedef enum -{ - EMPATHY_PERSONA_STORE_SORT_STATE, - EMPATHY_PERSONA_STORE_SORT_NAME -} EmpathyPersonaStoreSort; - -typedef enum -{ - EMPATHY_PERSONA_STORE_COL_ICON_STATUS, - EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR, - EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR_VISIBLE, - EMPATHY_PERSONA_STORE_COL_NAME, - EMPATHY_PERSONA_STORE_COL_ACCOUNT_NAME, - EMPATHY_PERSONA_STORE_COL_DISPLAY_ID, - EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE, - EMPATHY_PERSONA_STORE_COL_STATUS, - EMPATHY_PERSONA_STORE_COL_PERSONA, - EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, - EMPATHY_PERSONA_STORE_COL_IS_ONLINE, - EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL, - EMPATHY_PERSONA_STORE_COL_CAN_VIDEO_CALL, - EMPATHY_PERSONA_STORE_COL_COUNT, -} EmpathyPersonaStoreCol; - -typedef struct -{ - GtkListStore parent; - gpointer priv; -} EmpathyPersonaStore; - -typedef struct -{ - GtkListStoreClass parent_class; -} EmpathyPersonaStoreClass; - -GType empathy_persona_store_get_type (void) G_GNUC_CONST; - -EmpathyPersonaStore *empathy_persona_store_new (FolksIndividual *individual); - -FolksIndividual *empathy_persona_store_get_individual ( - EmpathyPersonaStore *self); -void empathy_persona_store_set_individual (EmpathyPersonaStore *self, - FolksIndividual *individual); - -gboolean empathy_persona_store_get_show_avatars (EmpathyPersonaStore *self); -void empathy_persona_store_set_show_avatars (EmpathyPersonaStore *self, - gboolean show_avatars); - -gboolean empathy_persona_store_get_show_protocols (EmpathyPersonaStore *self); -void empathy_persona_store_set_show_protocols (EmpathyPersonaStore *self, - gboolean show_protocols); - -EmpathyPersonaStoreSort empathy_persona_store_get_sort_criterion ( - EmpathyPersonaStore *self); -void empathy_persona_store_set_sort_criterion (EmpathyPersonaStore *self, - EmpathyPersonaStoreSort sort_criterion); - -G_END_DECLS - -#endif /* __EMPATHY_PERSONA_STORE_H__ */ diff --git a/libempathy-gtk/empathy-persona-view.c b/libempathy-gtk/empathy-persona-view.c deleted file mode 100644 index 7df94a63..00000000 --- a/libempathy-gtk/empathy-persona-view.c +++ /dev/null @@ -1,844 +0,0 @@ -/* - * Copyright (C) 2005-2007 Imendio AB - * Copyright (C) 2007-2008, 2010 Collabora Ltd. - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * Authors: Mikael Hallendal - * Martyn Russell - * Xavier Claessens - * Philip Withnall - * - * Based off EmpathyContactListView. - */ - -#include "config.h" - -#include - -#include -#include - -#include - -#include -#include - -#include -#include - -#include "empathy-persona-view.h" -#include "empathy-contact-widget.h" -#include "empathy-images.h" -#include "empathy-cell-renderer-text.h" -#include "empathy-cell-renderer-activatable.h" -#include "empathy-gtk-enum-types.h" -#include "empathy-ui-utils.h" - -#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include - -/** - * SECTION:empathy-persona-view - * @title: EmpathyPersonaView - * @short_description: A tree view which displays personas from an individual - * @include: libempathy-gtk/empathy-persona-view.h - * - * #EmpathyPersonaView is a tree view widget which displays the personas from - * a given #EmpathyPersonaStore. - * - * It supports hiding offline personas and highlighting active personas. Active - * personas are those which have recently changed state (e.g. online, offline or - * from normal to a busy state). - */ - -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyPersonaView) - -typedef struct -{ - GtkTreeModelFilter *filter; - GtkWidget *tooltip_widget; - gboolean show_offline; - EmpathyPersonaViewFeatureFlags features; -} EmpathyPersonaViewPriv; - -enum -{ - PROP_0, - PROP_MODEL, - PROP_SHOW_OFFLINE, - PROP_FEATURES, -}; - -typedef enum -{ - DND_DRAG_TYPE_UNKNOWN = -1, - DND_DRAG_TYPE_INDIVIDUAL_ID = 0, - DND_DRAG_TYPE_PERSONA_ID, - DND_DRAG_TYPE_STRING, -} DndDragType; - -#define DRAG_TYPE(T,I) \ - { (gchar *) T, 0, I } - -static const GtkTargetEntry drag_types_dest[] = { - DRAG_TYPE ("text/x-individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID), - DRAG_TYPE ("text/plain", DND_DRAG_TYPE_STRING), - DRAG_TYPE ("STRING", DND_DRAG_TYPE_STRING), -}; - -static const GtkTargetEntry drag_types_source[] = { - DRAG_TYPE ("text/x-persona-id", DND_DRAG_TYPE_PERSONA_ID), -}; - -#undef DRAG_TYPE - -static GdkAtom drag_atoms_dest[G_N_ELEMENTS (drag_types_dest)]; - -enum -{ - DRAG_INDIVIDUAL_RECEIVED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL]; - -G_DEFINE_TYPE (EmpathyPersonaView, empathy_persona_view, GTK_TYPE_TREE_VIEW); - -static gboolean -filter_visible_func (GtkTreeModel *model, - GtkTreeIter *iter, - EmpathyPersonaView *self) -{ - EmpathyPersonaViewPriv *priv = GET_PRIV (self); - gboolean is_online; - - gtk_tree_model_get (model, iter, - EMPATHY_PERSONA_STORE_COL_IS_ONLINE, &is_online, - -1); - - return (priv->show_offline || is_online); -} - -static void -set_model (EmpathyPersonaView *self, - GtkTreeModel *model) -{ - EmpathyPersonaViewPriv *priv = GET_PRIV (self); - - tp_clear_object (&priv->filter); - - priv->filter = GTK_TREE_MODEL_FILTER (gtk_tree_model_filter_new (model, - NULL)); - gtk_tree_model_filter_set_visible_func (priv->filter, - (GtkTreeModelFilterVisibleFunc) filter_visible_func, self, NULL); - - gtk_tree_view_set_model (GTK_TREE_VIEW (self), GTK_TREE_MODEL (priv->filter)); -} - -static void -tooltip_destroy_cb (GtkWidget *widget, - EmpathyPersonaView *self) -{ - EmpathyPersonaViewPriv *priv = GET_PRIV (self); - - if (priv->tooltip_widget) - { - DEBUG ("Tooltip destroyed"); - g_object_unref (priv->tooltip_widget); - priv->tooltip_widget = NULL; - } -} - -static gboolean -query_tooltip_cb (EmpathyPersonaView *self, - gint x, - gint y, - gboolean keyboard_mode, - GtkTooltip *tooltip, - gpointer user_data) -{ - EmpathyPersonaViewPriv *priv = GET_PRIV (self); - FolksPersona *persona; - TpContact *tp_contact; - EmpathyContact *contact; - GtkTreeModel *model; - GtkTreeIter iter; - GtkTreePath *path; - static gint running = 0; - gboolean ret = FALSE; - - /* Avoid an infinite loop. See GNOME bug #574377 */ - if (running > 0) - return FALSE; - running++; - - if (!gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (self), &x, &y, - keyboard_mode, &model, &path, &iter)) - { - goto OUT; - } - - gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (self), tooltip, path); - gtk_tree_path_free (path); - - gtk_tree_model_get (model, &iter, - EMPATHY_PERSONA_STORE_COL_PERSONA, &persona, - -1); - if (persona == NULL) - goto OUT; - - tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona)); - if (tp_contact == NULL) - { - g_clear_object (&persona); - goto OUT; - } - - contact = empathy_contact_dup_from_tp_contact (tp_contact); - - if (priv->tooltip_widget == NULL) - { - priv->tooltip_widget = empathy_contact_widget_new (contact, - EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP | - EMPATHY_CONTACT_WIDGET_SHOW_LOCATION); - gtk_container_set_border_width (GTK_CONTAINER (priv->tooltip_widget), 8); - g_object_ref (priv->tooltip_widget); - g_signal_connect (priv->tooltip_widget, "destroy", - (GCallback) tooltip_destroy_cb, self); - gtk_widget_show (priv->tooltip_widget); - } - else - { - empathy_contact_widget_set_contact (priv->tooltip_widget, contact); - } - - gtk_tooltip_set_custom (tooltip, priv->tooltip_widget); - ret = TRUE; - - g_object_unref (contact); - g_object_unref (persona); - -OUT: - running--; - - return ret; -} - -static void -cell_set_background (EmpathyPersonaView *self, - GtkCellRenderer *cell, - gboolean is_active) -{ - if (is_active) - { - GdkRGBA color; - GtkStyleContext *style; - - style = gtk_widget_get_style_context (GTK_WIDGET (self)); - - gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED, - &color); - - /* Here we take the current theme colour and add it to - * the colour for white and average the two. This - * gives a colour which is inline with the theme but - * slightly whiter. - */ - empathy_make_color_whiter (&color); - - g_object_set (cell, "cell-background-rgba", &color, NULL); - } - else - { - g_object_set (cell, "cell-background-rgba", NULL, NULL); - } -} - -static void -pixbuf_cell_data_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - EmpathyPersonaView *self) -{ - GdkPixbuf *pixbuf; - gboolean is_active; - - gtk_tree_model_get (model, iter, - EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, &is_active, - EMPATHY_PERSONA_STORE_COL_ICON_STATUS, &pixbuf, - -1); - - g_object_set (cell, "pixbuf", pixbuf, NULL); - tp_clear_object (&pixbuf); - - cell_set_background (self, cell, is_active); -} - -static void -audio_call_cell_data_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - EmpathyPersonaView *self) -{ - gboolean is_active; - gboolean can_audio, can_video; - - gtk_tree_model_get (model, iter, - EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, &is_active, - EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL, &can_audio, - EMPATHY_PERSONA_STORE_COL_CAN_VIDEO_CALL, &can_video, - -1); - - g_object_set (cell, - "visible", (can_audio || can_video), - "icon-name", can_video? EMPATHY_IMAGE_VIDEO_CALL : EMPATHY_IMAGE_VOIP, - NULL); - - cell_set_background (self, cell, is_active); -} - -static void -avatar_cell_data_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - EmpathyPersonaView *self) -{ - GdkPixbuf *pixbuf; - gboolean show_avatar, is_active; - - gtk_tree_model_get (model, iter, - EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR, &pixbuf, - EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR_VISIBLE, &show_avatar, - EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, &is_active, - -1); - - g_object_set (cell, - "visible", show_avatar, - "pixbuf", pixbuf, - NULL); - - tp_clear_object (&pixbuf); - - cell_set_background (self, cell, is_active); -} - -static void -text_cell_data_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - EmpathyPersonaView *self) -{ - gboolean is_active; - - gtk_tree_model_get (model, iter, - EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, &is_active, - -1); - - cell_set_background (self, cell, is_active); -} - -static gboolean -individual_drag_received (EmpathyPersonaView *self, - GdkDragContext *context, - GtkSelectionData *selection) -{ - EmpathyIndividualManager *manager = NULL; - FolksIndividual *individual; - const gchar *individual_id; - gboolean success = FALSE; - - individual_id = (const gchar *) gtk_selection_data_get_data (selection); - manager = empathy_individual_manager_dup_singleton (); - individual = empathy_individual_manager_lookup_member (manager, - individual_id); - - if (individual == NULL) - { - DEBUG ("Failed to find drag event individual with ID '%s'", - individual_id); - g_object_unref (manager); - return FALSE; - } - - /* Emit a signal notifying of the drag. */ - g_signal_emit (self, signals[DRAG_INDIVIDUAL_RECEIVED], 0, - gdk_drag_context_get_selected_action (context), individual, &success); - - g_object_unref (manager); - - return success; -} - -static void -drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *selection, - guint info, - guint time_) -{ - EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (widget); - gboolean success = TRUE; - - if (info == DND_DRAG_TYPE_INDIVIDUAL_ID || info == DND_DRAG_TYPE_STRING) - success = individual_drag_received (self, context, selection); - - gtk_drag_finish (context, success, FALSE, GDK_CURRENT_TIME); -} - -static gboolean -drag_motion (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - guint time_) -{ - EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (widget); - GdkAtom target; - guint i; - DndDragType drag_type = DND_DRAG_TYPE_UNKNOWN; - - target = gtk_drag_dest_find_target (GTK_WIDGET (self), context, NULL); - - /* Determine the DndDragType of the data */ - for (i = 0; i < G_N_ELEMENTS (drag_atoms_dest); i++) - { - if (target == drag_atoms_dest[i]) - { - drag_type = drag_types_dest[i].info; - break; - } - } - - if (drag_type == DND_DRAG_TYPE_INDIVIDUAL_ID) - { - GtkTreePath *path; - - /* FIXME: It doesn't make sense for us to highlight a specific row or - * position to drop an Individual in, so just highlight the entire - * widget. - * Since I can't find a way to do this, just highlight the first possible - * position in the tree. */ - gdk_drag_status (context, gdk_drag_context_get_suggested_action (context), - time_); - - path = gtk_tree_path_new_first (); - gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (self), path, - GTK_TREE_VIEW_DROP_BEFORE); - gtk_tree_path_free (path); - - return TRUE; - } - - /* Unknown or unhandled drag target */ - gdk_drag_status (context, GDK_ACTION_DEFAULT, time_); - gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (self), NULL, 0); - - return FALSE; -} - -static void -drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection, - guint info, - guint time_) -{ - EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (widget); - FolksPersona *persona; - const gchar *persona_uid; - - if (info != DND_DRAG_TYPE_PERSONA_ID) - return; - - persona = empathy_persona_view_dup_selected (self); - if (persona == NULL) - return; - - persona_uid = folks_persona_get_uid (persona); - gtk_selection_data_set (selection, - gdk_atom_intern ("text/x-persona-id", FALSE), 8, - (guchar *) persona_uid, strlen (persona_uid) + 1); - - g_object_unref (persona); -} - -static gboolean -drag_drop (GtkWidget *widget, - GdkDragContext *drag_context, - gint x, - gint y, - guint time_) -{ - return FALSE; -} - -static void -set_features (EmpathyPersonaView *self, - EmpathyPersonaViewFeatureFlags features) -{ - EmpathyPersonaViewPriv *priv = GET_PRIV (self); - - priv->features = features; - - /* Setting reorderable is a hack that gets us row previews as drag icons - for free. We override all the drag handlers. It's tricky to get the - position of the drag icon right in drag_begin. GtkTreeView has special - voodoo for it, so we let it do the voodoo that he do (but only if dragging - is enabled). */ - gtk_tree_view_set_reorderable (GTK_TREE_VIEW (self), - (features & EMPATHY_PERSONA_VIEW_FEATURE_PERSONA_DRAG)); - - /* Update DnD source/dest */ - if (features & EMPATHY_PERSONA_VIEW_FEATURE_PERSONA_DRAG) - { - gtk_drag_source_set (GTK_WIDGET (self), - GDK_BUTTON1_MASK, - drag_types_source, - G_N_ELEMENTS (drag_types_source), - GDK_ACTION_MOVE | GDK_ACTION_COPY); - } - else - { - gtk_drag_source_unset (GTK_WIDGET (self)); - } - - if (features & EMPATHY_PERSONA_VIEW_FEATURE_PERSONA_DROP) - { - gtk_drag_dest_set (GTK_WIDGET (self), - GTK_DEST_DEFAULT_ALL, - drag_types_dest, - G_N_ELEMENTS (drag_types_dest), GDK_ACTION_MOVE | GDK_ACTION_COPY); - } - else - { - gtk_drag_dest_unset (GTK_WIDGET (self)); - } - - g_object_notify (G_OBJECT (self), "features"); -} - -static void -empathy_persona_view_init (EmpathyPersonaView *self) -{ - EmpathyPersonaViewPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - EMPATHY_TYPE_PERSONA_VIEW, EmpathyPersonaViewPriv); - - self->priv = priv; - - /* Connect to tree view signals rather than override. */ - g_signal_connect (self, "query-tooltip", (GCallback) query_tooltip_cb, NULL); -} - -static void -constructed (GObject *object) -{ - EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (object); - GtkCellRenderer *cell; - GtkTreeViewColumn *col; - guint i; - - /* Set up view */ - g_object_set (self, - "headers-visible", FALSE, - "show-expanders", FALSE, - NULL); - - col = gtk_tree_view_column_new (); - - /* State */ - cell = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (col, cell, FALSE); - gtk_tree_view_column_set_cell_data_func (col, cell, - (GtkTreeCellDataFunc) pixbuf_cell_data_func, self, NULL); - - g_object_set (cell, - "xpad", 5, - "ypad", 1, - "visible", TRUE, - NULL); - - /* Name */ - cell = empathy_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (col, cell, TRUE); - gtk_tree_view_column_set_cell_data_func (col, cell, - (GtkTreeCellDataFunc) text_cell_data_func, self, NULL); - - /* We (ab)use the name and status properties here to display display ID and - * account name, respectively. Harmless. */ - gtk_tree_view_column_add_attribute (col, cell, - "name", EMPATHY_PERSONA_STORE_COL_DISPLAY_ID); - gtk_tree_view_column_add_attribute (col, cell, - "text", EMPATHY_PERSONA_STORE_COL_DISPLAY_ID); - gtk_tree_view_column_add_attribute (col, cell, - "presence-type", EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE); - gtk_tree_view_column_add_attribute (col, cell, - "status", EMPATHY_PERSONA_STORE_COL_ACCOUNT_NAME); - - /* Audio Call Icon */ - cell = empathy_cell_renderer_activatable_new (); - gtk_tree_view_column_pack_start (col, cell, FALSE); - gtk_tree_view_column_set_cell_data_func (col, cell, - (GtkTreeCellDataFunc) audio_call_cell_data_func, self, NULL); - - g_object_set (cell, - "visible", FALSE, - NULL); - - /* Avatar */ - cell = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (col, cell, FALSE); - gtk_tree_view_column_set_cell_data_func (col, cell, - (GtkTreeCellDataFunc) avatar_cell_data_func, self, NULL); - - g_object_set (cell, - "xpad", 0, - "ypad", 0, - "visible", FALSE, - "width", 32, - "height", 32, - NULL); - - /* Actually add the column now we have added all cell renderers */ - gtk_tree_view_append_column (GTK_TREE_VIEW (self), col); - - /* Drag & Drop. */ - for (i = 0; i < G_N_ELEMENTS (drag_types_dest); ++i) - drag_atoms_dest[i] = gdk_atom_intern (drag_types_dest[i].target, FALSE); -} - -static void -get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - EmpathyPersonaViewPriv *priv = GET_PRIV (object); - - switch (param_id) - { - case PROP_MODEL: - g_value_set_object (value, priv->filter); - break; - case PROP_SHOW_OFFLINE: - g_value_set_boolean (value, priv->show_offline); - break; - case PROP_FEATURES: - g_value_set_flags (value, priv->features); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (object); - - switch (param_id) - { - case PROP_MODEL: - set_model (self, g_value_get_object (value)); - break; - case PROP_SHOW_OFFLINE: - empathy_persona_view_set_show_offline (self, - g_value_get_boolean (value)); - break; - case PROP_FEATURES: - set_features (self, g_value_get_flags (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -dispose (GObject *object) -{ - EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (object); - EmpathyPersonaViewPriv *priv = GET_PRIV (self); - - tp_clear_object (&priv->filter); - - if (priv->tooltip_widget) - gtk_widget_destroy (priv->tooltip_widget); - priv->tooltip_widget = NULL; - - G_OBJECT_CLASS (empathy_persona_view_parent_class)->dispose (object); -} - -static void -empathy_persona_view_class_init (EmpathyPersonaViewClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - object_class->constructed = constructed; - object_class->dispose = dispose; - object_class->get_property = get_property; - object_class->set_property = set_property; - - widget_class->drag_data_received = drag_data_received; - widget_class->drag_drop = drag_drop; - widget_class->drag_data_get = drag_data_get; - widget_class->drag_motion = drag_motion; - - signals[DRAG_INDIVIDUAL_RECEIVED] = - g_signal_new ("drag-individual-received", - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EmpathyPersonaViewClass, drag_individual_received), - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, 2, G_TYPE_UINT, FOLKS_TYPE_INDIVIDUAL); - - /* We override the "model" property so that we can wrap it in a - * GtkTreeModelFilter for showing/hiding offline personas. */ - g_object_class_override_property (object_class, PROP_MODEL, "model"); - - /** - * EmpathyPersonaStore:show-offline: - * - * Whether to display offline personas. - */ - g_object_class_install_property (object_class, PROP_SHOW_OFFLINE, - g_param_spec_boolean ("show-offline", - "Show Offline", - "Whether to display offline personas.", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - * EmpathyPersonaStore:features: - * - * Features of the view, such as whether drag and drop is enabled. - */ - g_object_class_install_property (object_class, PROP_FEATURES, - g_param_spec_flags ("features", - "Features", - "Flags for all enabled features.", - EMPATHY_TYPE_PERSONA_VIEW_FEATURE_FLAGS, - EMPATHY_PERSONA_VIEW_FEATURE_NONE, - G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - g_type_class_add_private (object_class, sizeof (EmpathyPersonaViewPriv)); -} - -/** - * empathy_persona_view_new: - * @store: an #EmpathyPersonaStore - * @features: a set of flags specifying the view's functionality, or - * %EMPATHY_PERSONA_VIEW_FEATURE_NONE - * - * Create a new #EmpathyPersonaView displaying the personas in - * #EmpathyPersonaStore. - * - * Return value: a new #EmpathyPersonaView - */ -EmpathyPersonaView * -empathy_persona_view_new (EmpathyPersonaStore *store, - EmpathyPersonaViewFeatureFlags features) -{ - g_return_val_if_fail (EMPATHY_IS_PERSONA_STORE (store), NULL); - - return g_object_new (EMPATHY_TYPE_PERSONA_VIEW, - "model", store, - "features", features, - NULL); -} - -/** - * empathy_persona_view_dup_selected: - * @self: an #EmpathyPersonaView - * - * Return the #FolksPersona associated with the currently selected row. The - * persona is referenced before being returned. If no row is selected, %NULL is - * returned. - * - * Return value: the currently selected #FolksPersona, or %NULL; unref with - * g_object_unref() - */ -FolksPersona * -empathy_persona_view_dup_selected (EmpathyPersonaView *self) -{ - GtkTreeSelection *selection; - GtkTreeIter iter; - GtkTreeModel *model; - FolksPersona *persona; - - g_return_val_if_fail (EMPATHY_IS_PERSONA_VIEW (self), NULL); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); - if (!gtk_tree_selection_get_selected (selection, &model, &iter)) - return NULL; - - gtk_tree_model_get (model, &iter, - EMPATHY_PERSONA_STORE_COL_PERSONA, &persona, - -1); - - return persona; -} - -/** - * empathy_persona_view_get_show_offline: - * @self: an #EmpathyPersonaView - * - * Get the value of the #EmpathyPersonaView:show-offline property. - * - * Return value: %TRUE if offline personas are being shown, %FALSE otherwise - */ -gboolean -empathy_persona_view_get_show_offline (EmpathyPersonaView *self) -{ - g_return_val_if_fail (EMPATHY_IS_PERSONA_VIEW (self), FALSE); - - return GET_PRIV (self)->show_offline; -} - -/** - * empathy_persona_view_set_show_offline: - * @self: an #EmpathyPersonaView - * @show_offline: %TRUE to show personas which are offline, %FALSE otherwise - * - * Set the #EmpathyPersonaView:show-offline property to @show_offline. - */ -void -empathy_persona_view_set_show_offline (EmpathyPersonaView *self, - gboolean show_offline) -{ - EmpathyPersonaViewPriv *priv; - - g_return_if_fail (EMPATHY_IS_PERSONA_VIEW (self)); - - priv = GET_PRIV (self); - priv->show_offline = show_offline; - - gtk_tree_model_filter_refilter (priv->filter); - - g_object_notify (G_OBJECT (self), "show-offline"); -} diff --git a/libempathy-gtk/empathy-persona-view.h b/libempathy-gtk/empathy-persona-view.h deleted file mode 100644 index 0a6317c6..00000000 --- a/libempathy-gtk/empathy-persona-view.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2005-2007 Imendio AB - * Copyright (C) 2007-2008, 2010 Collabora Ltd. - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * Authors: Mikael Hallendal - * Martyn Russell - * Xavier Claessens - * Philip Withnall - * - * Based off EmpathyContactListView. - */ - -#ifndef __EMPATHY_PERSONA_VIEW_H__ -#define __EMPATHY_PERSONA_VIEW_H__ - -#include - -#include - -#include "empathy-persona-store.h" - -G_BEGIN_DECLS - -typedef enum -{ - EMPATHY_PERSONA_VIEW_FEATURE_NONE = 0, - EMPATHY_PERSONA_VIEW_FEATURE_PERSONA_DRAG = 1 << 0, - EMPATHY_PERSONA_VIEW_FEATURE_PERSONA_DROP = 1 << 1, - EMPATHY_PERSONA_VIEW_FEATURE_ALL = (1 << 2) - 1, -} EmpathyPersonaViewFeatureFlags; - -#define EMPATHY_TYPE_PERSONA_VIEW (empathy_persona_view_get_type ()) -#define EMPATHY_PERSONA_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \ - EMPATHY_TYPE_PERSONA_VIEW, EmpathyPersonaView)) -#define EMPATHY_PERSONA_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \ - EMPATHY_TYPE_PERSONA_VIEW, EmpathyPersonaViewClass)) -#define EMPATHY_IS_PERSONA_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \ - EMPATHY_TYPE_PERSONA_VIEW)) -#define EMPATHY_IS_PERSONA_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \ - EMPATHY_TYPE_PERSONA_VIEW)) -#define EMPATHY_PERSONA_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \ - EMPATHY_TYPE_PERSONA_VIEW, EmpathyPersonaViewClass)) - -typedef struct -{ - GtkTreeView parent; - gpointer priv; -} EmpathyPersonaView; - -typedef struct -{ - GtkTreeViewClass parent_class; - - void (* drag_individual_received) (EmpathyPersonaView *self, - GdkDragAction action, - FolksIndividual *individual); -} EmpathyPersonaViewClass; - -GType empathy_persona_view_get_type (void) G_GNUC_CONST; - -EmpathyPersonaView *empathy_persona_view_new (EmpathyPersonaStore *store, - EmpathyPersonaViewFeatureFlags features); - -FolksPersona *empathy_persona_view_dup_selected (EmpathyPersonaView *self); - -gboolean empathy_persona_view_get_show_offline (EmpathyPersonaView *self); -void empathy_persona_view_set_show_offline (EmpathyPersonaView *self, - gboolean show_offline); - -G_END_DECLS - -#endif /* __EMPATHY_PERSONA_VIEW_H__ */ diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c index afa27bed..1d4d118d 100644 --- a/libempathy-gtk/empathy-sound-manager.c +++ b/libempathy-gtk/empathy-sound-manager.c @@ -126,8 +126,11 @@ repeating_sounds_item_delete (gpointer data) if (repeatable_sound->replay_timeout_id != 0) g_source_remove (repeatable_sound->replay_timeout_id); - g_signal_handlers_disconnect_by_func (repeatable_sound->widget, - empathy_sound_widget_destroyed_cb, repeatable_sound); + if (repeatable_sound->widget != NULL) + { + g_signal_handlers_disconnect_by_func (repeatable_sound->widget, + empathy_sound_widget_destroyed_cb, repeatable_sound); + } g_object_unref (repeatable_sound->self); @@ -252,8 +255,11 @@ empathy_sound_play_internal (GtkWidget *widget, EmpathySound sound_id, gettext (entry->event_ca_description)) < 0) goto failed; - if (ca_gtk_proplist_set_for_widget (p, widget) < 0) - goto failed; + if (widget != NULL) + { + if (ca_gtk_proplist_set_for_widget (p, widget) < 0) + goto failed; + } ca_context_play_full (ca_gtk_context_get (), entry->sound_id, p, callback, user_data); @@ -298,7 +304,7 @@ empathy_sound_manager_play_full (EmpathySoundManager *self, ca_finish_callback_t callback, gpointer user_data) { - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + g_return_val_if_fail (widget == NULL || GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (sound_id < LAST_EMPATHY_SOUND, FALSE); if (!empathy_sound_pref_is_enabled (self, sound_id)) @@ -329,7 +335,7 @@ empathy_sound_manager_play (EmpathySoundManager *self, GtkWidget *widget, EmpathySound sound_id) { - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + g_return_val_if_fail (widget == NULL || GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (sound_id < LAST_EMPATHY_SOUND, FALSE); return empathy_sound_manager_play_full (self, widget, sound_id, NULL, NULL); @@ -401,7 +407,7 @@ empathy_sound_manager_start_playing (EmpathySoundManager *self, EmpathyRepeatableSound *repeatable_sound; gboolean playing = FALSE; - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + g_return_val_if_fail (widget == NULL || GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (sound_id < LAST_EMPATHY_SOUND, FALSE); if (!empathy_sound_pref_is_enabled (self, sound_id)) @@ -424,9 +430,12 @@ empathy_sound_manager_start_playing (EmpathySoundManager *self, g_hash_table_insert (self->priv->repeating_sounds, GINT_TO_POINTER (sound_id), repeatable_sound); - g_signal_connect (G_OBJECT (widget), "destroy", - G_CALLBACK (empathy_sound_widget_destroyed_cb), - repeatable_sound); + if (widget != NULL) + { + g_signal_connect (G_OBJECT (widget), "destroy", + G_CALLBACK (empathy_sound_widget_destroyed_cb), + repeatable_sound); + } playing = empathy_sound_play_internal (widget, sound_id, playing_finished_cb, repeatable_sound); diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 7b0cd216..98df46b7 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -132,13 +132,15 @@ typedef struct { guint type; EmpathyMessage *msg; char *str; + gboolean should_highlight; } QueuedItem; static QueuedItem * queue_item (GQueue *queue, guint type, EmpathyMessage *msg, - const char *str) + const char *str, + gboolean should_highlight) { QueuedItem *item = g_slice_new0 (QueuedItem); @@ -146,6 +148,7 @@ queue_item (GQueue *queue, if (msg != NULL) item->msg = g_object_ref (msg); item->str = g_strdup (str); + item->should_highlight = should_highlight; g_queue_push_tail (queue, item); @@ -775,7 +778,8 @@ theme_adium_remove_all_focus_marks (EmpathyThemeAdium *theme) static void theme_adium_append_message (EmpathyChatView *view, - EmpathyMessage *msg) + EmpathyMessage *msg, + gboolean should_highlight) { EmpathyThemeAdium *theme = EMPATHY_THEME_ADIUM (view); EmpathyThemeAdiumPriv *priv = GET_PRIV (theme); @@ -797,7 +801,7 @@ theme_adium_append_message (EmpathyChatView *view, gboolean action; if (priv->pages_loading != 0) { - queue_item (&priv->message_queue, QUEUED_MESSAGE, msg, NULL); + queue_item (&priv->message_queue, QUEUED_MESSAGE, msg, NULL, should_highlight); return; } @@ -886,7 +890,7 @@ theme_adium_append_message (EmpathyChatView *view, } else { g_string_append (message_classes, " incoming"); } - if (empathy_message_should_highlight (msg)) { + if (should_highlight) { g_string_append (message_classes, " mention"); } if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY) { @@ -975,7 +979,7 @@ theme_adium_append_event (EmpathyChatView *view, gchar *str_escaped; if (priv->pages_loading != 0) { - queue_item (&priv->message_queue, QUEUED_EVENT, NULL, str); + queue_item (&priv->message_queue, QUEUED_EVENT, NULL, str, FALSE); return; } @@ -1005,7 +1009,7 @@ theme_adium_edit_message (EmpathyChatView *view, GError *error = NULL; if (priv->pages_loading != 0) { - queue_item (&priv->message_queue, QUEUED_EDIT, message, NULL); + queue_item (&priv->message_queue, QUEUED_EDIT, message, NULL, FALSE); return; } @@ -1345,7 +1349,8 @@ theme_adium_load_finished_cb (WebKitWebView *view, switch (item->type) { case QUEUED_MESSAGE: - theme_adium_append_message (chat_view, item->msg); + theme_adium_append_message (chat_view, item->msg, + item->should_highlight); break; case QUEUED_EDIT: diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c index b9fd08d8..cf0c6526 100644 --- a/libempathy-gtk/empathy-theme-boxes.c +++ b/libempathy-gtk/empathy-theme-boxes.c @@ -337,7 +337,8 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme, static void theme_boxes_append_message (EmpathyChatTextView *view, - EmpathyMessage *message) + EmpathyMessage *message, + gboolean should_highlight) { EmpathyContact *sender; diff --git a/libempathy-gtk/empathy-theme-irc.c b/libempathy-gtk/empathy-theme-irc.c index 2ee81a23..ed8e3b38 100644 --- a/libempathy-gtk/empathy-theme-irc.c +++ b/libempathy-gtk/empathy-theme-irc.c @@ -50,7 +50,8 @@ theme_irc_create_tags (EmpathyThemeIrc *theme) static void theme_irc_append_message (EmpathyChatTextView *view, - EmpathyMessage *message) + EmpathyMessage *message, + gboolean should_highlight) { GtkTextBuffer *buffer; const gchar *name; @@ -77,7 +78,7 @@ theme_irc_append_message (EmpathyChatTextView *view, if (empathy_contact_is_user (contact)) { nick_tag = EMPATHY_THEME_IRC_TAG_NICK_SELF; } else { - if (empathy_message_should_highlight (message)) { + if (should_highlight) { nick_tag = EMPATHY_THEME_IRC_TAG_NICK_HIGHLIGHT; } else { nick_tag = EMPATHY_THEME_IRC_TAG_NICK_OTHER; diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c index 991f5213..9fb2297a 100644 --- a/libempathy-gtk/empathy-tls-dialog.c +++ b/libempathy-gtk/empathy-tls-dialog.c @@ -278,12 +278,13 @@ empathy_tls_dialog_constructed (GObject *object) gtk_dialog_add_buttons (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - _("Continue"), GTK_RESPONSE_YES, + _("C_ontinue"), GTK_RESPONSE_YES, NULL); text = reason_to_string (self); g_object_set (message_dialog, + "title", _("Untrusted connection"), "text", _("This connection is untrusted. Would you like to " "continue anyway?"), "secondary-text", text, @@ -312,6 +313,8 @@ empathy_tls_dialog_constructed (GObject *object) gtk_container_add (GTK_CONTAINER (expander), details); gtk_widget_show (details); + gtk_window_set_keep_above (GTK_WINDOW (self), TRUE); + tp_g_signal_connect_object (priv->certificate, "invalidated", G_CALLBACK (certificate_invalidated_cb), self, 0); } diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index a387160d..f3761e5c 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -552,7 +552,8 @@ pixbuf_avatar_from_individual_closure_new (FolksIndividual *individual, closure->result = g_object_ref (result); closure->width = width; closure->height = height; - closure->cancellable = g_object_ref (cancellable); + if (cancellable != NULL) + closure->cancellable = g_object_ref (cancellable); return closure; } @@ -561,7 +562,7 @@ static void pixbuf_avatar_from_individual_closure_free ( PixbufAvatarFromIndividualClosure *closure) { - g_object_unref (closure->cancellable); + g_clear_object (&closure->cancellable); tp_clear_object (&closure->loader); g_object_unref (closure->individual); g_object_unref (closure->result); @@ -717,26 +718,25 @@ empathy_pixbuf_avatar_from_individual_scaled_async ( avatar_icon = folks_avatar_details_get_avatar (FOLKS_AVATAR_DETAILS (individual)); - if (avatar_icon == NULL) - goto out; + if (avatar_icon == NULL) { + g_simple_async_result_set_error (result, TP_ERRORS, + TP_ERROR_INVALID_ARGUMENT, "no avatar found"); + + g_simple_async_result_complete (result); + g_object_unref (result); + return; + } closure = pixbuf_avatar_from_individual_closure_new (individual, result, width, height, cancellable); - if (closure == NULL) - goto out; + + g_return_if_fail (closure != NULL); g_loadable_icon_load_async (avatar_icon, width, cancellable, avatar_icon_load_cb, closure); g_object_unref (result); - - return; - -out: - g_simple_async_result_set_op_res_gpointer (result, NULL, NULL); - g_simple_async_result_complete (result); - g_object_unref (result); } /* Return a ref on the GdkPixbuf */ @@ -2177,3 +2177,120 @@ out: g_free (path); g_free (cmd); } + +/* Most of the workspace manipulation code has been copied from libwnck + * Copyright (C) 2001 Havoc Pennington + * Copyright (C) 2005-2007 Vincent Untz + */ +static void +_wnck_activate_workspace (Screen *screen, + int new_active_space, + Time timestamp) +{ + Display *display; + Window root; + XEvent xev; + + display = DisplayOfScreen (screen); + root = RootWindowOfScreen (screen); + + xev.xclient.type = ClientMessage; + xev.xclient.serial = 0; + xev.xclient.send_event = True; + xev.xclient.display = display; + xev.xclient.window = root; + xev.xclient.message_type = gdk_x11_get_xatom_by_name ("_NET_CURRENT_DESKTOP"); + xev.xclient.format = 32; + xev.xclient.data.l[0] = new_active_space; + xev.xclient.data.l[1] = timestamp; + xev.xclient.data.l[2] = 0; + xev.xclient.data.l[3] = 0; + xev.xclient.data.l[4] = 0; + + gdk_error_trap_push (); + XSendEvent (display, root, False, + SubstructureRedirectMask | SubstructureNotifyMask, + &xev); + XSync (display, False); + gdk_error_trap_pop_ignored (); +} + +static gboolean +_wnck_get_cardinal (Screen *screen, + Window xwindow, + Atom atom, + int *val) +{ + Display *display; + Atom type; + int format; + gulong nitems; + gulong bytes_after; + gulong *num; + int err, result; + + display = DisplayOfScreen (screen); + + *val = 0; + + gdk_error_trap_push (); + type = None; + result = XGetWindowProperty (display, xwindow, atom, + 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, + &bytes_after, (void *) &num); + err = gdk_error_trap_pop (); + if (err != Success || + result != Success) + return FALSE; + + if (type != XA_CARDINAL) + { + XFree (num); + return FALSE; + } + + *val = *num; + + XFree (num); + + return TRUE; +} + +static int +window_get_workspace (Screen *xscreen, + Window win) +{ + int number; + + if (!_wnck_get_cardinal (xscreen, win, + gdk_x11_get_xatom_by_name ("_NET_WM_DESKTOP"), &number)) + return -1; + + return number; +} + +/* Ask X to move to the desktop on which @window currently is + * and the present @window. */ +void +empathy_move_to_window_desktop (GtkWindow *window, + guint32 timestamp) +{ + GdkScreen *screen; + Screen *xscreen; + GdkWindow *gdk_window; + int workspace; + + screen = gtk_window_get_screen (window); + xscreen = gdk_x11_screen_get_xscreen (screen); + gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); + + workspace = window_get_workspace (xscreen, + gdk_x11_window_get_xid (gdk_window)); + if (workspace == -1) + goto out; + + _wnck_activate_workspace (xscreen, workspace, timestamp); + +out: + gtk_window_present_with_time (window, timestamp); +} diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index f76b7491..2ffbf2cd 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -126,6 +126,9 @@ void empathy_window_present_with_time (GtkWindow *windo guint32 timestamp); GtkWindow * empathy_get_toplevel_window (GtkWidget *widget); +void empathy_move_to_window_desktop (GtkWindow *window, + guint32 timestamp); + /* URL */ gchar * empathy_make_absolute_url (const gchar *url); diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 1f4bdbcb..6a6e2ce7 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -36,9 +36,9 @@ libempathy_headers = \ empathy-client-factory.h \ empathy-connection-managers.h \ empathy-connectivity.h \ + empathy-connection-aggregator.h \ empathy-contact-groups.h \ empathy-contact-list.h \ - empathy-contact-manager.h \ empathy-contact.h \ empathy-debug.h \ empathy-ft-factory.h \ @@ -52,6 +52,7 @@ libempathy_headers = \ empathy-keyring.h \ empathy-location.h \ empathy-message.h \ + empathy-pkg-kit.h \ empathy-request-util.h \ empathy-server-sasl-handler.h \ empathy-server-tls-handler.h \ @@ -62,7 +63,6 @@ libempathy_headers = \ empathy-tp-chat.h \ empathy-tp-contact-factory.h \ empathy-tp-contact-list.h \ - empathy-tp-file.h \ empathy-tp-roomlist.h \ empathy-tp-streamed-media.h \ empathy-types.h \ @@ -79,9 +79,9 @@ libempathy_handwritten_source = \ empathy-client-factory.c \ empathy-connection-managers.c \ empathy-connectivity.c \ + empathy-connection-aggregator.c \ empathy-contact-groups.c \ empathy-contact-list.c \ - empathy-contact-manager.c \ empathy-contact.c \ empathy-debug.c \ empathy-ft-factory.c \ @@ -93,6 +93,7 @@ libempathy_handwritten_source = \ empathy-irc-server.c \ empathy-keyring.c \ empathy-message.c \ + empathy-pkg-kit.c \ empathy-request-util.c \ empathy-server-sasl-handler.c \ empathy-server-tls-handler.c \ @@ -103,7 +104,6 @@ libempathy_handwritten_source = \ empathy-tp-chat.c \ empathy-tp-contact-factory.c \ empathy-tp-contact-list.c \ - empathy-tp-file.c \ empathy-tp-roomlist.c \ empathy-tp-streamed-media.c \ empathy-utils.c diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c index 78b40fb7..57c00876 100644 --- a/libempathy/cheese-camera-device-monitor.c +++ b/libempathy/cheese-camera-device-monitor.c @@ -1,3 +1,5 @@ +/* This file is a copy of cheese-camera-device-monitor.c from Empathy. We + * just renamespaced it to avoid conflicts when linking on libcheese. */ /* * Copyright © 2007,2008 Jaap Haitsma * Copyright © 2007-2009 daniel g. siegel @@ -49,31 +51,31 @@ * @short_description: Simple object to enumerate v4l devices * @include: cheese/cheese-camera-device-monitor.h * - * #CheeseCameraDeviceMonitor provides a basic interface for + * #EmpathyCameraDeviceMonitor provides a basic interface for * video4linux device enumeration and hotplugging. * * It uses either GUdev or some platform specific code to list video * devices. It is also capable (right now in linux only, with the * udev backend) to monitor device plugging and emit a - * CheeseCameraDeviceMonitor::added or - * CheeseCameraDeviceMonitor::removed signal when an event happens. + * EmpathyCameraDeviceMonitor::added or + * EmpathyCameraDeviceMonitor::removed signal when an event happens. */ -G_DEFINE_TYPE (CheeseCameraDeviceMonitor, cheese_camera_device_monitor, G_TYPE_OBJECT) +G_DEFINE_TYPE (EmpathyCameraDeviceMonitor, empathy_camera_device_monitor, G_TYPE_OBJECT) -#define CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ - CHEESE_TYPE_CAMERA_DEVICE_MONITOR, \ - CheeseCameraDeviceMonitorPrivate)) +#define EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ + EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \ + EmpathyCameraDeviceMonitorPrivate)) -#define CHEESE_CAMERA_DEVICE_MONITOR_ERROR cheese_camera_device_monitor_error_quark () +#define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark () -GST_DEBUG_CATEGORY (cheese_device_monitor_cat); -#define GST_CAT_DEFAULT cheese_device_monitor_cat +GST_DEBUG_CATEGORY (empathy_device_monitor_cat); +#define GST_CAT_DEFAULT empathy_device_monitor_cat -enum CheeseCameraDeviceMonitorError +enum EmpathyCameraDeviceMonitorError { - CHEESE_CAMERA_DEVICE_MONITOR_ERROR_UNKNOWN, - CHEESE_CAMERA_DEVICE_MONITOR_ERROR_ELEMENT_NOT_FOUND + EMPATHY_CAMERA_DEVICE_MONITOR_ERROR_UNKNOWN, + EMPATHY_CAMERA_DEVICE_MONITOR_ERROR_ELEMENT_NOT_FOUND }; typedef struct @@ -83,7 +85,7 @@ typedef struct #else guint filler; #endif /* HAVE_UDEV */ -} CheeseCameraDeviceMonitorPrivate; +} EmpathyCameraDeviceMonitorPrivate; enum { @@ -96,15 +98,15 @@ static guint monitor_signals[LAST_SIGNAL]; #if 0 GQuark -cheese_camera_device_monitor_error_quark (void) +empathy_camera_device_monitor_error_quark (void) { - return g_quark_from_static_string ("cheese-camera-error-quark"); + return g_quark_from_static_string ("empathy-camera-error-quark"); } #endif #ifdef HAVE_UDEV static void -cheese_camera_device_monitor_added (CheeseCameraDeviceMonitor *monitor, +empathy_camera_device_monitor_added (EmpathyCameraDeviceMonitor *monitor, GUdevDevice *udevice) { const char *device_file; @@ -190,7 +192,7 @@ cheese_camera_device_monitor_added (CheeseCameraDeviceMonitor *monitor, } static void -cheese_camera_device_monitor_removed (CheeseCameraDeviceMonitor *monitor, +empathy_camera_device_monitor_removed (EmpathyCameraDeviceMonitor *monitor, GUdevDevice *udevice) { g_signal_emit (monitor, monitor_signals[REMOVED], 0, @@ -198,20 +200,20 @@ cheese_camera_device_monitor_removed (CheeseCameraDeviceMonitor *monitor, } static void -cheese_camera_device_monitor_uevent_cb (GUdevClient *client, +empathy_camera_device_monitor_uevent_cb (GUdevClient *client, const gchar *action, GUdevDevice *udevice, - CheeseCameraDeviceMonitor *monitor) + EmpathyCameraDeviceMonitor *monitor) { if (g_str_equal (action, "remove")) - cheese_camera_device_monitor_removed (monitor, udevice); + empathy_camera_device_monitor_removed (monitor, udevice); else if (g_str_equal (action, "add")) - cheese_camera_device_monitor_added (monitor, udevice); + empathy_camera_device_monitor_added (monitor, udevice); } /** - * cheese_camera_device_monitor_coldplug: - * @monitor: a #CheeseCameraDeviceMonitor object. + * empathy_camera_device_monitor_coldplug: + * @monitor: a #EmpathyCameraDeviceMonitor object. * * Will actively look for plugged in cameras and emit * ::added for those new cameras. @@ -219,9 +221,9 @@ cheese_camera_device_monitor_uevent_cb (GUdevClient *client, * to those signals before they are emitted. */ void -cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor) +empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor) { - CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); + EmpathyCameraDeviceMonitorPrivate *priv = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); GList *devices, *l; gint i = 0; @@ -235,7 +237,7 @@ cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor) /* Initialize camera structures */ for (l = devices; l != NULL; l = l->next) { - cheese_camera_device_monitor_added (monitor, l->data); + empathy_camera_device_monitor_added (monitor, l->data); g_object_unref (l->data); i++; } @@ -246,10 +248,10 @@ cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor) #else /* HAVE_UDEV */ void -cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor) +empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor) { #if 0 - CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); + EmpathyCameraDeviceMonitorPrivate *priv = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); struct v4l2_capability v2cap; struct video_capability v1cap; int fd, ok; @@ -307,7 +309,7 @@ cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor) /* Initialize camera structures */ for (l = devices; l != NULL; l = l->next) { - cheese_camera_device_monitor_added (monitor, l->data); + empathy_camera_device_monitor_added (monitor, l->data); g_object_unref (l->data); } g_list_free (devices); @@ -317,11 +319,11 @@ cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor) #endif /* HAVE_UDEV */ static void -cheese_camera_device_monitor_finalize (GObject *object) +empathy_camera_device_monitor_finalize (GObject *object) { #ifdef HAVE_UDEV - CheeseCameraDeviceMonitor *monitor = CHEESE_CAMERA_DEVICE_MONITOR (object); - CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); + EmpathyCameraDeviceMonitor *monitor = EMPATHY_CAMERA_DEVICE_MONITOR (object); + EmpathyCameraDeviceMonitorPrivate *priv = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); if (priv->client != NULL) { @@ -329,23 +331,23 @@ cheese_camera_device_monitor_finalize (GObject *object) priv->client = NULL; } #endif /* HAVE_UDEV */ - G_OBJECT_CLASS (cheese_camera_device_monitor_parent_class)->finalize (object); + G_OBJECT_CLASS (empathy_camera_device_monitor_parent_class)->finalize (object); } static void -cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass) +empathy_camera_device_monitor_class_init (EmpathyCameraDeviceMonitorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - if (cheese_device_monitor_cat == NULL) - GST_DEBUG_CATEGORY_INIT (cheese_device_monitor_cat, - "cheese-device-monitor", - 0, "Cheese Camera Device Monitor"); + if (empathy_device_monitor_cat == NULL) + GST_DEBUG_CATEGORY_INIT (empathy_device_monitor_cat, + "empathy-device-monitor", + 0, "Empathy Camera Device Monitor"); - object_class->finalize = cheese_camera_device_monitor_finalize; + object_class->finalize = empathy_camera_device_monitor_finalize; /** - * CheeseCameraDeviceMonitor::added: + * EmpathyCameraDeviceMonitor::added: * @device: A private object representing the newly added camera. * @id: Device unique identifier. * @device: Device file name (e.g. /dev/video2). @@ -353,17 +355,17 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass) * @api_version: Supported video4linux API: 1 for v4l, 2 for v4l2. * * The ::added signal is emitted when a camera is added, or on start-up - * after #cheese_camera_device_monitor_colplug is called. + * after #empathy_camera_device_monitor_colplug is called. **/ monitor_signals[ADDED] = g_signal_new ("added", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (CheeseCameraDeviceMonitorClass, added), + G_STRUCT_OFFSET (EmpathyCameraDeviceMonitorClass, added), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); /** - * CheeseCameraDeviceMonitor::removed: + * EmpathyCameraDeviceMonitor::removed: * @device: A private object representing the newly added camera * @id: Device unique identifier. * @@ -372,38 +374,38 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass) **/ monitor_signals[REMOVED] = g_signal_new ("removed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (CheeseCameraDeviceMonitorClass, removed), + G_STRUCT_OFFSET (EmpathyCameraDeviceMonitorClass, removed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_STRING); - g_type_class_add_private (klass, sizeof (CheeseCameraDeviceMonitorPrivate)); + g_type_class_add_private (klass, sizeof (EmpathyCameraDeviceMonitorPrivate)); } static void -cheese_camera_device_monitor_init (CheeseCameraDeviceMonitor *monitor) +empathy_camera_device_monitor_init (EmpathyCameraDeviceMonitor *monitor) { #ifdef HAVE_UDEV - CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); + EmpathyCameraDeviceMonitorPrivate *priv = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); const gchar *const subsystems[] = {"video4linux", NULL}; priv->client = g_udev_client_new (subsystems); g_signal_connect (G_OBJECT (priv->client), "uevent", - G_CALLBACK (cheese_camera_device_monitor_uevent_cb), monitor); + G_CALLBACK (empathy_camera_device_monitor_uevent_cb), monitor); #endif /* HAVE_UDEV */ } /** - * cheese_camera_device_monitor_new: + * empathy_camera_device_monitor_new: * - * Returns a new #CheeseCameraDeviceMonitor object. + * Returns a new #EmpathyCameraDeviceMonitor object. * - * Return value: a new #CheeseCameraDeviceMonitor object. + * Return value: a new #EmpathyCameraDeviceMonitor object. **/ -CheeseCameraDeviceMonitor * -cheese_camera_device_monitor_new (void) +EmpathyCameraDeviceMonitor * +empathy_camera_device_monitor_new (void) { - return g_object_new (CHEESE_TYPE_CAMERA_DEVICE_MONITOR, NULL); + return g_object_new (EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, NULL); } /* diff --git a/libempathy/cheese-camera-device-monitor.h b/libempathy/cheese-camera-device-monitor.h index d0d98a45..ff0bfa76 100644 --- a/libempathy/cheese-camera-device-monitor.h +++ b/libempathy/cheese-camera-device-monitor.h @@ -1,3 +1,5 @@ +/* This file is a copy of cheese-camera-device-monitor.h from Empathy. We + * just renamespaced it to avoid conflicts when linking on libcheese. */ /* * Copyright © 2007,2008 Jaap Haitsma * Copyright © 2007-2009 daniel g. siegel @@ -20,48 +22,48 @@ */ -#ifndef __CHEESE_CAMERA_DEVICE_MONITOR_H__ -#define __CHEESE_CAMERA_DEVICE_MONITOR_H__ +#ifndef __EMPATHY_CAMERA_DEVICE_MONITOR_H__ +#define __EMPATHY_CAMERA_DEVICE_MONITOR_H__ #include #include G_BEGIN_DECLS -#define CHEESE_TYPE_CAMERA_DEVICE_MONITOR (cheese_camera_device_monitor_get_type ()) -#define CHEESE_CAMERA_DEVICE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CHEESE_TYPE_CAMERA_DEVICE_MONITOR, \ - CheeseCameraDeviceMonitor)) -#define CHEESE_CAMERA_DEVICE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CHEESE_TYPE_CAMERA_DEVICE_MONITOR, \ - CheeseCameraDeviceMonitorClass)) -#define CHEESE_IS_CAMERA_DEVICE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CHEESE_TYPE_CAMERA_DEVICE_MONITOR)) -#define CHEESE_IS_CAMERA_DEVICE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CHEESE_TYPE_CAMERA_DEVICE_MONITOR)) -#define CHEESE_CAMERA_DEVICE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CHEESE_TYPE_CAMERA_DEVICE_MONITOR, \ - CheeseCameraDeviceMonitorClass)) +#define EMPATHY_TYPE_CAMERA_DEVICE_MONITOR (empathy_camera_device_monitor_get_type ()) +#define EMPATHY_CAMERA_DEVICE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \ + EmpathyCameraDeviceMonitor)) +#define EMPATHY_CAMERA_DEVICE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \ + EmpathyCameraDeviceMonitorClass)) +#define EMPATHY_IS_CAMERA_DEVICE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR)) +#define EMPATHY_IS_CAMERA_DEVICE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR)) +#define EMPATHY_CAMERA_DEVICE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \ + EmpathyCameraDeviceMonitorClass)) -typedef struct _CheeseCameraDeviceMonitorClass CheeseCameraDeviceMonitorClass; -typedef struct _CheeseCameraDeviceMonitor CheeseCameraDeviceMonitor; +typedef struct _EmpathyCameraDeviceMonitorClass EmpathyCameraDeviceMonitorClass; +typedef struct _EmpathyCameraDeviceMonitor EmpathyCameraDeviceMonitor; -struct _CheeseCameraDeviceMonitor +struct _EmpathyCameraDeviceMonitor { GObject parent; }; -struct _CheeseCameraDeviceMonitorClass +struct _EmpathyCameraDeviceMonitorClass { GObjectClass parent_class; - void (*added)(CheeseCameraDeviceMonitor *camera, + void (*added)(EmpathyCameraDeviceMonitor *camera, const char *id, const char *device_file, const char *product_name, int api_version); - void (*removed)(CheeseCameraDeviceMonitor *camera, const char *id); + void (*removed)(EmpathyCameraDeviceMonitor *camera, const char *id); }; -GType cheese_camera_device_monitor_get_type (void) G_GNUC_CONST; -CheeseCameraDeviceMonitor *cheese_camera_device_monitor_new (void); -void cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor); +GType empathy_camera_device_monitor_get_type (void) G_GNUC_CONST; +EmpathyCameraDeviceMonitor *empathy_camera_device_monitor_new (void); +void empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor); G_END_DECLS -#endif /* __CHEESE_CAMERA_DEVICE_MONITOR_H__ */ +#endif /* __EMPATHY_CAMERA_DEVICE_MONITOR_H__ */ diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 78d60968..4d979568 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include #include @@ -103,6 +104,8 @@ struct _EmpathyAccountSettingsPriv /* If TRUE, the account should have 'tel' in its * Account.Interface.Addressing.URISchemes property. */ gboolean uri_scheme_tel; + /* If TRUE, Service property needs to be updated when applying changes */ + gboolean update_service; GSimpleAsyncResult *apply_result; }; @@ -743,6 +746,21 @@ empathy_account_settings_get_service (EmpathyAccountSettings *settings) return priv->service; } +void +empathy_account_settings_set_service (EmpathyAccountSettings *settings, + const gchar *service) +{ + EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); + + if (!tp_strdiff (priv->service, service)) + return; + + g_free (priv->service); + priv->service = g_strdup (service); + g_object_notify (G_OBJECT (settings), "service"); + priv->update_service = TRUE; +} + gchar * empathy_account_settings_get_icon_name (EmpathyAccountSettings *settings) { @@ -1445,6 +1463,32 @@ update_account_uri_schemes (EmpathyAccountSettings *self) priv->uri_scheme_tel, NULL, NULL); } +static void +set_service_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GError *error = NULL; + + if (!tp_account_set_service_finish (TP_ACCOUNT (source), result, &error)) + { + DEBUG ("Failed to set Account.Service: %s", error->message); + g_error_free (error); + } +} + +static void +update_account_service (EmpathyAccountSettings *self) +{ + EmpathyAccountSettingsPriv *priv = GET_PRIV (self); + + if (!priv->update_service) + return; + + tp_account_set_service_async (priv->account, + priv->service != NULL ? priv->service : "", set_service_cb, self); +} + static void empathy_account_settings_account_updated (GObject *source, GAsyncResult *result, @@ -1486,6 +1530,7 @@ empathy_account_settings_account_updated (GObject *source, } update_account_uri_schemes (settings); + update_account_service (settings); g_simple_async_result_set_op_res_gboolean (priv->apply_result, g_strv_length (reconnect_required) > 0); diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h index ea0c5b04..10ed3684 100644 --- a/libempathy/empathy-account-settings.h +++ b/libempathy/empathy-account-settings.h @@ -78,6 +78,9 @@ const gchar *empathy_account_settings_get_protocol ( const gchar *empathy_account_settings_get_service ( EmpathyAccountSettings *settings); +void empathy_account_settings_set_service (EmpathyAccountSettings *settings, + const gchar *service); + TpAccount *empathy_account_settings_get_account ( EmpathyAccountSettings *settings); diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c index 7d9d695e..977b1f2c 100644 --- a/libempathy/empathy-camera-monitor.c +++ b/libempathy/empathy-camera-monitor.c @@ -33,7 +33,7 @@ struct _EmpathyCameraMonitorPrivate { - CheeseCameraDeviceMonitor *cheese_monitor; + EmpathyCameraDeviceMonitor *empathy_monitor; GQueue *cameras; gint num_cameras; }; @@ -108,18 +108,20 @@ empathy_camera_monitor_free_camera_foreach (gpointer data, } static void -on_camera_added (CheeseCameraDeviceMonitor *device, +on_camera_added (EmpathyCameraDeviceMonitor *device, gchar *id, gchar *filename, gchar *product_name, gint api_version, EmpathyCameraMonitor *self) { - EmpathyCamera *camera = empathy_camera_new (id, filename, product_name); + EmpathyCamera *camera; if (self->priv->cameras == NULL) return; + camera = empathy_camera_new (id, filename, product_name); + g_queue_push_tail (self->priv->cameras, camera); self->priv->num_cameras++; @@ -131,7 +133,7 @@ on_camera_added (CheeseCameraDeviceMonitor *device, } static void -on_camera_removed (CheeseCameraDeviceMonitor *device, +on_camera_removed (EmpathyCameraDeviceMonitor *device, gchar *id, EmpathyCameraMonitor *self) { @@ -192,7 +194,7 @@ empathy_camera_monitor_dispose (GObject *object) { EmpathyCameraMonitor *self = EMPATHY_CAMERA_MONITOR (object); - tp_clear_object (&self->priv->cheese_monitor); + tp_clear_object (&self->priv->empathy_monitor); g_queue_foreach (self->priv->cameras, empathy_camera_monitor_free_camera_foreach, NULL); @@ -208,7 +210,7 @@ empathy_camera_monitor_constructed (GObject *object) G_OBJECT_CLASS (empathy_camera_monitor_parent_class)->constructed (object); - cheese_camera_device_monitor_coldplug (self->priv->cheese_monitor); + empathy_camera_device_monitor_coldplug (self->priv->empathy_monitor); } static void @@ -250,11 +252,11 @@ empathy_camera_monitor_init (EmpathyCameraMonitor *self) self->priv->cameras = g_queue_new (); - self->priv->cheese_monitor = cheese_camera_device_monitor_new (); + self->priv->empathy_monitor = empathy_camera_device_monitor_new (); - g_signal_connect (self->priv->cheese_monitor, "added", + g_signal_connect (self->priv->empathy_monitor, "added", G_CALLBACK (on_camera_added), self); - g_signal_connect (self->priv->cheese_monitor, "removed", + g_signal_connect (self->priv->empathy_monitor, "removed", G_CALLBACK (on_camera_removed), self); #ifndef HAVE_UDEV diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c index a02b8b14..294eaf5f 100644 --- a/libempathy/empathy-client-factory.c +++ b/libempathy/empathy-client-factory.c @@ -24,7 +24,6 @@ #include "empathy-client-factory.h" #include "empathy-tp-chat.h" -#include "empathy-tp-file.h" #include "empathy-utils.h" #include @@ -89,11 +88,6 @@ empathy_client_factory_create_channel (TpSimpleClientFactory *factory, return TP_CHANNEL (call_channel_new_with_factory ( TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error)); } - else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) - { - return TP_CHANNEL (empathy_tp_file_new ( - TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error)); - } return chainup->create_channel (factory, conn, path, properties, error); } @@ -175,15 +169,21 @@ empathy_client_factory_dup_contact_features (TpSimpleClientFactory *factory, TpConnection *connection) { GArray *features; - TpContactFeature feature; + TpContactFeature extra_features[] = { + TP_CONTACT_FEATURE_ALIAS, + TP_CONTACT_FEATURE_PRESENCE, + TP_CONTACT_FEATURE_AVATAR_TOKEN, + TP_CONTACT_FEATURE_AVATAR_DATA, + TP_CONTACT_FEATURE_CAPABILITIES, + /* Needed by empathy_individual_add_menu_item_new to check if a contact + * is already in the contact list. This feature is pretty cheap to + * prepare as it doesn't prepare the full roster. */ + TP_CONTACT_FEATURE_SUBSCRIPTION_STATES, + }; features = chainup->dup_contact_features (factory, connection); - /* Needed by empathy_individual_add_menu_item_new to check if a contact is - * already in the contact list. This feature is pretty cheap to prepare as - * it doesn't prepare the full roster. */ - feature = TP_CONTACT_FEATURE_SUBSCRIPTION_STATES; - g_array_append_val (features, feature); + g_array_append_vals (features, extra_features, G_N_ELEMENTS (extra_features)); return features; } diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c new file mode 100644 index 00000000..fde365c2 --- /dev/null +++ b/libempathy/empathy-connection-aggregator.c @@ -0,0 +1,290 @@ +/* + * empathy-connection-aggregator.c - Source for EmpathyConnectionAggregator + * Copyright (C) 2010 Collabora Ltd. + * @author Cosimo Cecchi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "empathy-connection-aggregator.h" + +#include + +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include "empathy-debug.h" +#include "empathy-utils.h" + + +#include "extensions/extensions.h" + +G_DEFINE_TYPE (EmpathyConnectionAggregator, empathy_connection_aggregator, + G_TYPE_OBJECT); + +enum { + EVENT_CONTACT_LIST_CHANGED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +struct _EmpathyConnectionAggregatorPriv { + TpAccountManager *mgr; + + /* List of owned TpConnection */ + GList *conns; +}; + +static void +empathy_connection_aggregator_dispose (GObject *object) +{ + EmpathyConnectionAggregator *self = (EmpathyConnectionAggregator *) object; + + g_clear_object (&self->priv->mgr); + + g_list_free_full (self->priv->conns, g_object_unref); + self->priv->conns = NULL; + + G_OBJECT_CLASS (empathy_connection_aggregator_parent_class)->dispose (object); +} + +static void +empathy_connection_aggregator_class_init ( + EmpathyConnectionAggregatorClass *klass) +{ + GObjectClass *oclass = G_OBJECT_CLASS (klass); + + oclass->dispose = empathy_connection_aggregator_dispose; + + signals[EVENT_CONTACT_LIST_CHANGED] = + g_signal_new ("contact-list-changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 2, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY); + + g_type_class_add_private (klass, sizeof (EmpathyConnectionAggregatorPriv)); +} + +static void +contact_list_changed_cb (TpConnection *conn, + GPtrArray *added, + GPtrArray *removed, + EmpathyConnectionAggregator *self) +{ + g_signal_emit (self, signals[EVENT_CONTACT_LIST_CHANGED], 0, added, removed); +} + +static void +conn_invalidated_cb (TpConnection *conn, + guint domain, + gint code, + gchar *message, + EmpathyConnectionAggregator *self) +{ + self->priv->conns = g_list_remove (self->priv->conns, conn); + + g_object_unref (conn); +} + +static void +check_connection (EmpathyConnectionAggregator *self, + TpConnection *conn) +{ + GPtrArray *contacts; + + if (g_list_find (self->priv->conns, conn) != NULL) + return; + + self->priv->conns = g_list_prepend (self->priv->conns, + g_object_ref (conn)); + + tp_g_signal_connect_object (conn, "contact-list-changed", + G_CALLBACK (contact_list_changed_cb), self, 0); + + contacts = tp_connection_dup_contact_list (conn); + if (contacts != NULL) + { + GPtrArray *empty; + + empty = g_ptr_array_new (); + + contact_list_changed_cb (conn, contacts, empty, self); + g_ptr_array_unref (empty); + } + + tp_g_signal_connect_object (conn, "invalidated", + G_CALLBACK (conn_invalidated_cb), self, 0); +} + +static void +check_account (EmpathyConnectionAggregator *self, + TpAccount *account) +{ + TpConnection *conn; + + conn = tp_account_get_connection (account); + if (conn != NULL) + check_connection (self, conn); +} + +static void +account_conn_changed_cb (TpAccount *account, + GParamSpec *spec, + EmpathyConnectionAggregator *self) +{ + check_account (self, account); +} + +static void +add_account (EmpathyConnectionAggregator *self, + TpAccount *account) +{ + check_account (self, account); + + tp_g_signal_connect_object (account, "notify::connection", + G_CALLBACK (account_conn_changed_cb), self, 0); +} + +static void +account_validity_changed_cb (TpAccountManager *manager, + TpAccount *account, + gboolean valid, + EmpathyConnectionAggregator *self) +{ + if (valid) + add_account (self, account); +} + +static void +am_prepare_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + EmpathyConnectionAggregator *self = EMPATHY_CONNECTION_AGGREGATOR (user_data); + GError *error = NULL; + GList *accounts, *l; + + if (!tp_proxy_prepare_finish (source, result, &error)) + { + DEBUG ("Failed to prepare account manager: %s", error->message); + g_error_free (error); + goto out; + } + + accounts = tp_account_manager_get_valid_accounts (self->priv->mgr); + for (l = accounts; l != NULL; l = g_list_next (l)) + { + TpAccount *account = l->data; + + add_account (self, account); + } + + tp_g_signal_connect_object (self->priv->mgr, "account-validity-changed", + G_CALLBACK (account_validity_changed_cb), self, 0); + + g_list_free (accounts); + +out: + g_object_unref (self); +} + +static void +empathy_connection_aggregator_init (EmpathyConnectionAggregator *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + EMPATHY_TYPE_CONNECTION_AGGREGATOR, EmpathyConnectionAggregatorPriv); + + self->priv->mgr = tp_account_manager_dup (); + + tp_proxy_prepare_async (self->priv->mgr, NULL, am_prepare_cb, + g_object_ref (self)); +} + +EmpathyConnectionAggregator * +empathy_connection_aggregator_dup_singleton (void) +{ + static EmpathyConnectionAggregator *aggregator = NULL; + + if (G_LIKELY (aggregator != NULL)) + return g_object_ref (aggregator); + + aggregator = g_object_new (EMPATHY_TYPE_CONNECTION_AGGREGATOR, NULL); + + g_object_add_weak_pointer (G_OBJECT (aggregator), (gpointer *) &aggregator); + return aggregator; +} + +/* (transfer container) */ +GList * +empathy_connection_aggregator_get_all_groups (EmpathyConnectionAggregator *self) +{ + GList *keys, *l; + GHashTable *set; + + set = g_hash_table_new (g_str_hash, g_str_equal); + + for (l = self->priv->conns; l != NULL; l = g_list_next (l)) + { + TpConnection *conn = l->data; + const gchar * const *groups; + guint i; + + groups = tp_connection_get_contact_groups (conn); + if (groups == NULL) + continue; + + for (i = 0; groups[i] != NULL; i++) + g_hash_table_insert (set, (gchar *) groups[i], GUINT_TO_POINTER (TRUE)); + } + + keys = g_hash_table_get_keys (set); + g_hash_table_unref (set); + + return keys; +} + +GPtrArray * +empathy_connection_aggregator_dup_all_contacts ( + EmpathyConnectionAggregator *self) +{ + GPtrArray *result; + GList *l; + + result = g_ptr_array_new_with_free_func (g_object_unref); + + for (l = self->priv->conns; l != NULL; l = g_list_next (l)) + { + TpConnection *conn = l->data; + GPtrArray *contacts; + + contacts = tp_connection_dup_contact_list (conn); + if (contacts == NULL) + continue; + + tp_g_ptr_array_extend (result, contacts); + + /* tp_g_ptr_array_extend() doesn't give us an extra ref */ + g_ptr_array_foreach (contacts, (GFunc) g_object_ref, NULL); + + g_ptr_array_unref (contacts); + } + + return result; +} diff --git a/libempathy/empathy-connection-aggregator.h b/libempathy/empathy-connection-aggregator.h new file mode 100644 index 00000000..c21c04de --- /dev/null +++ b/libempathy/empathy-connection-aggregator.h @@ -0,0 +1,72 @@ +/* + * empathy-connection-aggregator.h - Header for EmpathyConnectionAggregator + * Copyright (C) 2010 Collabora Ltd. + * @author Cosimo Cecchi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __EMPATHY_CONNECTION_AGGREGATOR_H__ +#define __EMPATHY_CONNECTION_AGGREGATOR_H__ + +#include + +#include + +G_BEGIN_DECLS + +typedef struct _EmpathyConnectionAggregator EmpathyConnectionAggregator; +typedef struct _EmpathyConnectionAggregatorClass EmpathyConnectionAggregatorClass; +typedef struct _EmpathyConnectionAggregatorPriv EmpathyConnectionAggregatorPriv; + +struct _EmpathyConnectionAggregatorClass { + GObjectClass parent_class; +}; + +struct _EmpathyConnectionAggregator { + GObject parent; + EmpathyConnectionAggregatorPriv *priv; +}; + +GType empathy_connection_aggregator_get_type (void); + +/* TYPE MACROS */ +#define EMPATHY_TYPE_CONNECTION_AGGREGATOR \ + (empathy_connection_aggregator_get_type ()) +#define EMPATHY_CONNECTION_AGGREGATOR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_CONNECTION_AGGREGATOR, \ + EmpathyConnectionAggregator)) +#define EMPATHY_CONNECTION_AGGREGATOR_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_CONNECTION_AGGREGATOR, \ + EmpathyConnectionAggregatorClass)) +#define EMPATHY_IS_CONNECTION_AGGREGATOR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_CONNECTION_AGGREGATOR)) +#define EMPATHY_IS_CONNECTION_AGGREGATOR_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_CONNECTION_AGGREGATOR)) +#define EMPATHY_CONNECTION_AGGREGATOR_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CONNECTION_AGGREGATOR, \ + EmpathyConnectionAggregatorClass)) + +EmpathyConnectionAggregator * empathy_connection_aggregator_dup_singleton (void); + +GList * empathy_connection_aggregator_get_all_groups ( + EmpathyConnectionAggregator *self); + +GPtrArray * empathy_connection_aggregator_dup_all_contacts ( + EmpathyConnectionAggregator *self); + +G_END_DECLS + +#endif /* #ifndef __EMPATHY_CONNECTION_AGGREGATOR_H__*/ diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c index 3f24998f..b80071c5 100644 --- a/libempathy/empathy-contact-list.c +++ b/libempathy/empathy-contact-list.c @@ -145,18 +145,6 @@ empathy_contact_list_get_pendings (EmpathyContactList *list) return NULL; } -GList * -empathy_contact_list_get_all_groups (EmpathyContactList *list) -{ - g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL); - - if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_all_groups) { - return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_all_groups (list); - } - - return NULL; -} - GList * empathy_contact_list_get_groups (EmpathyContactList *list, EmpathyContact *contact) diff --git a/libempathy/empathy-contact-list.h b/libempathy/empathy-contact-list.h index ddd81c33..a9149369 100644 --- a/libempathy/empathy-contact-list.h +++ b/libempathy/empathy-contact-list.h @@ -48,7 +48,6 @@ struct _EmpathyContactListIface { const gchar *message); GList * (*get_members) (EmpathyContactList *list); GList * (*get_pendings) (EmpathyContactList *list); - GList * (*get_all_groups) (EmpathyContactList *list); GList * (*get_groups) (EmpathyContactList *list, EmpathyContact *contact); void (*add_to_group) (EmpathyContactList *list, @@ -73,7 +72,6 @@ void empathy_contact_list_remove (EmpathyContactList *list, const gchar *message); GList * empathy_contact_list_get_members (EmpathyContactList *list); GList * empathy_contact_list_get_pendings (EmpathyContactList *list); -GList * empathy_contact_list_get_all_groups (EmpathyContactList *list); GList * empathy_contact_list_get_groups (EmpathyContactList *list, EmpathyContact *contact); void empathy_contact_list_add_to_group (EmpathyContactList *list, diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c deleted file mode 100644 index 1ec6cba1..00000000 --- a/libempathy/empathy-contact-manager.c +++ /dev/null @@ -1,578 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2007-2008 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - */ - -#include - -#include - -#include -#include -#include -#include - -#include "empathy-contact-manager.h" -#include "empathy-contact-list.h" -#include "empathy-utils.h" - -#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include "empathy-debug.h" - -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContactManager) -typedef struct { - /* Owned (TpConnection *) => Owned (TpContactList *) - The contact list associated with each connected connection */ - GHashTable *lists; - TpAccountManager *account_manager; -} EmpathyContactManagerPriv; - -static void contact_manager_iface_init (EmpathyContactListIface *iface); - -G_DEFINE_TYPE_WITH_CODE (EmpathyContactManager, empathy_contact_manager, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CONTACT_LIST, - contact_manager_iface_init)); - -static EmpathyContactManager *manager_singleton = NULL; - -static void -contact_manager_members_changed_cb (EmpathyTpContactList *list, - EmpathyContact *contact, - EmpathyContact *actor, - guint reason, - gchar *message, - gboolean is_member, - EmpathyContactManager *manager) -{ - g_signal_emit_by_name (manager, "members-changed", - contact, actor, reason, message, is_member); -} - -static void -contact_manager_pendings_changed_cb (EmpathyTpContactList *list, - EmpathyContact *contact, - EmpathyContact *actor, - guint reason, - gchar *message, - gboolean is_pending, - EmpathyContactManager *manager) -{ - g_signal_emit_by_name (manager, "pendings-changed", - contact, actor, reason, message, is_pending); -} - -static void -contact_manager_groups_changed_cb (EmpathyTpContactList *list, - EmpathyContact *contact, - gchar *group, - gboolean is_member, - EmpathyContactManager *manager) -{ - g_signal_emit_by_name (manager, "groups-changed", - contact, group, is_member); -} - -static void -contact_manager_invalidated_cb (TpProxy *connection, - guint domain, - gint code, - gchar *message, - EmpathyContactManager *manager) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - EmpathyTpContactList *list; - - DEBUG ("Removing connection: %s (%s)", - tp_proxy_get_object_path (TP_PROXY (connection)), - message); - - list = g_hash_table_lookup (priv->lists, connection); - if (list) { - empathy_tp_contact_list_remove_all (list); - g_hash_table_remove (priv->lists, connection); - } -} - -static void -contact_manager_disconnect_foreach (gpointer key, - gpointer value, - gpointer user_data) -{ - TpConnection *connection = key; - EmpathyTpContactList *list = value; - EmpathyContactManager *manager = user_data; - - /* Disconnect signals from the list */ - g_signal_handlers_disconnect_by_func (list, - contact_manager_members_changed_cb, - manager); - g_signal_handlers_disconnect_by_func (list, - contact_manager_pendings_changed_cb, - manager); - g_signal_handlers_disconnect_by_func (list, - contact_manager_groups_changed_cb, - manager); - g_signal_handlers_disconnect_by_func (connection, - contact_manager_invalidated_cb, - manager); -} - -static void -contact_manager_status_changed_cb (TpAccount *account, - guint old_status, - guint new_status, - guint reason, - gchar *dbus_error_name, - GHashTable *details, - EmpathyContactManager *self) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (self); - EmpathyTpContactList *list; - TpConnection *connection; - - if (new_status == TP_CONNECTION_STATUS_DISCONNECTED) - /* No point to start tracking a connection which is about to die */ - return; - - connection = tp_account_get_connection (account); - - if (connection == NULL || g_hash_table_lookup (priv->lists, connection)) { - return; - } - - DEBUG ("Adding new connection: %s", - tp_proxy_get_object_path (TP_PROXY (connection))); - - list = empathy_tp_contact_list_new (connection); - g_hash_table_insert (priv->lists, g_object_ref (connection), list); - g_signal_connect (connection, "invalidated", - G_CALLBACK (contact_manager_invalidated_cb), - self); - - /* Connect signals */ - g_signal_connect (list, "members-changed", - G_CALLBACK (contact_manager_members_changed_cb), - self); - g_signal_connect (list, "pendings-changed", - G_CALLBACK (contact_manager_pendings_changed_cb), - self); - g_signal_connect (list, "groups-changed", - G_CALLBACK (contact_manager_groups_changed_cb), - self); -} - -static void -contact_manager_validity_changed_cb (TpAccountManager *account_manager, - TpAccount *account, - gboolean valid, - EmpathyContactManager *manager) -{ - if (valid) { - tp_g_signal_connect_object (account, "status-changed", - G_CALLBACK (contact_manager_status_changed_cb), - manager, 0); - } -} - -static void -contact_manager_finalize (GObject *object) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (object); - - g_hash_table_foreach (priv->lists, - contact_manager_disconnect_foreach, - object); - g_hash_table_unref (priv->lists); - - g_object_unref (priv->account_manager); -} - -static GObject * -contact_manager_constructor (GType type, - guint n_props, - GObjectConstructParam *props) -{ - GObject *retval; - - if (manager_singleton) { - retval = g_object_ref (manager_singleton); - } else { - retval = G_OBJECT_CLASS (empathy_contact_manager_parent_class)->constructor - (type, n_props, props); - - manager_singleton = EMPATHY_CONTACT_MANAGER (retval); - g_object_add_weak_pointer (retval, (gpointer) &manager_singleton); - } - - return retval; -} - -/** - * empathy_contact_manager_initialized: - * - * Reports whether or not the singleton has already been created. - * - * There can be instances where you want to access the #EmpathyContactManager - * only if it has been set up for this process. - * - * Returns: %TRUE if the #EmpathyContactManager singleton has previously - * been initialized. - */ -gboolean -empathy_contact_manager_initialized (void) -{ - return (manager_singleton != NULL); -} - -static void -empathy_contact_manager_class_init (EmpathyContactManagerClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = contact_manager_finalize; - object_class->constructor = contact_manager_constructor; - - g_type_class_add_private (object_class, sizeof (EmpathyContactManagerPriv)); -} - -static void -account_manager_prepared_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - GList *accounts, *l; - EmpathyContactManager *manager = user_data; - TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object); - GError *error = NULL; - - if (!tp_proxy_prepare_finish (account_manager, result, &error)) { - DEBUG ("Failed to prepare account manager: %s", error->message); - g_error_free (error); - return; - } - - accounts = tp_account_manager_get_valid_accounts (account_manager); - - for (l = accounts; l != NULL; l = l->next) { - TpAccount *account = l->data; - TpConnection *conn = tp_account_get_connection (account); - - if (conn != NULL) { - contact_manager_status_changed_cb (account, 0, 0, 0, - NULL, NULL, manager); - } - - tp_g_signal_connect_object (account, "status-changed", - G_CALLBACK (contact_manager_status_changed_cb), - manager, 0); - } - g_list_free (accounts); - - tp_g_signal_connect_object (account_manager, "account-validity-changed", - G_CALLBACK (contact_manager_validity_changed_cb), - manager, 0); -} - -static void -empathy_contact_manager_init (EmpathyContactManager *manager) -{ - EmpathyContactManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, - EMPATHY_TYPE_CONTACT_MANAGER, EmpathyContactManagerPriv); - - manager->priv = priv; - priv->lists = g_hash_table_new_full (empathy_proxy_hash, - empathy_proxy_equal, - (GDestroyNotify) g_object_unref, - (GDestroyNotify) g_object_unref); - - priv->account_manager = tp_account_manager_dup (); - - tp_proxy_prepare_async (priv->account_manager, NULL, - account_manager_prepared_cb, manager); -} - -EmpathyContactManager * -empathy_contact_manager_dup_singleton (void) -{ - return g_object_new (EMPATHY_TYPE_CONTACT_MANAGER, NULL); -} - -EmpathyTpContactList * -empathy_contact_manager_get_list (EmpathyContactManager *manager, - TpConnection *connection) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - - g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL); - g_return_val_if_fail (TP_IS_CONNECTION (connection), NULL); - - return g_hash_table_lookup (priv->lists, connection); -} - -static void -contact_manager_add (EmpathyContactList *manager, - EmpathyContact *contact, - const gchar *message) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - EmpathyContactList *list; - TpConnection *connection; - - g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager)); - - connection = empathy_contact_get_connection (contact); - list = g_hash_table_lookup (priv->lists, connection); - - if (list) { - empathy_contact_list_add (list, contact, message); - } -} - -static void -contact_manager_remove (EmpathyContactList *manager, - EmpathyContact *contact, - const gchar *message) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - EmpathyContactList *list; - TpConnection *connection; - - g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager)); - - connection = empathy_contact_get_connection (contact); - list = g_hash_table_lookup (priv->lists, connection); - - if (list) { - empathy_contact_list_remove (list, contact, message); - } -} - -static void -contact_manager_get_members_foreach (TpConnection *connection, - EmpathyTpContactList *list, - GList **contacts) -{ - GList *l; - - l = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (list)); - *contacts = g_list_concat (*contacts, l); -} - -static GList * -contact_manager_get_members (EmpathyContactList *manager) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - GList *contacts = NULL; - - g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL); - - g_hash_table_foreach (priv->lists, - (GHFunc) contact_manager_get_members_foreach, - &contacts); - - return contacts; -} - -static void -contact_manager_get_pendings_foreach (TpConnection *connection, - EmpathyTpContactList *list, - GList **contacts) -{ - GList *l; - - l = empathy_contact_list_get_pendings (EMPATHY_CONTACT_LIST (list)); - *contacts = g_list_concat (*contacts, l); -} - -static GList * -contact_manager_get_pendings (EmpathyContactList *manager) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - GList *contacts = NULL; - - g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL); - - g_hash_table_foreach (priv->lists, - (GHFunc) contact_manager_get_pendings_foreach, - &contacts); - - return contacts; -} - -static void -contact_manager_get_all_groups_foreach (TpConnection *connection, - EmpathyTpContactList *list, - GList **all_groups) -{ - GList *groups, *l; - - groups = empathy_contact_list_get_all_groups (EMPATHY_CONTACT_LIST (list)); - for (l = groups; l; l = l->next) { - if (!g_list_find_custom (*all_groups, - l->data, - (GCompareFunc) strcmp)) { - *all_groups = g_list_prepend (*all_groups, l->data); - } else { - g_free (l->data); - } - } - - g_list_free (groups); -} - -static GList * -contact_manager_get_all_groups (EmpathyContactList *manager) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - GList *groups = NULL; - - g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL); - - g_hash_table_foreach (priv->lists, - (GHFunc) contact_manager_get_all_groups_foreach, - &groups); - - return groups; -} - -static GList * -contact_manager_get_groups (EmpathyContactList *manager, - EmpathyContact *contact) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - EmpathyContactList *list; - TpConnection *connection; - - g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL); - - connection = empathy_contact_get_connection (contact); - list = g_hash_table_lookup (priv->lists, connection); - - if (list) { - return empathy_contact_list_get_groups (list, contact); - } - - return NULL; -} - -static void -contact_manager_add_to_group (EmpathyContactList *manager, - EmpathyContact *contact, - const gchar *group) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - EmpathyContactList *list; - TpConnection *connection; - - g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager)); - - connection = empathy_contact_get_connection (contact); - list = g_hash_table_lookup (priv->lists, connection); - - if (list) { - empathy_contact_list_add_to_group (list, contact, group); - } -} - -static void -contact_manager_remove_from_group (EmpathyContactList *manager, - EmpathyContact *contact, - const gchar *group) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - EmpathyContactList *list; - TpConnection *connection; - - g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager)); - - connection = empathy_contact_get_connection (contact); - list = g_hash_table_lookup (priv->lists, connection); - - if (list) { - empathy_contact_list_remove_from_group (list, contact, group); - } -} - -typedef struct { - const gchar *old_group; - const gchar *new_group; -} RenameGroupData; - -static void -contact_manager_rename_group_foreach (TpConnection *connection, - EmpathyTpContactList *list, - RenameGroupData *data) -{ - empathy_contact_list_rename_group (EMPATHY_CONTACT_LIST (list), - data->old_group, - data->new_group); -} - -static void -contact_manager_rename_group (EmpathyContactList *manager, - const gchar *old_group, - const gchar *new_group) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - RenameGroupData data; - - g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager)); - - data.old_group = old_group; - data.new_group = new_group; - g_hash_table_foreach (priv->lists, - (GHFunc) contact_manager_rename_group_foreach, - &data); -} - -static void contact_manager_remove_group_foreach (TpConnection *connection, - EmpathyTpContactList *list, - const gchar *group) -{ - empathy_contact_list_remove_group (EMPATHY_CONTACT_LIST (list), - group); -} - -static void -contact_manager_remove_group (EmpathyContactList *manager, - const gchar *group) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - - g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager)); - - g_hash_table_foreach (priv->lists, - (GHFunc) contact_manager_remove_group_foreach, - (gpointer) group); -} - -static void -contact_manager_iface_init (EmpathyContactListIface *iface) -{ - iface->add = contact_manager_add; - iface->remove = contact_manager_remove; - iface->get_members = contact_manager_get_members; - iface->get_pendings = contact_manager_get_pendings; - iface->get_all_groups = contact_manager_get_all_groups; - iface->get_groups = contact_manager_get_groups; - iface->add_to_group = contact_manager_add_to_group; - iface->remove_from_group = contact_manager_remove_from_group; - iface->rename_group = contact_manager_rename_group; - iface->remove_group = contact_manager_remove_group; -} diff --git a/libempathy/empathy-contact-manager.h b/libempathy/empathy-contact-manager.h deleted file mode 100644 index 4d149309..00000000 --- a/libempathy/empathy-contact-manager.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2007-2008 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - */ - -#ifndef __EMPATHY_CONTACT_MANAGER_H__ -#define __EMPATHY_CONTACT_MANAGER_H__ - -#include - -#include "empathy-contact.h" -#include "empathy-tp-contact-list.h" -#include "empathy-contact-list.h" - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_CONTACT_MANAGER (empathy_contact_manager_get_type ()) -#define EMPATHY_CONTACT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CONTACT_MANAGER, EmpathyContactManager)) -#define EMPATHY_CONTACT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_CONTACT_MANAGER, EmpathyContactManagerClass)) -#define EMPATHY_IS_CONTACT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONTACT_MANAGER)) -#define EMPATHY_IS_CONTACT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CONTACT_MANAGER)) -#define EMPATHY_CONTACT_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CONTACT_MANAGER, EmpathyContactManagerClass)) - -typedef struct _EmpathyContactManager EmpathyContactManager; -typedef struct _EmpathyContactManagerClass EmpathyContactManagerClass; - -struct _EmpathyContactManager { - GObject parent; - gpointer priv; -}; - -struct _EmpathyContactManagerClass { - GObjectClass parent_class; -}; - -GType empathy_contact_manager_get_type (void) G_GNUC_CONST; -gboolean empathy_contact_manager_initialized (void); -EmpathyContactManager *empathy_contact_manager_dup_singleton (void); -EmpathyTpContactList * empathy_contact_manager_get_list (EmpathyContactManager *manager, - TpConnection *connection); - -G_END_DECLS - -#endif /* __EMPATHY_CONTACT_MANAGER_H__ */ diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 15946a16..c947fad6 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -694,6 +694,34 @@ contact_is_tpl_entity (gpointer key, !tp_strdiff (tp_proxy_get_object_path (data->account), path); } +static void +get_contacts_cb (TpConnection *connection, + guint n_contacts, + TpContact * const *contacts, + const gchar * const *requested_ids, + GHashTable *failed_id_errors, + const GError *error, + gpointer user_data, + GObject *weak_object) +{ + EmpathyContact *self = (EmpathyContact *) weak_object; + EmpathyContactPriv *priv = GET_PRIV (self); + TpContact *tp_contact; + + if (n_contacts != 1) + return; + + tp_contact = contacts[0]; + + g_return_if_fail (priv->tp_contact == NULL); + priv->tp_contact = g_object_ref (tp_contact); + g_object_notify (G_OBJECT (self), "tp-contact"); + + /* Update capabilities now that we have a TpContact */ + set_capabilities_from_tp_caps (self, + tp_contact_get_capabilities (tp_contact)); +} + EmpathyContact * empathy_contact_from_tpl_contact (TpAccount *account, TplEntity *tpl_entity) @@ -724,14 +752,33 @@ empathy_contact_from_tpl_contact (TpAccount *account, } else { + TpConnection *conn; + const gchar *id; + is_user = (TPL_ENTITY_SELF == tpl_entity_get_entity_type (tpl_entity)); + id = tpl_entity_get_identifier (tpl_entity); + retval = g_object_new (EMPATHY_TYPE_CONTACT, - "id", tpl_entity_get_identifier (tpl_entity), + "id", id, "alias", tpl_entity_get_alias (tpl_entity), "account", account, "is-user", is_user, NULL); + + /* Try to get a TpContact associated to have at least contact + * capabilities if possible. This is useful for CM supporting calling + * offline contacts for example. */ + conn = tp_account_get_connection (account); + if (conn != NULL) + { + TpContactFeature features[] = { TP_CONTACT_FEATURE_CAPABILITIES }; + conn = tp_account_get_connection (account); + + tp_connection_get_contacts_by_id (conn, 1, &id, + G_N_ELEMENTS (features), features, get_contacts_cb, + NULL, NULL, G_OBJECT (retval)); + } } if (!EMP_STR_EMPTY (tpl_entity_get_avatar_token (tpl_entity))) @@ -956,46 +1003,14 @@ empathy_contact_get_persona (EmpathyContact *contact) if (priv->persona == NULL && priv->tp_contact != NULL) { - /* FIXME: This is disgustingly slow */ - /* Query for the persona */ - EmpathyIndividualManager *manager; - GList *individuals, *l; - - manager = empathy_individual_manager_dup_singleton (); - individuals = empathy_individual_manager_get_members (manager); + TpfPersona *persona; - for (l = individuals; l != NULL; l = l->next) + persona = tpf_persona_dup_for_contact (priv->tp_contact); + if (persona != NULL) { - FolksIndividual *individual = FOLKS_INDIVIDUAL (l->data); - GeeSet *personas; - GeeIterator *iter; - gboolean persona_found = FALSE; - - personas = folks_individual_get_personas (individual); - iter = gee_iterable_iterator (GEE_ITERABLE (personas)); - while (!persona_found && gee_iterator_next (iter)) - { - TpfPersona *persona = gee_iterator_get (iter); - - if (empathy_folks_persona_is_interesting (FOLKS_PERSONA (persona))) - { - TpContact *tp_contact = tpf_persona_get_contact (persona); - - if (tp_contact == priv->tp_contact) - { - /* Found the right persona */ - empathy_contact_set_persona (contact, - (FolksPersona *) persona); - persona_found = TRUE; - } - g_clear_object (&persona); - } - } - g_clear_object (&iter); + empathy_contact_set_persona (contact, (FolksPersona *) persona); + g_object_unref (persona); } - - g_list_free (individuals); - g_object_unref (manager); } return priv->persona; diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c index fb2497a5..10c8bea0 100644 --- a/libempathy/empathy-ft-factory.c +++ b/libempathy/empathy-ft-factory.c @@ -182,11 +182,11 @@ handle_channels_cb (TpSimpleHandler *handler, if (tp_proxy_get_invalidated (channel) != NULL) continue; - if (!EMPATHY_IS_TP_FILE (channel)) + if (!TP_IS_FILE_TRANSFER_CHANNEL (channel)) continue; /* We handle only incoming FT */ - empathy_ft_handler_new_incoming ((EmpathyTpFile *) channel, + empathy_ft_handler_new_incoming ((TpFileTransferChannel *) channel, ft_handler_incoming_ready_cb, self); } diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 3d652524..c701b193 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -76,7 +76,7 @@ G_DEFINE_TYPE (EmpathyFTHandler, empathy_ft_handler, G_TYPE_OBJECT) #define BUFFER_SIZE 4096 enum { - PROP_TP_FILE = 1, + PROP_CHANNEL = 1, PROP_G_FILE, PROP_CONTACT, PROP_CONTENT_TYPE, @@ -120,7 +120,7 @@ typedef struct { gboolean dispose_run; GFile *gfile; - EmpathyTpFile *tpfile; + TpFileTransferChannel *channel; GCancellable *cancellable; gboolean use_hash; @@ -188,8 +188,8 @@ do_get_property (GObject *object, case PROP_G_FILE: g_value_set_object (value, priv->gfile); break; - case PROP_TP_FILE: - g_value_set_object (value, priv->tpfile); + case PROP_CHANNEL: + g_value_set_object (value, priv->channel); break; case PROP_USER_ACTION_TIME: g_value_set_int64 (value, priv->user_action_time); @@ -233,8 +233,8 @@ do_set_property (GObject *object, case PROP_G_FILE: priv->gfile = g_value_dup_object (value); break; - case PROP_TP_FILE: - priv->tpfile = g_value_dup_object (value); + case PROP_CHANNEL: + priv->channel = g_value_dup_object (value); break; case PROP_USER_ACTION_TIME: priv->user_action_time = g_value_get_int64 (value); @@ -264,10 +264,10 @@ do_dispose (GObject *object) priv->gfile = NULL; } - if (priv->tpfile != NULL) { - empathy_tp_file_close (priv->tpfile); - g_object_unref (priv->tpfile); - priv->tpfile = NULL; + if (priv->channel != NULL) { + tp_channel_close_async (TP_CHANNEL (priv->channel), NULL, NULL); + g_object_unref (priv->channel); + priv->channel = NULL; } if (priv->cancellable != NULL) { @@ -410,15 +410,15 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) g_object_class_install_property (object_class, PROP_G_FILE, param_spec); /** - * EmpathyFTHandler:tp-file: + * EmpathyFTHandler:channel: * - * The underlying #EmpathyTpFile managing the transfer + * The underlying #TpFileTransferChannel managing the transfer */ - param_spec = g_param_spec_object ("tp-file", - "tp-file", "The file's channel wrapper", - EMPATHY_TYPE_TP_FILE, + param_spec = g_param_spec_object ("channel", + "channel", "The file transfer channel", + TP_TYPE_FILE_TRANSFER_CHANNEL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); - g_object_class_install_property (object_class, PROP_TP_FILE, param_spec); + g_object_class_install_property (object_class, PROP_CHANNEL, param_spec); param_spec = g_param_spec_int64 ("user-action-time", "user action time", "User action time", @@ -432,7 +432,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) /** * EmpathyFTHandler::transfer-started * @handler: the object which has received the signal - * @tp_file: the #EmpathyTpFile for which the transfer has started + * @channel: the #TpFileTransferChannel for which the transfer has started * * This signal is emitted when the actual transfer starts. */ @@ -441,12 +441,12 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, - 1, EMPATHY_TYPE_TP_FILE); + 1, TP_TYPE_FILE_TRANSFER_CHANNEL); /** * EmpathyFTHandler::transfer-done * @handler: the object which has received the signal - * @tp_file: the #EmpathyTpFile for which the transfer has started + * @channel: the #TpFileTransferChannel for which the transfer has started * * This signal will be emitted when the actual transfer is completed * successfully. @@ -456,7 +456,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, - 1, EMPATHY_TYPE_TP_FILE); + 1, TP_TYPE_FILE_TRANSFER_CHANNEL); /** * EmpathyFTHandler::transfer-error @@ -634,34 +634,6 @@ emit_error_signal (EmpathyFTHandler *handler, g_signal_emit (handler, signals[TRANSFER_ERROR], 0, error); } -static void -ft_transfer_operation_callback (EmpathyTpFile *tp_file, - const GError *error, - gpointer user_data) -{ - EmpathyFTHandler *handler = user_data; - EmpathyFTHandlerPriv *priv = GET_PRIV (handler); - - DEBUG ("Transfer operation callback, error %p", error); - - if (error != NULL) - { - emit_error_signal (handler, error); - } - else - { - priv->is_completed = TRUE; - g_signal_emit (handler, signals[TRANSFER_DONE], 0, tp_file); - - empathy_tp_file_close (tp_file); - - if (empathy_ft_handler_is_incoming (handler) && priv->use_hash) - { - check_hash_incoming (handler); - } - } -} - static void update_remaining_time_and_speed (EmpathyFTHandler *handler, guint64 transferred_bytes) @@ -690,32 +662,135 @@ update_remaining_time_and_speed (EmpathyFTHandler *handler, } static void -ft_transfer_progress_callback (EmpathyTpFile *tp_file, - guint64 transferred_bytes, - gpointer user_data) +ft_transfer_transferred_bytes_cb (TpFileTransferChannel *channel, + GParamSpec *pspec, + EmpathyFTHandler *handler) { - EmpathyFTHandler *handler = user_data; EmpathyFTHandlerPriv *priv = GET_PRIV (handler); + guint64 bytes; if (empathy_ft_handler_is_cancelled (handler)) return; - if (transferred_bytes == 0) + bytes = tp_file_transfer_channel_get_transferred_bytes (channel); + + if (priv->transferred_bytes == 0) { priv->last_update_time = empathy_time_get_current (); - g_signal_emit (handler, signals[TRANSFER_STARTED], 0, tp_file); + g_signal_emit (handler, signals[TRANSFER_STARTED], 0, channel); } - if (priv->transferred_bytes != transferred_bytes) + if (priv->transferred_bytes != bytes) { - update_remaining_time_and_speed (handler, transferred_bytes); + update_remaining_time_and_speed (handler, bytes); g_signal_emit (handler, signals[TRANSFER_PROGRESS], 0, - transferred_bytes, priv->total_bytes, priv->remaining_time, + bytes, priv->total_bytes, priv->remaining_time, priv->speed); } } +static void +ft_transfer_provide_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + TpFileTransferChannel *channel = TP_FILE_TRANSFER_CHANNEL (source); + EmpathyFTHandler *handler = user_data; + GError *error = NULL; + + if (!tp_file_transfer_channel_provide_file_finish (channel, result, &error)) + { + emit_error_signal (handler, error); + g_clear_error (&error); + } +} + +static void +ft_transfer_accept_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + TpFileTransferChannel *channel = TP_FILE_TRANSFER_CHANNEL (source); + EmpathyFTHandler *handler = user_data; + GError *error = NULL; + + if (!tp_file_transfer_channel_accept_file_finish (channel, result, &error)) + { + emit_error_signal (handler, error); + g_clear_error (&error); + } +} + +static GError * +error_from_state_change_reason (TpFileTransferStateChangeReason reason) +{ + const char *string; + GError *retval = NULL; + + string = NULL; + + switch (reason) + { + case TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE: + string = _("No reason was specified"); + break; + case TP_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED: + string = _("The change in state was requested"); + break; + case TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_STOPPED: + string = _("You canceled the file transfer"); + break; + case TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED: + string = _("The other participant canceled the file transfer"); + break; + case TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR: + string = _("Error while trying to transfer the file"); + break; + case TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_ERROR: + string = _("The other participant is unable to transfer the file"); + break; + default: + string = _("Unknown reason"); + break; + } + + retval = g_error_new_literal (EMPATHY_FT_ERROR_QUARK, + EMPATHY_FT_ERROR_TP_ERROR, string); + + return retval; +} + +static void +ft_transfer_state_cb (TpFileTransferChannel *channel, + GParamSpec *pspec, + EmpathyFTHandler *handler) +{ + EmpathyFTHandlerPriv *priv = GET_PRIV (handler); + TpFileTransferStateChangeReason reason; + TpFileTransferState state = tp_file_transfer_channel_get_state ( + channel, &reason); + + if (state == TP_FILE_TRANSFER_STATE_COMPLETED) + { + priv->is_completed = TRUE; + g_signal_emit (handler, signals[TRANSFER_DONE], 0, channel); + + tp_channel_close_async (TP_CHANNEL (channel), NULL, NULL); + + if (empathy_ft_handler_is_incoming (handler) && priv->use_hash) + { + check_hash_incoming (handler); + } + } + else if (state == TP_FILE_TRANSFER_STATE_CANCELLED) + { + GError *error = error_from_state_change_reason (reason); + emit_error_signal (handler, error); + g_clear_error (&error); + } +} + static void ft_handler_create_channel_cb (GObject *source, GAsyncResult *result, @@ -745,11 +820,15 @@ ft_handler_create_channel_cb (GObject *source, return; } - priv->tpfile = EMPATHY_TP_FILE (channel); + priv->channel = TP_FILE_TRANSFER_CHANNEL (channel); - empathy_tp_file_offer (priv->tpfile, priv->gfile, priv->cancellable, - ft_transfer_progress_callback, handler, - ft_transfer_operation_callback, handler); + tp_g_signal_connect_object (priv->channel, "notify::state", + G_CALLBACK (ft_transfer_state_cb), handler, 0); + tp_g_signal_connect_object (priv->channel, "notify::transferred-bytes", + G_CALLBACK (ft_transfer_transferred_bytes_cb), handler, 0); + + tp_file_transfer_channel_provide_file_async (priv->channel, priv->gfile, + ft_transfer_provide_cb, handler); } static void @@ -1332,7 +1411,7 @@ empathy_ft_handler_new_outgoing (EmpathyContact *contact, /** * empathy_ft_handler_new_incoming: - * @tp_file: the #EmpathyTpFile wrapping the incoming channel + * @channel: the #TpFileTransferChannel proxy to the incoming channel * @callback: callback to be called when the handler has been created * @user_data: user data to be passed to @callback * @@ -1342,19 +1421,18 @@ empathy_ft_handler_new_outgoing (EmpathyContact *contact, * is ready. */ void -empathy_ft_handler_new_incoming (EmpathyTpFile *tp_file, +empathy_ft_handler_new_incoming (TpFileTransferChannel *channel, EmpathyFTHandlerReadyCallback callback, gpointer user_data) { EmpathyFTHandler *handler; CallbacksData *data; - TpFileTransferChannel *ft_chan = (TpFileTransferChannel *) tp_file; EmpathyFTHandlerPriv *priv; - g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file)); + g_return_if_fail (TP_IS_FILE_TRANSFER_CHANNEL (channel)); handler = g_object_new (EMPATHY_TYPE_FT_HANDLER, - "tp-file", tp_file, NULL); + "channel", channel, NULL); priv = GET_PRIV (handler); @@ -1363,20 +1441,20 @@ empathy_ft_handler_new_incoming (EmpathyTpFile *tp_file, data->user_data = user_data; data->handler = g_object_ref (handler); - priv->total_bytes = tp_file_transfer_channel_get_size (ft_chan); + priv->total_bytes = tp_file_transfer_channel_get_size (channel); priv->transferred_bytes = tp_file_transfer_channel_get_transferred_bytes ( - ft_chan); + channel); - priv->filename = g_strdup (tp_file_transfer_channel_get_filename (ft_chan)); + priv->filename = g_strdup (tp_file_transfer_channel_get_filename (channel)); priv->content_type = g_strdup (tp_file_transfer_channel_get_mime_type ( - ft_chan)); + channel)); priv->description = g_strdup (tp_file_transfer_channel_get_description ( - ft_chan)); + channel)); - tp_cli_dbus_properties_call_get_all (tp_file, + tp_cli_dbus_properties_call_get_all (channel, -1, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, channel_get_all_properties_cb, data, NULL, G_OBJECT (handler)); } @@ -1397,16 +1475,20 @@ empathy_ft_handler_start_transfer (EmpathyFTHandler *handler) priv = GET_PRIV (handler); - if (priv->tpfile == NULL) + if (priv->channel == NULL) { ft_handler_complete_request (handler); } else { /* TODO: add support for resume. */ - empathy_tp_file_accept (priv->tpfile, 0, priv->gfile, priv->cancellable, - ft_transfer_progress_callback, handler, - ft_transfer_operation_callback, handler); + tp_file_transfer_channel_accept_file_async (priv->channel, + priv->gfile, 0, ft_transfer_accept_cb, handler); + + tp_g_signal_connect_object (priv->channel, "notify::state", + G_CALLBACK (ft_transfer_state_cb), handler, 0); + tp_g_signal_connect_object (priv->channel, "notify::transferred-bytes", + G_CALLBACK (ft_transfer_transferred_bytes_cb), handler, 0); } } @@ -1427,13 +1509,13 @@ empathy_ft_handler_cancel_transfer (EmpathyFTHandler *handler) priv = GET_PRIV (handler); - /* if we don't have an EmpathyTpFile, we are hashing, so + /* if we don't have a channel, we are hashing, so * we can just cancel the GCancellable to stop it. */ - if (priv->tpfile == NULL) + if (priv->channel == NULL) g_cancellable_cancel (priv->cancellable); else - empathy_tp_file_cancel (priv->tpfile); + tp_channel_close_async (TP_CHANNEL (priv->channel), NULL, NULL); } /** @@ -1587,10 +1669,10 @@ empathy_ft_handler_is_incoming (EmpathyFTHandler *handler) priv = GET_PRIV (handler); - if (priv->tpfile == NULL) + if (priv->channel == NULL) return FALSE; - return !tp_channel_get_requested ((TpChannel *) priv->tpfile); + return !tp_channel_get_requested ((TpChannel *) priv->channel); } /** diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h index a4392b50..7111cd25 100644 --- a/libempathy/empathy-ft-handler.h +++ b/libempathy/empathy-ft-handler.h @@ -27,7 +27,8 @@ #include #include -#include "empathy-tp-file.h" +#include + #include "empathy-contact.h" G_BEGIN_DECLS @@ -56,6 +57,18 @@ typedef struct { GObjectClass parent_class; } EmpathyFTHandlerClass; +#define EMPATHY_FT_ERROR_QUARK g_quark_from_static_string ("EmpathyFTError") + +typedef enum { + EMPATHY_FT_ERROR_FAILED, + EMPATHY_FT_ERROR_HASH_MISMATCH, + EMPATHY_FT_ERROR_TP_ERROR, + EMPATHY_FT_ERROR_SOCKET, + EMPATHY_FT_ERROR_NOT_SUPPORTED, + EMPATHY_FT_ERROR_INVALID_SOURCE_FILE, + EMPATHY_FT_ERROR_EMPTY_SOURCE_FILE +} EmpathyFTErrorEnum; + /** * EmpathyFTHandlerReadyCallback: * @handler: the handler which is now ready @@ -75,7 +88,7 @@ void empathy_ft_handler_new_outgoing (EmpathyContact *contact, EmpathyFTHandlerReadyCallback callback, gpointer user_data); -void empathy_ft_handler_new_incoming (EmpathyTpFile *tp_file, +void empathy_ft_handler_new_incoming (TpFileTransferChannel *channel, EmpathyFTHandlerReadyCallback callback, gpointer user_data); void empathy_ft_handler_incoming_set_destination (EmpathyFTHandler *handler, diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h index ad55a944..fd05141a 100644 --- a/libempathy/empathy-gsettings.h +++ b/libempathy/empathy-gsettings.h @@ -66,6 +66,7 @@ G_BEGIN_DECLS #define EMPATHY_PREFS_CHAT_AVATAR_IN_ICON "avatar-in-icon" #define EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS "enable-webkit-developer-tools" #define EMPATHY_PREFS_CHAT_ROOM_LAST_ACCOUNT "room-last-account" +#define EMPATHY_PREFS_CHAT_SEND_CHAT_STATES "send-chat-states" #define EMPATHY_PREFS_UI_SCHEMA EMPATHY_PREFS_SCHEMA ".ui" #define EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS "separate-chat-windows" @@ -77,6 +78,7 @@ G_BEGIN_DECLS #define EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST "compact-contact-list" #define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS "chat-window-paned-pos" #define EMPATHY_PREFS_UI_SHOW_OFFLINE "show-offline" +#define EMPATHY_PREFS_UI_SHOW_GROUPS "show-groups" #define EMPATHY_PREFS_CONTACTS_SCHEMA EMPATHY_PREFS_SCHEMA ".contacts" #define EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM "sort-criterium" diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index 5305c41e..68b094ef 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -36,7 +36,6 @@ #include "empathy-individual-manager.h" #include "empathy-utils.h" -#include "empathy-contact-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include "empathy-debug.h" @@ -51,6 +50,7 @@ typedef struct { FolksIndividualAggregator *aggregator; GHashTable *individuals; /* Individual.id -> Individual */ + gboolean contacts_loaded; } EmpathyIndividualManagerPriv; enum @@ -58,6 +58,7 @@ enum FAVOURITES_CHANGED, GROUPS_CHANGED, MEMBERS_CHANGED, + CONTACTS_LOADED, LAST_SIGNAL }; @@ -335,10 +336,41 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass) G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_UINT); + signals[CONTACTS_LOADED] = + g_signal_new ("contacts-loaded", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 0); + g_type_class_add_private (object_class, sizeof (EmpathyIndividualManagerPriv)); } +static void +aggregator_is_quiescent_notify_cb (FolksIndividualAggregator *aggregator, + GParamSpec *spec, + EmpathyIndividualManager *self) +{ + EmpathyIndividualManagerPriv *priv = GET_PRIV (self); + gboolean is_quiescent; + + if (priv->contacts_loaded) + return; + + g_object_get (aggregator, "is-quiescent", &is_quiescent, NULL); + + if (!is_quiescent) + return; + + priv->contacts_loaded = TRUE; + + g_signal_emit (self, signals[CONTACTS_LOADED], 0); +} + static void empathy_individual_manager_init (EmpathyIndividualManager *self) { @@ -352,6 +384,8 @@ empathy_individual_manager_init (EmpathyIndividualManager *self) priv->aggregator = folks_individual_aggregator_new (); g_signal_connect (priv->aggregator, "individuals-changed-detailed", G_CALLBACK (aggregator_individuals_changed_cb), self); + g_signal_connect (priv->aggregator, "notify::is-quiescent", + G_CALLBACK (aggregator_is_quiescent_notify_cb), self); folks_individual_aggregator_prepare (priv->aggregator, NULL, NULL); } @@ -721,3 +755,63 @@ empathy_individual_manager_unlink_individual (EmpathyIndividualManager *self, folks_individual_aggregator_unlink_individual (priv->aggregator, individual, (GAsyncReadyCallback) unlink_individual_cb, NULL); } + +gboolean +empathy_individual_manager_get_contacts_loaded (EmpathyIndividualManager *self) +{ + EmpathyIndividualManagerPriv *priv = GET_PRIV (self); + + return priv->contacts_loaded; +} + +static gboolean +individual_has_contact (FolksIndividual *individual, + TpContact *contact) +{ + GeeSet *personas; + GeeIterator *iter; + gboolean found = FALSE; + + personas = folks_individual_get_personas (individual); + iter = gee_iterable_iterator (GEE_ITERABLE (personas)); + + while (!found && gee_iterator_next (iter)) + { + TpfPersona *persona = gee_iterator_get (iter); + + if (TPF_IS_PERSONA (persona)) + { + TpContact *c = tpf_persona_get_contact (persona); + + if (c == contact) + found = TRUE; + } + + g_clear_object (&persona); + } + + g_clear_object (&iter); + + return found; +} + +/* Try finding a FolksIndividual containing @contact as one of his persona */ +FolksIndividual * +empathy_individual_manager_lookup_by_contact (EmpathyIndividualManager *self, + TpContact *contact) +{ + EmpathyIndividualManagerPriv *priv = GET_PRIV (self); + GHashTableIter iter; + gpointer value; + + g_hash_table_iter_init (&iter, priv->individuals); + while (g_hash_table_iter_next (&iter, NULL, &value)) + { + FolksIndividual *individual = value; + + if (individual_has_contact (individual, contact)) + return individual; + } + + return NULL; +} diff --git a/libempathy/empathy-individual-manager.h b/libempathy/empathy-individual-manager.h index 0d5cc74d..08a1faad 100644 --- a/libempathy/empathy-individual-manager.h +++ b/libempathy/empathy-individual-manager.h @@ -90,5 +90,12 @@ void empathy_individual_manager_set_blocked (EmpathyIndividualManager *self, gboolean blocked, gboolean abusive); +gboolean empathy_individual_manager_get_contacts_loaded ( + EmpathyIndividualManager *self); + +FolksIndividual * empathy_individual_manager_lookup_by_contact ( + EmpathyIndividualManager *self, + TpContact *contact); + G_END_DECLS #endif /* __EMPATHY_INDIVIDUAL_MANAGER_H__ */ diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c index 3a5f6dc7..e63ed12d 100644 --- a/libempathy/empathy-keyring.c +++ b/libempathy/empathy-keyring.c @@ -78,7 +78,7 @@ find_items_cb (GnomeKeyringResult result, * modified or something but we don't have this information from * gnome-keyring atm. */ found = list->data; - DEBUG ("Got secret"); + DEBUG ("Got %d secrets; use the first one", g_list_length (list)); g_simple_async_result_set_op_res_gpointer (simple, g_strdup (found->secret), g_free); diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 995f49ab..6111bcd8 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -633,75 +633,6 @@ empathy_message_is_backlog (EmpathyMessage *message) return priv->is_backlog; } -#define IS_SEPARATOR(ch) (ch == ' ' || ch == ',' || ch == '.' || ch == ':') -gboolean -empathy_message_should_highlight (EmpathyMessage *message) -{ - EmpathyContact *contact; - const gchar *msg, *to; - gchar *cf_msg, *cf_to; - gchar *ch; - gboolean ret_val; - TpChannelTextMessageFlags flags; - - g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE); - - ret_val = FALSE; - - msg = empathy_message_get_body (message); - if (!msg) { - return FALSE; - } - - contact = empathy_message_get_receiver (message); - if (!contact || !empathy_contact_is_user (contact)) { - return FALSE; - } - - to = empathy_contact_get_alias (contact); - if (!to) { - return FALSE; - } - - flags = empathy_message_get_flags (message); - if (flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK) { - /* FIXME: Ideally we shouldn't highlight scrollback messages only if they - * have already been received by the user before (and so are in the logs) */ - return FALSE; - } - - cf_msg = g_utf8_casefold (msg, -1); - cf_to = g_utf8_casefold (to, -1); - - ch = strstr (cf_msg, cf_to); - if (ch == NULL) { - goto finished; - } - if (ch != cf_msg) { - /* Not first in the message */ - if (!IS_SEPARATOR (*(ch - 1))) { - goto finished; - } - } - - ch = ch + strlen (cf_to); - if (ch >= cf_msg + strlen (cf_msg)) { - ret_val = TRUE; - goto finished; - } - - if (IS_SEPARATOR (*ch)) { - ret_val = TRUE; - goto finished; - } - -finished: - g_free (cf_msg); - g_free (cf_to); - - return ret_val; -} - TpChannelTextMessageType empathy_message_type_from_str (const gchar *type_str) { diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h index 0c27c09e..81da7bf4 100644 --- a/libempathy/empathy-message.h +++ b/libempathy/empathy-message.h @@ -77,7 +77,6 @@ gint64 empathy_message_get_original_timestamp (EmpathyMessage gboolean empathy_message_is_backlog (EmpathyMessage *message); gboolean empathy_message_is_incoming (EmpathyMessage *message); -gboolean empathy_message_should_highlight (EmpathyMessage *message); TpChannelTextMessageType empathy_message_type_from_str (const gchar *type_str); const gchar * empathy_message_type_to_str (TpChannelTextMessageType type); diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c new file mode 100644 index 00000000..259cd7f7 --- /dev/null +++ b/libempathy/empathy-pkg-kit.c @@ -0,0 +1,161 @@ +/* + * Copyright (C) 2012 Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Authors: Guillaume Desmottes + */ + +#include "config.h" + +#include + +typedef struct +{ + guint xid; + gchar **packages; + gchar *options; + + GSimpleAsyncResult *result; + GCancellable *cancellable; +} InstallCtx; + +static InstallCtx * +install_ctx_new (guint xid, + const gchar **packages, + const gchar *options, + GSimpleAsyncResult *result, + GCancellable *cancellable) +{ + InstallCtx *ctx = g_slice_new (InstallCtx); + + ctx->xid = xid; + ctx->packages = g_strdupv ((gchar **) packages); + ctx->options = g_strdup (options); + ctx->result = g_object_ref (result); + ctx->cancellable = cancellable != NULL ? g_object_ref (cancellable) : NULL; + return ctx; +} + +static void +install_ctx_free (InstallCtx *ctx) +{ + g_free (ctx->packages); + g_free (ctx->options); + g_object_unref (ctx->result); + g_slice_free (InstallCtx, ctx); +} + +static void +install_ctx_complete (InstallCtx *ctx) +{ + g_simple_async_result_complete (ctx->result); + install_ctx_free (ctx); +} + +static void +install_ctx_failed (InstallCtx *ctx, + GError *error) +{ + g_simple_async_result_take_error (ctx->result, error); + install_ctx_complete (ctx); +} + +static void +install_package_names_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + InstallCtx *ctx = user_data; + GError *error = NULL; + GVariant *res; + + res = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), result, &error); + if (res == NULL) + { + install_ctx_failed (ctx, error); + return; + } + + install_ctx_complete (ctx); + + g_variant_unref (res); +} + +static void +pkg_kit_proxy_new_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + InstallCtx *ctx = user_data; + GError *error = NULL; + GDBusProxy *proxy; + + proxy = g_dbus_proxy_new_for_bus_finish (result, &error); + if (proxy == NULL) + { + install_ctx_failed (ctx, error); + return; + } + + g_dbus_proxy_call (proxy, "InstallPackageNames", + g_variant_new ("(u^a&ss)", ctx->xid, ctx->packages, ctx->options), + G_DBUS_CALL_FLAGS_NONE, -1, NULL, install_package_names_cb, ctx); + + g_object_unref (proxy); +} + +/* Ideally this should live in PackageKit (fdo #45741) */ +void +empathy_pkg_kit_install_packages_async ( + guint xid, + const gchar **packages, + const gchar *options, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + InstallCtx *ctx; + GSimpleAsyncResult *result; + + result = g_simple_async_result_new (NULL, callback, user_data, + empathy_pkg_kit_install_packages_async); + + ctx = install_ctx_new (xid, packages, options != NULL ? options : "", + result, cancellable); + + g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_NONE, NULL, + "org.freedesktop.PackageKit", + "/org/freedesktop/PackageKit", + "org.freedesktop.PackageKit.Modify", + NULL, pkg_kit_proxy_new_cb, ctx); + + g_object_unref (result); +} + +gboolean +empathy_pkg_kit_install_packages_finish (GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL, + empathy_pkg_kit_install_packages_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), + error)) + return FALSE; + + return TRUE; +} diff --git a/libempathy/empathy-pkg-kit.h b/libempathy/empathy-pkg-kit.h new file mode 100644 index 00000000..b824d768 --- /dev/null +++ b/libempathy/empathy-pkg-kit.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2012 Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Authors: Guillaume Desmottes + */ + +#ifndef __EMPATHY_PKG_KIT__ +#define __EMPATHY_PKG_KIT__ + +#include +#include + +void empathy_pkg_kit_install_packages_async ( + guint xid, + const gchar **packages, + const gchar *options, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean empathy_pkg_kit_install_packages_finish (GAsyncResult *result, + GError **error); + +#endif diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c index 67867f96..22af1ec7 100644 --- a/libempathy/empathy-presence-manager.c +++ b/libempathy/empathy-presence-manager.c @@ -32,7 +32,6 @@ #include #include "empathy-utils.h" -#include "empathy-connectivity.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" @@ -47,7 +46,6 @@ struct _EmpathyPresenceManagerPrivate { DBusGProxy *gs_proxy; - EmpathyConnectivity *connectivity; gboolean ready; @@ -56,8 +54,6 @@ struct _EmpathyPresenceManagerPrivate gboolean auto_away; TpConnectionPresenceType away_saved_state; - TpConnectionPresenceType saved_state; - gchar *saved_status; gboolean is_idle; guint ext_away_timeout; @@ -175,9 +171,8 @@ session_status_changed_cb (DBusGProxy *gs_proxy, is_idle ? "yes" : "no"); if (!self->priv->auto_away || - (self->priv->saved_state == TP_CONNECTION_PRESENCE_TYPE_UNSET && - (self->priv->state <= TP_CONNECTION_PRESENCE_TYPE_OFFLINE || - self->priv->state == TP_CONNECTION_PRESENCE_TYPE_HIDDEN))) + (self->priv->state <= TP_CONNECTION_PRESENCE_TYPE_OFFLINE || + self->priv->state == TP_CONNECTION_PRESENCE_TYPE_HIDDEN)) { /* We don't want to go auto away OR we explicitely asked to be * offline, nothing to do here */ @@ -192,13 +187,7 @@ session_status_changed_cb (DBusGProxy *gs_proxy, ext_away_start (self); - if (self->priv->saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) - /* We are disconnected, when coming back from away - * we want to restore the presence before the - * disconnection. */ - self->priv->away_saved_state = self->priv->saved_state; - else - self->priv->away_saved_state = self->priv->state; + self->priv->away_saved_state = self->priv->state; new_state = TP_CONNECTION_PRESENCE_TYPE_AWAY; if (self->priv->state == TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY) @@ -240,37 +229,6 @@ session_status_changed_cb (DBusGProxy *gs_proxy, self->priv->is_idle = is_idle; } -static void -state_change_cb (EmpathyConnectivity *connectivity, - gboolean new_online, - EmpathyPresenceManager *self) -{ - if (!new_online) - { - /* We are no longer connected */ - DEBUG ("Disconnected: Save state %d (%s)", - self->priv->state, self->priv->status); - self->priv->saved_state = self->priv->state; - g_free (self->priv->saved_status); - self->priv->saved_status = g_strdup (self->priv->status); - empathy_presence_manager_set_state (self, - TP_CONNECTION_PRESENCE_TYPE_OFFLINE); - } - else if (new_online - && self->priv->saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) - { - /* We are now connected */ - DEBUG ("Reconnected: Restore state %d (%s)", - self->priv->saved_state, self->priv->saved_status); - empathy_presence_manager_set_presence (self, - self->priv->saved_state, - self->priv->saved_status); - self->priv->saved_state = TP_CONNECTION_PRESENCE_TYPE_UNSET; - g_free (self->priv->saved_status); - self->priv->saved_status = NULL; - } -} - static void presence_manager_dispose (GObject *object) { @@ -279,7 +237,6 @@ presence_manager_dispose (GObject *object) tp_clear_object (&self->priv->gs_proxy); tp_clear_object (&self->priv->manager); - tp_clear_object (&self->priv->connectivity); tp_clear_pointer (&self->priv->connect_times, g_hash_table_unref); next_away_stop (EMPATHY_PRESENCE_MANAGER (object)); @@ -530,11 +487,6 @@ empathy_presence_manager_init (EmpathyPresenceManager *self) g_object_unref (dbus); - self->priv->connectivity = empathy_connectivity_dup_singleton (); - - tp_g_signal_connect_object (self->priv->connectivity, - "state-change", G_CALLBACK (state_change_cb), self, 0); - self->priv->connect_times = g_hash_table_new (g_direct_hash, g_direct_equal); } @@ -609,22 +561,6 @@ empathy_presence_manager_set_presence (EmpathyPresenceManager *self, if (!tp_strdiff (status, default_status)) status = NULL; - if (state != TP_CONNECTION_PRESENCE_TYPE_OFFLINE && - !empathy_connectivity_is_online (self->priv->connectivity)) - { - DEBUG ("Empathy is not online"); - - self->priv->saved_state = state; - if (tp_strdiff (self->priv->status, status)) - { - g_free (self->priv->saved_status); - self->priv->saved_status = NULL; - if (!EMP_STR_EMPTY (status)) - self->priv->saved_status = g_strdup (status); - } - return; - } - empathy_presence_manager_do_set_presence (self, state, status); } diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c index 5144fa4d..fb699f09 100644 --- a/libempathy/empathy-time.c +++ b/libempathy/empathy-time.c @@ -1,7 +1,6 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Copyright (C) 2003-2007 Imendio AB - * Copyright (C) 2007-2010 Collabora Ltd. + * Copyright (C) 2007-2012 Collabora Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,110 +33,116 @@ gint64 empathy_time_get_current (void) { - GDateTime *now; - gint64 result; + GDateTime *now; + gint64 result; - now = g_date_time_new_now_utc (); - result = g_date_time_to_unix (now); - g_date_time_unref (now); + now = g_date_time_new_now_utc (); + result = g_date_time_to_unix (now); + g_date_time_unref (now); - return result; + return result; } -/* Converts the UTC timestamp to a string, also in UTC. Returns NULL on failure. */ +/* Converts the UTC timestamp to a string, also in UTC. + * Returns NULL on failure. */ gchar * -empathy_time_to_string_utc (gint64 t, - const gchar *format) +empathy_time_to_string_utc (gint64 t, + const gchar *format) { - GDateTime *d; - char *result; + GDateTime *d; + char *result; - g_return_val_if_fail (format != NULL, NULL); + g_return_val_if_fail (format != NULL, NULL); - d = g_date_time_new_from_unix_utc (t); - result = g_date_time_format (d, format); - g_date_time_unref (d); + d = g_date_time_new_from_unix_utc (t); + result = g_date_time_format (d, format); + g_date_time_unref (d); - return result; + return result; } -/* Converts the UTC timestamp to a string, in local time. Returns NULL on failure. */ +/* Converts the UTC timestamp to a string, in local time. + * Returns NULL on failure. */ gchar * empathy_time_to_string_local (gint64 t, - const gchar *format) + const gchar *format) { - GDateTime *d, *local; - gchar *result; + GDateTime *d, *local; + gchar *result; - g_return_val_if_fail (format != NULL, NULL); + g_return_val_if_fail (format != NULL, NULL); - d = g_date_time_new_from_unix_utc (t); - local = g_date_time_to_local (d); - g_date_time_unref (d); + d = g_date_time_new_from_unix_utc (t); + local = g_date_time_to_local (d); + g_date_time_unref (d); - result = g_date_time_format (local, format); - g_date_time_unref (local); + result = g_date_time_format (local, format); + g_date_time_unref (local); - return result; + return result; } gchar * empathy_duration_to_string (guint seconds) { - if (seconds < 60) { - return g_strdup_printf (ngettext ("%d second ago", - "%d seconds ago", seconds), seconds); - } - else if (seconds < (60 * 60)) { - seconds /= 60; - return g_strdup_printf (ngettext ("%d minute ago", - "%d minutes ago", seconds), seconds); - } - else if (seconds < (60 * 60 * 24)) { - seconds /= 60 * 60; - return g_strdup_printf (ngettext ("%d hour ago", - "%d hours ago", seconds), seconds); - } - else if (seconds < (60 * 60 * 24 * 7)) { - seconds /= 60 * 60 * 24; - return g_strdup_printf (ngettext ("%d day ago", - "%d days ago", seconds), seconds); - } - else if (seconds < (60 * 60 * 24 * 30)) { - seconds /= 60 * 60 * 24 * 7; - return g_strdup_printf (ngettext ("%d week ago", - "%d weeks ago", seconds), seconds); - } - else { - seconds /= 60 * 60 * 24 * 30; - return g_strdup_printf (ngettext ("%d month ago", - "%d months ago", seconds), seconds); - } + if (seconds < 60) + { + return g_strdup_printf (ngettext ("%d second ago", + "%d seconds ago", seconds), seconds); + } + else if (seconds < (60 * 60)) + { + seconds /= 60; + return g_strdup_printf (ngettext ("%d minute ago", + "%d minutes ago", seconds), seconds); + } + else if (seconds < (60 * 60 * 24)) + { + seconds /= 60 * 60; + return g_strdup_printf (ngettext ("%d hour ago", + "%d hours ago", seconds), seconds); + } + else if (seconds < (60 * 60 * 24 * 7)) + { + seconds /= 60 * 60 * 24; + return g_strdup_printf (ngettext ("%d day ago", + "%d days ago", seconds), seconds); + } + else if (seconds < (60 * 60 * 24 * 30)) + { + seconds /= 60 * 60 * 24 * 7; + return g_strdup_printf (ngettext ("%d week ago", + "%d weeks ago", seconds), seconds); + } + else + { + seconds /= 60 * 60 * 24 * 30; + return g_strdup_printf (ngettext ("%d month ago", + "%d months ago", seconds), seconds); + } } gchar * empathy_time_to_string_relative (gint64 t) { - GDateTime *now, *then; - gint seconds; - GTimeSpan delta; - gchar *result; + GDateTime *now, *then; + gint seconds; + GTimeSpan delta; + gchar *result; - now = g_date_time_new_now_utc (); - then = g_date_time_new_from_unix_utc (t); + now = g_date_time_new_now_utc (); + then = g_date_time_new_from_unix_utc (t); - delta = g_date_time_difference (now, then); - seconds = delta / G_TIME_SPAN_SECOND; + delta = g_date_time_difference (now, then); + seconds = delta / G_TIME_SPAN_SECOND; - if (seconds > 0) { - result = empathy_duration_to_string (seconds); - } - else { - result = g_strdup (_("in the future")); - } + if (seconds > 0) + result = empathy_duration_to_string (seconds); + else + result = g_strdup (_("in the future")); - g_date_time_unref (now); - g_date_time_unref (then); + g_date_time_unref (now); + g_date_time_unref (then); - return result; + return result; } diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h index 3a22adee..59bd9269 100644 --- a/libempathy/empathy-time.h +++ b/libempathy/empathy-time.h @@ -1,7 +1,6 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Copyright (C) 2004 Imendio AB - * Copyright (C) 2007-2010 Collabora Ltd. + * Copyright (C) 2007-2012 Collabora Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,20 +29,17 @@ G_BEGIN_DECLS -/* - * Translators: use your locale preferred time format. - * The fields follow the strftime standard: - * look at the manual if you need help (man strftime) - */ -#define EMPATHY_TIME_FORMAT_DISPLAY_SHORT _("%H:%M") -#define EMPATHY_DATE_FORMAT_DISPLAY_SHORT _("%a %d %b %Y") -#define EMPATHY_TIME_DATE_FORMAT_DISPLAY_SHORT _("%a %d %b %Y, %H:%M") +/* FIXME: ideally we should only display the hour and minutes but + * there is no localized format for that (bgo #668323) */ +#define EMPATHY_TIME_FORMAT_DISPLAY_SHORT "%X" +#define EMPATHY_DATE_FORMAT_DISPLAY_SHORT "%a %d %b %Y" +#define EMPATHY_TIME_DATE_FORMAT_DISPLAY_SHORT "%a %d %b %Y, %X" gint64 empathy_time_get_current (void); -gchar *empathy_time_to_string_utc (gint64 t, - const gchar *format); -gchar *empathy_time_to_string_local (gint64 t, - const gchar *format); +gchar *empathy_time_to_string_utc (gint64 t, + const gchar *format); +gchar *empathy_time_to_string_local (gint64 t, + const gchar *format); gchar *empathy_time_to_string_relative (gint64 t); gchar *empathy_duration_to_string (guint seconds); diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 96eda77b..4e26a769 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -51,6 +51,7 @@ struct _EmpathyTpChatPrivate { gboolean supports_subject; gboolean can_set_subject; gchar *subject; + gchar *subject_actor; /* Room config (for now, we only track the title and don't support * setting it) */ @@ -69,6 +70,7 @@ static void tp_chat_iface_init (EmpathyContactListIface *iface); enum { PROP_0, PROP_ACCOUNT, + PROP_SELF_CONTACT, PROP_REMOTE_CONTACT, PROP_N_MESSAGES_SENDING, PROP_TITLE, @@ -608,12 +610,26 @@ update_subject (EmpathyTpChat *self, subject = tp_asv_get_string (properties, "Subject"); if (subject != NULL) { + const gchar *actor; + g_free (priv->subject); priv->subject = g_strdup (subject); + + /* If the actor is included with this update, use it; + * otherwise, clear it to avoid showing stale information. + * Why might it not be included? When you join an IRC channel, + * you get a pair of messages: first, the current topic; next, + * who set it, and when. Idle reports these in two separate + * signals. + */ + actor = tp_asv_get_string (properties, "Actor"); + g_free (priv->subject_actor); + priv->subject_actor = g_strdup (actor); + g_object_notify (G_OBJECT (self), "subject"); } - /* TODO: track Actor and Timestamp. */ + /* TODO: track Timestamp. */ } static void @@ -732,6 +748,14 @@ empathy_tp_chat_get_subject (EmpathyTpChat *self) return priv->subject; } +const gchar * +empathy_tp_chat_get_subject_actor (EmpathyTpChat *self) +{ + EmpathyTpChatPrivate *priv = self->priv; + + return priv->subject_actor; +} + static void tp_chat_dispose (GObject *object) { @@ -767,6 +791,7 @@ tp_chat_finalize (GObject *object) g_free (self->priv->title); g_free (self->priv->subject); + g_free (self->priv->subject_actor); G_OBJECT_CLASS (empathy_tp_chat_parent_class)->finalize (object); } @@ -948,6 +973,7 @@ tp_chat_got_renamed_contacts_cb (TpConnection *connection, /* We change our nick */ tp_clear_object (&self->priv->user); self->priv->user = g_object_ref (new); + g_object_notify (chat, "self-contact"); } check_almost_ready (self); @@ -1068,6 +1094,7 @@ tp_chat_got_self_contact_cb (TpConnection *connection, self->priv->user = g_object_ref (contact); empathy_contact_set_is_user (self->priv->user, TRUE); + g_object_notify (chat, "self-contact"); check_almost_ready (self); } @@ -1083,6 +1110,9 @@ tp_chat_get_property (GObject *object, case PROP_ACCOUNT: g_value_set_object (value, self->priv->account); break; + case PROP_SELF_CONTACT: + g_value_set_object (value, self->priv->user); + break; case PROP_REMOTE_CONTACT: g_value_set_object (value, self->priv->remote_contact); break; @@ -1171,6 +1201,19 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); + /** + * EmpathyTpChat:self-contact: + * + * Not to be confused with TpChannel:group-self-contact. + */ + g_object_class_install_property (object_class, + PROP_SELF_CONTACT, + g_param_spec_object ("self-contact", + "The local contact", + "The EmpathyContact for the local user on this channel", + EMPATHY_TYPE_CONTACT, + G_PARAM_READABLE)); + g_object_class_install_property (object_class, PROP_REMOTE_CONTACT, g_param_spec_object ("remote-contact", diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index cc1c16aa..885479cb 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -81,6 +81,7 @@ const gchar * empathy_tp_chat_get_title (EmpathyTpChat *self); gboolean empathy_tp_chat_supports_subject (EmpathyTpChat *self); const gchar * empathy_tp_chat_get_subject (EmpathyTpChat *self); +const gchar * empathy_tp_chat_get_subject_actor (EmpathyTpChat *self); gboolean empathy_tp_chat_can_set_subject (EmpathyTpChat *self); void empathy_tp_chat_set_subject (EmpathyTpChat *self, const gchar *subject); diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index d3964d6b..f116d15d 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -1068,20 +1068,6 @@ tp_contact_list_get_pendings (EmpathyContactList *list) return ret; } -static GList * -tp_contact_list_get_all_groups (EmpathyContactList *list) -{ - EmpathyTpContactListPriv *priv = GET_PRIV (list); - GList *ret, *l; - - ret = g_hash_table_get_keys (priv->groups); - for (l = ret; l; l = l->next) { - l->data = g_strdup (l->data); - } - - return ret; -} - static GList * tp_contact_list_get_groups (EmpathyContactList *list, EmpathyContact *contact) @@ -1205,7 +1191,6 @@ tp_contact_list_iface_init (EmpathyContactListIface *iface) iface->remove = tp_contact_list_remove; iface->get_members = tp_contact_list_get_members; iface->get_pendings = tp_contact_list_get_pendings; - iface->get_all_groups = tp_contact_list_get_all_groups; iface->get_groups = tp_contact_list_get_groups; iface->add_to_group = tp_contact_list_add_to_group; iface->remove_from_group = tp_contact_list_remove_from_group; diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c deleted file mode 100644 index c5c9f0cd..00000000 --- a/libempathy/empathy-tp-file.c +++ /dev/null @@ -1,894 +0,0 @@ -/* - * Copyright (C) 2007-2009 Collabora Ltd. - * Copyright (C) 2007 Marco Barisione - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Marco Barisione - * Jonny Lamb - * Cosimo Cecchi - */ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -#include -#include -#include -#include - -#include "empathy-tp-file.h" -#include "empathy-time.h" -#include "empathy-utils.h" - -#define DEBUG_FLAG EMPATHY_DEBUG_FT -#include "empathy-debug.h" - -/** - * SECTION:empathy-tp-file - * @title: EmpathyTpFile - * @short_description: Object which represents a Telepathy file channel - * @include: libempathy/empathy-tp-file.h - * - * #EmpathyTpFile is an object which represents a Telepathy file channel. - * Usually, clients do not need to deal with #EmpathyTpFile objects directly, - * and are supposed to use #EmpathyFTHandler and #EmpathyFTFactory for - * transferring files using libempathy. - */ - -/* EmpathyTpFile object */ - -struct _EmpathyTpFilePrivate { - GInputStream *in_stream; - GOutputStream *out_stream; - - /* org.freedesktop.Telepathy.Channel.Type.FileTransfer D-Bus properties */ - TpFileTransferState state; - TpFileTransferStateChangeReason state_change_reason; - TpSocketAddressType socket_address_type; - TpSocketAccessControl socket_access_control; - - /* transfer properties */ - gint64 start_time; - GArray *socket_address; - guint port; - guint64 offset; - - /* GCancellable we're passed when offering/accepting the transfer */ - GCancellable *cancellable; - - /* callbacks for the operation */ - EmpathyTpFileProgressCallback progress_callback; - gpointer progress_user_data; - EmpathyTpFileOperationCallback op_callback; - gpointer op_user_data; - - gboolean is_closing; - gboolean is_closed; -}; - -G_DEFINE_TYPE (EmpathyTpFile, empathy_tp_file, TP_TYPE_FILE_TRANSFER_CHANNEL); - -/* private functions */ - -static void -tp_file_get_state_cb (TpProxy *proxy, - const GValue *value, - const GError *error, - gpointer user_data, - GObject *weak_object) -{ - EmpathyTpFile *self = (EmpathyTpFile *) weak_object; - - if (error != NULL) - { - /* set a default value for the state */ - self->priv->state = TP_FILE_TRANSFER_STATE_NONE; - return; - } - - self->priv->state = g_value_get_uint (value); -} - -static void -tp_file_get_available_socket_types_cb (TpProxy *proxy, - const GValue *value, - const GError *error, - gpointer user_data, - GObject *weak_object) -{ - EmpathyTpFile *self = (EmpathyTpFile *) weak_object; - GHashTable *socket_types; - GArray *access_controls; - - if (error != NULL || - !G_VALUE_HOLDS (value, TP_HASH_TYPE_SUPPORTED_SOCKET_MAP)) - { - /* set a default value */ - self->priv->socket_address_type = TP_SOCKET_ADDRESS_TYPE_UNIX; - self->priv->socket_access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST; - goto out; - } - - socket_types = g_value_get_boxed (value); - - /* here UNIX is preferred to IPV4 */ - if ((access_controls = g_hash_table_lookup (socket_types, - GUINT_TO_POINTER (TP_SOCKET_ADDRESS_TYPE_UNIX))) != NULL) - { - self->priv->socket_address_type = TP_SOCKET_ADDRESS_TYPE_UNIX; - self->priv->socket_access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST; - goto out; - } - - if ((access_controls = g_hash_table_lookup (socket_types, - GUINT_TO_POINTER (TP_SOCKET_ADDRESS_TYPE_IPV4))) != NULL) - { - self->priv->socket_address_type = TP_SOCKET_ADDRESS_TYPE_IPV4; - - /* TODO: we should prefer PORT over LOCALHOST when the CM will - * support it. - */ - - self->priv->socket_access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST; - } - -out: - DEBUG ("Socket address type: %u, access control %u", - self->priv->socket_address_type, self->priv->socket_access_control); -} - -static void -tp_file_invalidated_cb (TpProxy *proxy, - guint domain, - gint code, - gchar *message, - EmpathyTpFile *self) -{ - DEBUG ("Channel invalidated: %s", message); - - if (self->priv->state != TP_FILE_TRANSFER_STATE_COMPLETED && - self->priv->state != TP_FILE_TRANSFER_STATE_CANCELLED) - { - /* The channel is not in a finished state, an error occured */ - self->priv->state = TP_FILE_TRANSFER_STATE_CANCELLED; - self->priv->state_change_reason = - TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR; - } -} - -static void -ft_operation_close_clean (EmpathyTpFile *self) -{ - if (self->priv->is_closed) - return; - - DEBUG ("FT operation close clean"); - - self->priv->is_closed = TRUE; - - if (self->priv->op_callback != NULL) - self->priv->op_callback (self, NULL, self->priv->op_user_data); -} - -static void -ft_operation_close_with_error (EmpathyTpFile *self, - GError *error) -{ - if (self->priv->is_closed) - return; - - DEBUG ("FT operation close with error %s", error->message); - - self->priv->is_closed = TRUE; - - /* close the channel if it's not cancelled already */ - if (self->priv->state != TP_FILE_TRANSFER_STATE_CANCELLED) - empathy_tp_file_cancel (self); - - if (self->priv->op_callback != NULL) - self->priv->op_callback (self, error, self->priv->op_user_data); -} - -static void -splice_stream_ready_cb (GObject *source, - GAsyncResult *res, - gpointer user_data) -{ - EmpathyTpFile *self = user_data; - GError *error = NULL; - - g_output_stream_splice_finish (G_OUTPUT_STREAM (source), res, &error); - - DEBUG ("Splice stream ready cb, error %p", error); - - if (error != NULL && !self->priv->is_closing) - { - ft_operation_close_with_error (self, error); - g_clear_error (&error); - return; - } -} - -static void -tp_file_start_transfer (EmpathyTpFile *self) -{ - gint fd, domain, res = 0; - GError *error = NULL; - struct sockaddr *my_addr = NULL; - size_t my_size = 0; - - if (self->priv->socket_address_type == TP_SOCKET_ADDRESS_TYPE_UNIX) - { - domain = AF_UNIX; - } - else if (self->priv->socket_address_type == TP_SOCKET_ADDRESS_TYPE_IPV4) - { - domain = AF_INET; - } - else - { - error = g_error_new_literal (EMPATHY_FT_ERROR_QUARK, - EMPATHY_FT_ERROR_NOT_SUPPORTED, _("Socket type not supported")); - - DEBUG ("Socket not supported, closing channel"); - - ft_operation_close_with_error (self, error); - g_clear_error (&error); - - return; - } - - fd = socket (domain, SOCK_STREAM, 0); - - if (fd < 0) - { - int code = errno; - - error = g_error_new_literal (EMPATHY_FT_ERROR_QUARK, - EMPATHY_FT_ERROR_SOCKET, g_strerror (code)); - - DEBUG ("Failed to create socket, closing channel"); - - ft_operation_close_with_error (self, error); - g_clear_error (&error); - - return; - } - - if (self->priv->socket_address_type == TP_SOCKET_ADDRESS_TYPE_UNIX) - { - struct sockaddr_un addr; - - memset (&addr, 0, sizeof (addr)); - addr.sun_family = domain; - strncpy (addr.sun_path, self->priv->socket_address->data, - self->priv->socket_address->len); - - my_addr = (struct sockaddr *) &addr; - my_size = sizeof (addr); - } - else if (self->priv->socket_address_type == TP_SOCKET_ADDRESS_TYPE_IPV4) - { - struct sockaddr_in addr; - - memset (&addr, 0, sizeof (addr)); - addr.sin_family = domain; - inet_pton (AF_INET, self->priv->socket_address->data, &addr.sin_addr); - addr.sin_port = htons (self->priv->port); - - my_addr = (struct sockaddr *) &addr; - my_size = sizeof (addr); - } - - res = connect (fd, my_addr, my_size); - - if (res < 0) - { - int code = errno; - - error = g_error_new_literal (EMPATHY_FT_ERROR_QUARK, - EMPATHY_FT_ERROR_SOCKET, g_strerror (code)); - - DEBUG ("Failed to connect socket, closing channel"); - - ft_operation_close_with_error (self, error); - close (fd); - g_clear_error (&error); - - return; - } - - DEBUG ("Start the transfer"); - - self->priv->start_time = empathy_time_get_current (); - - /* notify we're starting a transfer */ - if (self->priv->progress_callback != NULL) - self->priv->progress_callback (self, 0, self->priv->progress_user_data); - - if (!tp_channel_get_requested ((TpChannel *) self)) - { - GInputStream *socket_stream; - - socket_stream = g_unix_input_stream_new (fd, TRUE); - - g_output_stream_splice_async (self->priv->out_stream, socket_stream, - G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | - G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, - G_PRIORITY_DEFAULT, self->priv->cancellable, - splice_stream_ready_cb, self); - - g_object_unref (socket_stream); - } - else - { - GOutputStream *socket_stream; - - socket_stream = g_unix_output_stream_new (fd, TRUE); - - g_output_stream_splice_async (socket_stream, self->priv->in_stream, - G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | - G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, - G_PRIORITY_DEFAULT, self->priv->cancellable, - splice_stream_ready_cb, self); - - g_object_unref (socket_stream); - } -} - -static GError * -error_from_state_change_reason (TpFileTransferStateChangeReason reason) -{ - const char *string; - GError *retval = NULL; - - string = NULL; - - switch (reason) - { - case TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE: - string = _("No reason was specified"); - break; - case TP_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED: - string = _("The change in state was requested"); - break; - case TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_STOPPED: - string = _("You canceled the file transfer"); - break; - case TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED: - string = _("The other participant canceled the file transfer"); - break; - case TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR: - string = _("Error while trying to transfer the file"); - break; - case TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_ERROR: - string = _("The other participant is unable to transfer the file"); - break; - default: - string = _("Unknown reason"); - break; - } - - retval = g_error_new_literal (EMPATHY_FT_ERROR_QUARK, - EMPATHY_FT_ERROR_TP_ERROR, string); - - return retval; -} - -static void -tp_file_state_changed_cb (TpChannel *proxy, - guint state, - guint reason, - gpointer user_data, - GObject *weak_object) -{ - EmpathyTpFile *self = (EmpathyTpFile *) weak_object; - GError *error = NULL; - - if (state == self->priv->state) - return; - - DEBUG ("File transfer state changed:\n" - "old state = %u, state = %u, reason = %u\n" - "\tincoming = %s, in_stream = %s, out_stream = %s", - self->priv->state, state, reason, - tp_channel_get_requested (proxy) ? "no" : "yes", - self->priv->in_stream ? "present" : "not present", - self->priv->out_stream ? "present" : "not present"); - - self->priv->state = state; - self->priv->state_change_reason = reason; - - /* If the channel is open AND we have the socket path, we can start the - * transfer. The socket path could be NULL if we are not doing the actual - * data transfer but are just an observer for the channel. - */ - if (state == TP_FILE_TRANSFER_STATE_OPEN && - self->priv->socket_address != NULL) - tp_file_start_transfer (EMPATHY_TP_FILE (weak_object)); - - if (state == TP_FILE_TRANSFER_STATE_COMPLETED) - ft_operation_close_clean (EMPATHY_TP_FILE (weak_object)); - - if (state == TP_FILE_TRANSFER_STATE_CANCELLED) - { - error = error_from_state_change_reason (self->priv->state_change_reason); - ft_operation_close_with_error (EMPATHY_TP_FILE (weak_object), error); - g_clear_error (&error); - } -} - -static void -tp_file_transferred_bytes_changed_cb (TpFileTransferChannel *channel, - GParamSpec *spec, - EmpathyTpFile *self) -{ - guint64 count; - - count = tp_file_transfer_channel_get_transferred_bytes (channel); - - /* don't notify for 0 bytes count */ - if (count == 0) - return; - - /* notify clients */ - if (self->priv->progress_callback != NULL) - self->priv->progress_callback (self, count, self->priv->progress_user_data); -} - -static void -ft_operation_provide_or_accept_file_cb (TpChannel *proxy, - const GValue *address, - const GError *error, - gpointer user_data, - GObject *weak_object) -{ - EmpathyTpFile *self = EMPATHY_TP_FILE (weak_object); - GError *myerr = NULL; - - g_cancellable_set_error_if_cancelled (self->priv->cancellable, &myerr); - - if (error != NULL) - { - if (myerr != NULL) - { - /* if we were both cancelled and failed when calling the method, - * report the method error. - */ - g_clear_error (&myerr); - } - - myerr = g_error_copy (error); - } - - if (myerr != NULL) - { - DEBUG ("Error: %s", myerr->message); - ft_operation_close_with_error (self, myerr); - g_clear_error (&myerr); - return; - } - - if (G_VALUE_TYPE (address) == DBUS_TYPE_G_UCHAR_ARRAY) - { - self->priv->socket_address = g_value_dup_boxed (address); - } - else if (G_VALUE_TYPE (address) == G_TYPE_STRING) - { - /* Old bugged version of telepathy-salut used to store the address - * as a 's' instead of an 'ay' */ - const gchar *path; - - path = g_value_get_string (address); - self->priv->socket_address = g_array_sized_new (TRUE, FALSE, - sizeof (gchar), strlen (path)); - g_array_insert_vals (self->priv->socket_address, 0, path, strlen (path)); - } - else if (G_VALUE_TYPE (address) == TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4) - { - GValueArray *val_array; - GValue *v; - const char *addr; - - val_array = g_value_get_boxed (address); - - /* IPV4 address */ - v = g_value_array_get_nth (val_array, 0); - addr = g_value_get_string (v); - self->priv->socket_address = g_array_sized_new (TRUE, FALSE, - sizeof (gchar), strlen (addr)); - g_array_insert_vals (self->priv->socket_address, 0, addr, strlen (addr)); - - /* port number */ - v = g_value_array_get_nth (val_array, 1); - self->priv->port = g_value_get_uint (v); - } - - DEBUG ("Got socket address: %s, port (not zero if IPV4): %d", - self->priv->socket_address->data, self->priv->port); - - /* if the channel is already open, start the transfer now, otherwise, - * wait for the state change signal. - */ - if (self->priv->state == TP_FILE_TRANSFER_STATE_OPEN) - tp_file_start_transfer (self); -} - -static void -initialize_empty_ac_variant (TpSocketAccessControl ac, - GValue *val) -{ - /* TODO: we will add more types here once we support PORT access control. */ - if (ac == TP_SOCKET_ACCESS_CONTROL_LOCALHOST) - { - g_value_init (val, G_TYPE_STRING); - g_value_set_static_string (val, ""); - } -} - -static void -file_read_async_cb (GObject *source, - GAsyncResult *res, - gpointer user_data) -{ - GValue nothing = { 0 }; - EmpathyTpFile *self = user_data; - GFileInputStream *in_stream; - GError *error = NULL; - - in_stream = g_file_read_finish (G_FILE (source), res, &error); - - if (error != NULL && !self->priv->is_closing) - { - ft_operation_close_with_error (self, error); - g_clear_error (&error); - return; - } - - self->priv->in_stream = G_INPUT_STREAM (in_stream); - - /* we don't impose specific interface/port requirements even - * if we're not using UNIX sockets. - */ - initialize_empty_ac_variant (self->priv->socket_access_control, ¬hing); - - tp_cli_channel_type_file_transfer_call_provide_file ((TpChannel *) self, -1, - self->priv->socket_address_type, self->priv->socket_access_control, - ¬hing, ft_operation_provide_or_accept_file_cb, - NULL, NULL, G_OBJECT (self)); -} - -static void -file_transfer_set_uri_cb (TpProxy *proxy, - const GError *error, - gpointer user_data, - GObject *weak_object) -{ - GValue nothing = { 0 }; - EmpathyTpFile *self = (EmpathyTpFile *) weak_object; - - if (error != NULL) - { - DEBUG ("Failed to set FileTransfer.URI: %s", error->message); - /* We don't return as that's not a big issue */ - } - - /* we don't impose specific interface/port requirements even - * if we're not using UNIX sockets. - */ - initialize_empty_ac_variant (self->priv->socket_access_control, ¬hing); - - tp_cli_channel_type_file_transfer_call_accept_file ((TpChannel *) self, - -1, self->priv->socket_address_type, self->priv->socket_access_control, - ¬hing, self->priv->offset, - ft_operation_provide_or_accept_file_cb, NULL, NULL, weak_object); -} - -static void -file_replace_async_cb (GObject *source, - GAsyncResult *res, - gpointer user_data) -{ - EmpathyTpFile *self = user_data; - GError *error = NULL; - GFileOutputStream *out_stream; - GFile *file = G_FILE (source); - gchar *uri; - GValue *value; - - out_stream = g_file_replace_finish (file, res, &error); - - if (error != NULL) - { - ft_operation_close_with_error (self, error); - g_clear_error (&error); - - return; - } - - self->priv->out_stream = G_OUTPUT_STREAM (out_stream); - - /* Try setting FileTranfer.URI before accepting the file */ - uri = g_file_get_uri (file); - value = tp_g_value_slice_new_take_string (uri); - - tp_cli_dbus_properties_call_set ((TpChannel *) self, -1, - TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "URI", value, - file_transfer_set_uri_cb, NULL, NULL, G_OBJECT (self)); - - tp_g_value_slice_free (value); -} - -static void -channel_closed_cb (TpChannel *proxy, - const GError *error, - gpointer user_data, - GObject *weak_object) -{ - EmpathyTpFile *self = EMPATHY_TP_FILE (weak_object); - gboolean cancel = GPOINTER_TO_INT (user_data); - - DEBUG ("Channel is closed, should cancel %s", cancel ? "True" : "False"); - - if (self->priv->cancellable != NULL && - !g_cancellable_is_cancelled (self->priv->cancellable) && cancel) - g_cancellable_cancel (self->priv->cancellable); -} - -static void -close_channel_internal (EmpathyTpFile *self, - gboolean cancel) -{ - DEBUG ("Closing channel, should cancel %s", cancel ? - "True" : "False"); - - self->priv->is_closing = TRUE; - - tp_cli_channel_call_close ((TpChannel *) self, -1, - channel_closed_cb, GINT_TO_POINTER (cancel), NULL, G_OBJECT (self)); -} - -/* GObject methods */ - -static void -empathy_tp_file_init (EmpathyTpFile *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), - EMPATHY_TYPE_TP_FILE, EmpathyTpFilePrivate); -} - -static void -do_dispose (GObject *object) -{ - EmpathyTpFile *self = (EmpathyTpFile *) object; - - tp_clear_object (&self->priv->in_stream); - tp_clear_object (&self->priv->out_stream); - tp_clear_object (&self->priv->cancellable); - - G_OBJECT_CLASS (empathy_tp_file_parent_class)->dispose (object); -} - -static void -do_finalize (GObject *object) -{ - EmpathyTpFile *self = (EmpathyTpFile *) object; - - DEBUG ("%p", object); - - if (self->priv->socket_address != NULL) - { - g_array_unref (self->priv->socket_address); - self->priv->socket_address = NULL; - } - - G_OBJECT_CLASS (empathy_tp_file_parent_class)->finalize (object); -} - -static void -do_constructed (GObject *object) -{ - EmpathyTpFile *self = (EmpathyTpFile *) object; - TpChannel *channel = (TpChannel *) self; - - g_signal_connect (self, "invalidated", - G_CALLBACK (tp_file_invalidated_cb), self); - - tp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed ( - channel, tp_file_state_changed_cb, NULL, NULL, object, NULL); - - g_signal_connect (self, "notify::transferred-bytes", - G_CALLBACK (tp_file_transferred_bytes_changed_cb), self); - - tp_cli_dbus_properties_call_get (channel, - -1, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "State", tp_file_get_state_cb, - NULL, NULL, object); - - tp_cli_dbus_properties_call_get (channel, - -1, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "AvailableSocketTypes", - tp_file_get_available_socket_types_cb, NULL, NULL, object); - - self->priv->state_change_reason = - TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE; - - G_OBJECT_CLASS (empathy_tp_file_parent_class)->constructed (object); -} - -static void -empathy_tp_file_class_init (EmpathyTpFileClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = do_finalize; - object_class->dispose = do_dispose; - object_class->constructed = do_constructed; - - g_type_class_add_private (object_class, sizeof (EmpathyTpFilePrivate)); -} - -/* public methods */ - -EmpathyTpFile * -empathy_tp_file_new (TpSimpleClientFactory *factory, - TpConnection *conn, - const gchar *object_path, - const GHashTable *immutable_properties, - GError **error) -{ - TpProxy *conn_proxy = (TpProxy *) conn; - - g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL); - g_return_val_if_fail (immutable_properties != NULL, NULL); - - return g_object_new (EMPATHY_TYPE_TP_FILE, - "factory", factory, - "connection", conn, - "dbus-daemon", conn_proxy->dbus_daemon, - "bus-name", conn_proxy->bus_name, - "object-path", object_path, - "channel-properties", immutable_properties, - NULL); -} - -/** - * empathy_tp_file_accept: - * @self: an incoming #EmpathyTpFile - * @offset: the offset of @gfile where we should start writing - * @gfile: the destination #GFile for the transfer - * @cancellable: a #GCancellable - * @progress_callback: function to callback with progress information - * @progress_user_data: user_data to pass to @progress_callback - * @op_callback: function to callback when the transfer ends - * @op_user_data: user_data to pass to @op_callback - * - * Accepts an incoming file transfer, saving the result into @gfile. - * The callback @op_callback will be called both when the transfer is - * successful and in case of an error. Note that cancelling @cancellable, - * closes the socket of the file operation in progress, but doesn't - * guarantee that the transfer channel will be closed as well. Thus, - * empathy_tp_file_cancel() or empathy_tp_file_close() should be used to - * actually cancel an ongoing #EmpathyTpFile. - */ -void -empathy_tp_file_accept (EmpathyTpFile *self, - guint64 offset, - GFile *gfile, - GCancellable *cancellable, - EmpathyTpFileProgressCallback progress_callback, - gpointer progress_user_data, - EmpathyTpFileOperationCallback op_callback, - gpointer op_user_data) -{ - g_return_if_fail (EMPATHY_IS_TP_FILE (self)); - g_return_if_fail (G_IS_FILE (gfile)); - g_return_if_fail (G_IS_CANCELLABLE (cancellable)); - - self->priv->cancellable = g_object_ref (cancellable); - self->priv->progress_callback = progress_callback; - self->priv->progress_user_data = progress_user_data; - self->priv->op_callback = op_callback; - self->priv->op_user_data = op_user_data; - self->priv->offset = offset; - - g_file_replace_async (gfile, NULL, FALSE, G_FILE_CREATE_NONE, - G_PRIORITY_DEFAULT, cancellable, file_replace_async_cb, self); -} - - -/** - * empathy_tp_file_offer: - * @self: an outgoing #EmpathyTpFile - * @gfile: the source #GFile for the transfer - * @cancellable: a #GCancellable - * @progress_callback: function to callback with progress information - * @progress_user_data: user_data to pass to @progress_callback - * @op_callback: function to callback when the transfer ends - * @op_user_data: user_data to pass to @op_callback - * - * Offers an outgoing file transfer, reading data from @gfile. - * The callback @op_callback will be called both when the transfer is - * successful and in case of an error. Note that cancelling @cancellable, - * closes the socket of the file operation in progress, but doesn't - * guarantee that the transfer channel will be closed as well. Thus, - * empathy_tp_file_cancel() or empathy_tp_file_close() should be used to - * actually cancel an ongoing #EmpathyTpFile. - */ -void -empathy_tp_file_offer (EmpathyTpFile *self, - GFile *gfile, - GCancellable *cancellable, - EmpathyTpFileProgressCallback progress_callback, - gpointer progress_user_data, - EmpathyTpFileOperationCallback op_callback, - gpointer op_user_data) -{ - g_return_if_fail (EMPATHY_IS_TP_FILE (self)); - g_return_if_fail (G_IS_FILE (gfile)); - g_return_if_fail (G_IS_CANCELLABLE (cancellable)); - - self->priv->cancellable = g_object_ref (cancellable); - self->priv->progress_callback = progress_callback; - self->priv->progress_user_data = progress_user_data; - self->priv->op_callback = op_callback; - self->priv->op_user_data = op_user_data; - - g_file_read_async (gfile, G_PRIORITY_DEFAULT, cancellable, - file_read_async_cb, self); -} - -/** - * empathy_tp_file_cancel: - * @self: an #EmpathyTpFile - * - * Cancels an ongoing #EmpathyTpFile, first closing the channel and then - * cancelling any I/O operation and closing the socket. - */ -void -empathy_tp_file_cancel (EmpathyTpFile *self) -{ - g_return_if_fail (EMPATHY_IS_TP_FILE (self)); - - close_channel_internal (self, TRUE); -} - -/** - * empathy_tp_file_close: - * @self: an #EmpathyTpFile - * - * Closes the channel for an ongoing #EmpathyTpFile. It's safe to call this - * method after the transfer has ended. - */ -void -empathy_tp_file_close (EmpathyTpFile *self) -{ - g_return_if_fail (EMPATHY_IS_TP_FILE (self)); - - close_channel_internal (self, FALSE); -} diff --git a/libempathy/empathy-tp-file.h b/libempathy/empathy-tp-file.h deleted file mode 100644 index 6afb806d..00000000 --- a/libempathy/empathy-tp-file.h +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (C) 2007-2009 Collabora Ltd. - * Copyright (C) 2007 Marco Barisione - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Marco Barisione - * Jonny Lamb - * Cosimo Cecchi - */ - -#ifndef __EMPATHY_TP_FILE_H__ -#define __EMPATHY_TP_FILE_H__ - -#include -#include - -#include - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_TP_FILE (empathy_tp_file_get_type ()) -#define EMPATHY_TP_FILE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \ - EMPATHY_TYPE_TP_FILE, EmpathyTpFile)) -#define EMPATHY_TP_FILE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \ - EMPATHY_TYPE_TP_FILE, EmpathyTpFileClass)) -#define EMPATHY_IS_TP_FILE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \ - EMPATHY_TYPE_TP_FILE)) -#define EMPATHY_IS_TP_FILE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \ - EMPATHY_TYPE_TP_FILE)) -#define EMPATHY_TP_FILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \ - EMPATHY_TYPE_TP_FILE, EmpathyTpFileClass)) - -#define EMPATHY_FT_ERROR_QUARK g_quark_from_static_string ("EmpathyFTError") - -typedef enum { - EMPATHY_FT_ERROR_FAILED, - EMPATHY_FT_ERROR_HASH_MISMATCH, - EMPATHY_FT_ERROR_TP_ERROR, - EMPATHY_FT_ERROR_SOCKET, - EMPATHY_FT_ERROR_NOT_SUPPORTED, - EMPATHY_FT_ERROR_INVALID_SOURCE_FILE, - EMPATHY_FT_ERROR_EMPTY_SOURCE_FILE -} EmpathyFTErrorEnum; - -typedef struct _EmpathyTpFile EmpathyTpFile; -typedef struct _EmpathyTpFilePrivate EmpathyTpFilePrivate; -typedef struct _EmpathyTpFileClass EmpathyTpFileClass; - -struct _EmpathyTpFile { - TpFileTransferChannel parent; - EmpathyTpFilePrivate *priv; -}; - -struct _EmpathyTpFileClass { - TpFileTransferChannelClass parent_class; -}; - -/* prototypes for operation callbacks */ - -/** - * EmpathyTpFileProgressCallback: - * @tp_file: the #EmpathyTpFile being transferred - * @current_bytes: the bytes currently transferred by the operation - * @user_data: user data passed to the callback - **/ -typedef void (* EmpathyTpFileProgressCallback) - (EmpathyTpFile *tp_file, - guint64 current_bytes, - gpointer user_data); - -/** - * EmpathyTpFileOperationCallback: - * @tp_file: the #EmpathyTpFile that has been transferred - * @error: a #GError if the operation didn't succeed, %NULL otherwise - * @user_data: user data passed to the callback - **/ -typedef void (* EmpathyTpFileOperationCallback) - (EmpathyTpFile *tp_file, - const GError *error, - gpointer user_data); - -GType empathy_tp_file_get_type (void) G_GNUC_CONST; - -/* public methods */ - -EmpathyTpFile * empathy_tp_file_new (TpSimpleClientFactory *factory, - TpConnection *conn, - const gchar *object_path, - const GHashTable *immutable_properties, - GError **error); - -void empathy_tp_file_accept (EmpathyTpFile *tp_file, - guint64 offset, - GFile *gfile, - GCancellable *cancellable, - EmpathyTpFileProgressCallback progress_callback, - gpointer progress_user_data, - EmpathyTpFileOperationCallback op_callback, - gpointer op_user_data); - -void empathy_tp_file_offer (EmpathyTpFile *tp_file, - GFile *gfile, - GCancellable *cancellable, - EmpathyTpFileProgressCallback progress_callback, - gpointer progress_user_data, - EmpathyTpFileOperationCallback op_callback, - gpointer op_user_data); - -void empathy_tp_file_cancel (EmpathyTpFile *tp_file); -void empathy_tp_file_close (EmpathyTpFile *tp_file); - -G_END_DECLS - -#endif /* __EMPATHY_TP_FILE_H__ */ diff --git a/libempathy/empathy-tp-streamed-media.c b/libempathy/empathy-tp-streamed-media.c index 388b3aa0..f245dcfd 100644 --- a/libempathy/empathy-tp-streamed-media.c +++ b/libempathy/empathy-tp-streamed-media.c @@ -20,6 +20,8 @@ * Xavier Claessens */ +#include "config.h" + #include #include diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 972abe65..2f4c9edd 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -40,6 +40,8 @@ #include #include +#include + #include #include #include @@ -48,7 +50,6 @@ #include "empathy-client-factory.h" #include "empathy-utils.h" -#include "empathy-contact-manager.h" #include "empathy-individual-manager.h" #include "empathy-presence-manager.h" #include "empathy-request-util.h" @@ -351,7 +352,7 @@ create_errors_to_message_hash (void) g_hash_table_insert (errors, TP_ERROR_STR_CONNECTION_LOST, _("Connection has been lost")); g_hash_table_insert (errors, TP_ERROR_STR_ALREADY_CONNECTED, - _("This resource is already connected to the server")); + _("This account is already connected to the server")); g_hash_table_insert (errors, TP_ERROR_STR_CONNECTION_REPLACED, _("Connection has been replaced by a new connection using the " "same resource")); @@ -370,6 +371,8 @@ create_errors_to_message_hash (void) "cryptography library")); g_hash_table_insert (errors, TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED, _("Your software is too old")); + g_hash_table_insert (errors, DBUS_ERROR_NO_REPLY, + _("Internal error")); return errors; } @@ -394,7 +397,7 @@ empathy_account_get_error_message (TpAccount *account, { const gchar *dbus_error; const gchar *message; - const GHashTable *details = NULL; + const GHashTable *details = NULL; TpConnectionStatusReason reason; dbus_error = tp_account_get_detailed_error (account, &details); @@ -411,11 +414,11 @@ empathy_account_get_error_message (TpAccount *account, if (message != NULL) return message; + tp_account_get_connection_status (account, &reason); + DEBUG ("Don't understand error '%s'; fallback to the status reason (%u)", dbus_error, reason); - tp_account_get_connection_status (account, &reason); - return empathy_status_reason_get_default_message (reason); } @@ -1167,31 +1170,48 @@ empathy_sasl_channel_supports_mechanism (TpChannel *channel, FolksIndividual * empathy_create_individual_from_tp_contact (TpContact *contact) { - TpAccount *account; - TpConnection *connection; - TpfPersonaStore *store; GeeSet *personas; TpfPersona *persona; FolksIndividual *individual; - connection = tp_contact_get_connection (contact); - account = tp_connection_get_account (connection); - - store = tpf_persona_store_new (account); + persona = tpf_persona_dup_for_contact (contact); + if (persona == NULL) + { + DEBUG ("Failed to get a persona for %s", + tp_contact_get_identifier (contact)); + return NULL; + } personas = GEE_SET ( gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref, g_direct_hash, g_direct_equal)); - persona = tpf_persona_new (contact, store); - gee_collection_add (GEE_COLLECTION (personas), persona); individual = folks_individual_new (personas); g_clear_object (&persona); g_clear_object (&personas); - g_object_unref (store); return individual; } + +/* Look for a FolksIndividual containing @contact as one of his persona + * and create one if needed */ +FolksIndividual * +empathy_ensure_individual_from_tp_contact (TpContact *contact) +{ + EmpathyIndividualManager *mgr; + FolksIndividual *individual; + + mgr = empathy_individual_manager_dup_singleton (); + individual = empathy_individual_manager_lookup_by_contact (mgr, contact); + + if (individual != NULL) + g_object_ref (individual); + else + individual = empathy_create_individual_from_tp_contact (contact); + + g_object_unref (mgr); + return individual; +} diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index ac5fef82..5ce8cc8c 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -124,6 +124,9 @@ gboolean empathy_sasl_channel_supports_mechanism (TpChannel *channel, FolksIndividual * empathy_create_individual_from_tp_contact ( TpContact *contact); +FolksIndividual * empathy_ensure_individual_from_tp_contact ( + TpContact *contact); + /* Copied from wocky/wocky-utils.h */ #define empathy_implement_finish_void(source, tag) \ diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c index 2f38b832..ee1519de 100644 --- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c +++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -166,7 +165,7 @@ quit (void) static void transfer_done_cb (EmpathyFTHandler *handler, - EmpathyTpFile *tp_file, + TpFileTransferChannel *channel, NstPlugin *plugin) { quit (); diff --git a/po/LINGUAS b/po/LINGUAS index 22538e96..7055340d 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -78,6 +78,7 @@ tr ug uk vi +xh zh_CN zh_HK zh_TW diff --git a/po/POTFILES.in b/po/POTFILES.in index 46cb3a0d..ca41d9fe 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,13 +2,12 @@ # Please keep this file sorted alphabetically. data/empathy.desktop.in.in -data/org.gnome.Empathy.gschema.xml.in data/empathy-accounts.desktop.in.in +data/org.gnome.Empathy.gschema.xml.in libempathy/empathy-ft-handler.c libempathy/empathy-message.c libempathy/empathy-tp-contact-list.c -libempathy/empathy-tp-file.c libempathy/empathy-utils.c libempathy/empathy-time.c @@ -36,7 +35,6 @@ libempathy-gtk/empathy-contact-blocking-dialog.c libempathy-gtk/empathy-chat-text-view.c libempathy-gtk/empathy-contact-dialogs.c [type: gettext/glade]libempathy-gtk/empathy-contact-dialogs.ui -libempathy-gtk/empathy-contact-menu.c libempathy-gtk/empathy-contact-search-dialog.c libempathy-gtk/empathy-contact-widget.c libempathy-gtk/empathy-contactinfo-utils.c @@ -44,15 +42,12 @@ libempathy-gtk/empathy-contactinfo-utils.c libempathy-gtk/empathy-groups-widget.c libempathy-gtk/empathy-individual-dialogs.c libempathy-gtk/empathy-individual-edit-dialog.c -libempathy-gtk/empathy-individual-information-dialog.c -libempathy-gtk/empathy-individual-linker.c libempathy-gtk/empathy-individual-menu.c libempathy-gtk/empathy-individual-view.c libempathy-gtk/empathy-individual-widget.c [type: gettext/glade]libempathy-gtk/empathy-individual-widget.ui libempathy-gtk/empathy-irc-network-chooser-dialog.c libempathy-gtk/empathy-irc-network-dialog.c -libempathy-gtk/empathy-linking-dialog.c libempathy-gtk/empathy-log-window.c [type: gettext/glade]libempathy-gtk/empathy-log-window.ui libempathy-gtk/empathy-new-message-dialog.c @@ -79,11 +74,9 @@ nautilus-sendto-plugin/empathy-nautilus-sendto.c src/empathy.c src/empathy-about-dialog.c -src/empathy-account-assistant.c src/empathy-accounts-dialog.c [type: gettext/glade]src/empathy-accounts-dialog.ui src/empathy-auth-client.c -src/empathy-auto-salut-account-helper.c src/empathy-av.c src/empathy-streamed-media-window.c [type: gettext/glade]src/empathy-call-window.ui @@ -98,9 +91,9 @@ src/empathy-import-dialog.c src/empathy-import-widget.c [type: gettext/glade]src/empathy-import-dialog.ui src/empathy-import-widget.c -src/empathy-main-window.c -[type: gettext/glade]src/empathy-main-window.ui -[type: gettext/glade]src/empathy-main-window-menubar.ui +src/empathy-roster-window.c +[type: gettext/glade]src/empathy-roster-window.ui +[type: gettext/glade]src/empathy-roster-window-menubar.ui src/empathy-new-chatroom-dialog.c [type: gettext/glade]src/empathy-new-chatroom-dialog.ui src/empathy-preferences.c @@ -122,3 +115,5 @@ src/empathy-call-observer.c src/empathy-call-window.c src/empathy-call.c libempathy-gtk/empathy-search-bar.c +libempathy-gtk/empathy-new-account-dialog.c +libempathy-gtk/empathy-local-xmpp-assistant-widget.c diff --git a/po/be.po b/po/be.po index 712edef1..4ca78919 100644 --- a/po/be.po +++ b/po/be.po @@ -1,13 +1,14 @@ # insomnia , 2009. # Ihar Hrachyshka , 2011. +# Kasia Bondarava , 2011. # msgid "" msgstr "" "Project-Id-Version: empathy.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-20 22:40+0300\n" -"PO-Revision-Date: 2011-10-20 22:40+0300\n" -"Last-Translator: Ihar Hrachyshka \n" +"POT-Creation-Date: 2012-02-15 21:52+0300\n" +"PO-Revision-Date: 2012-02-15 21:51+0300\n" +"Last-Translator: Kasia Bondarava \n" "Language-Team: Belarusian \n" "Language: be\n" "MIME-Version: 1.0\n" @@ -17,506 +18,547 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "Чат у Google Talk, Facebook, MSN ды інш." - -#: ../data/empathy.desktop.in.in.h:2 msgid "Empathy" msgstr "Empathy" +#: ../data/empathy.desktop.in.in.h:2 +msgid "IM Client" +msgstr "Інтэрнэт-камунікатар" + #: ../data/empathy.desktop.in.in.h:3 msgid "Empathy Internet Messaging" msgstr "Інтэрнэт-камунікатар Empathy" #: ../data/empathy.desktop.in.in.h:4 -msgid "IM Client" -msgstr "Інтэрнэт-камунікатар" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "Чат у Google Talk, Facebook, MSN ды інш." #: ../data/org.gnome.Empathy.gschema.xml.in.h:1 -msgid "Always open a separate chat window for new chats." -msgstr "Заўсёды адкрываць новае акно для новага чату." +msgid "Connection managers should be used" +msgstr "Трэба выкарыстоўваць кіраўнікоў злучэнняў" #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Гучнасць званка" +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." +msgstr "" +"Ці трэба выкарыстоўваць кіраўнікоў злучэнняў для аўтаматычнага адлучэння/" +"перазлучэння." #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Гучнасць званка, у працэнтах." +msgid "Empathy should auto-connect on startup" +msgstr "Empathy мусіць аўтаматычна злучацца пры запуску" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -msgid "Camera device" -msgstr "Прыстасаванне відэакамеры" +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "Ці мусіць Empathy аўтаматычна злучацца з сеткамі пры запуску." #: ../data/org.gnome.Empathy.gschema.xml.in.h:5 -msgid "Camera position" -msgstr "Размяшчэнне відэакамеры" +msgid "Empathy should auto-away when idle" +msgstr "" +"Empathy мусіць аўтаматычна пераходзіць у рэжым адсутнасці пры бяздзейнасці" #: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." +"Whether Empathy should go into away mode automatically if the user is idle." msgstr "" -"Знак, які трэба ўстаўляць пасля мянушкі пры яе дапаўненні клавішай Тab у " -"групавым чаце." +"Ці мусіць Empathy аўтаматычна пераходзіць у рэжым адсутнасці пры " +"бяздзейнасці карыстальніка." #: ../data/org.gnome.Empathy.gschema.xml.in.h:7 -msgid "Chat window theme" -msgstr "Матыў акна чату" +msgid "Empathy default download folder" +msgstr "Прадвызначаная папка для сцягнутых файлаў" #: ../data/org.gnome.Empathy.gschema.xml.in.h:8 -msgid "Chat window theme variant" -msgstr "Адмена матыва акна чату" +msgid "The default folder to save file transfers in." +msgstr "Прадвызначаная папка для захавання атрыманых файлаў." #: ../data/org.gnome.Empathy.gschema.xml.in.h:9 -msgid "" -"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "" -"Спіс моў для праверкі арфаграфіі, падзеленых коскамі (напрыклад, \"en, be, ru" -"\")." +msgid "Show offline contacts" +msgstr "Паказваць пазасеткавыя кантакты" #: ../data/org.gnome.Empathy.gschema.xml.in.h:10 -msgid "Compact contact list" -msgstr "Кампактны спіс кантактаў" +msgid "Whether to show contacts that are offline in the contact list." +msgstr "Ці трэба паказваць пазасеткавыя кантакты ў спісе кантактаў." #: ../data/org.gnome.Empathy.gschema.xml.in.h:11 -msgid "Connection managers should be used" -msgstr "Трэба выкарыстоўваць кіраўнікоў злучэнняў" +msgid "Show avatars" +msgstr "Паказваць аватары" #: ../data/org.gnome.Empathy.gschema.xml.in.h:12 -msgid "Contact list sort criterion" -msgstr "Крытэрый сартавання спіса кантактаў" +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "Ці трэба паказваць аватары ў спісе кантактаў і вокнах чату." #: ../data/org.gnome.Empathy.gschema.xml.in.h:13 -msgid "D-Bus object path of the last account selected to join a room." -msgstr "" -"Сцежка аб'екта D-Bus, звязанага з апошнім контам, абраным для ўваходу ў " -"пакой." +msgid "Show protocols" +msgstr "Паказваць інфармацыю аб пратаколе" #: ../data/org.gnome.Empathy.gschema.xml.in.h:14 -msgid "Default camera device to use in video calls, e.g. /dev/video0." -msgstr "" -"Прадвызначанае прыстасаванне відэакамеры для відэаразмоў, напрыклад \"/dev/" -"video0\"." +msgid "Whether to show protocols for contacts in the contact list." +msgstr "Ці трэба паказваць інфармацыю аб пратаколе ў спісе кантактаў." #: ../data/org.gnome.Empathy.gschema.xml.in.h:15 -msgid "Default directory to select an avatar image from" -msgstr "Прадвызначаны каталог для выбару аватар" +msgid "Show Balance in contact list" +msgstr "Паказваць баланс рахунку у спісе кантактаў" #: ../data/org.gnome.Empathy.gschema.xml.in.h:16 -msgid "Disable popup notifications when away" -msgstr "Не паказваць выплыўныя апавяшчэнні ў рэжыме адсутнасці" +msgid "Whether to show account balances in the contact list." +msgstr "Ці трэба паказваць баланс контаў у спісе кантактаў." #: ../data/org.gnome.Empathy.gschema.xml.in.h:17 -msgid "Disable sounds when away" -msgstr "Не ўжываць гукавыя сігналы ў рэжыме адсутнасці" +msgid "Compact contact list" +msgstr "Кампактны спіс кантактаў" #: ../data/org.gnome.Empathy.gschema.xml.in.h:18 -msgid "Display incoming events in the status area" -msgstr "Паказваць уваходныя падзеі ў абшары стану" +msgid "Whether to show the contact list in compact mode." +msgstr "Ці трэба паказваць спіс кантактаў у кампактным рэжыме." #: ../data/org.gnome.Empathy.gschema.xml.in.h:19 -msgid "" -"Display incoming events in the status area. If false, present them to the " -"user immediately." -msgstr "" -"Паказваць уваходныя падзеі ў абшары стану. Калі выключана, адразу паказваць " -"іх карыстальніку." +msgid "Hide main window" +msgstr "Схаваць галоўнае акно" #: ../data/org.gnome.Empathy.gschema.xml.in.h:20 -msgid "Echo cancellation support" -msgstr "Падтрымка фільтрацыі рэха" +msgid "Hide the main window." +msgstr "Схаваць галоўнае акно." #: ../data/org.gnome.Empathy.gschema.xml.in.h:21 -msgid "Empathy can publish the user's location" -msgstr "Empathy можа публікаваць месцазнаходжанне карыстальніка" +msgid "Default directory to select an avatar image from" +msgstr "Прадвызначаны каталог для выбару аватар" #: ../data/org.gnome.Empathy.gschema.xml.in.h:22 -msgid "Empathy can use the GPS to guess the location" -msgstr "Empathy можа выкарыстоўваць GPS для вызначэння месцазнаходжання" +msgid "The last directory that an avatar image was chosen from." +msgstr "Апошні каталог, з якога была выбрана аватара." #: ../data/org.gnome.Empathy.gschema.xml.in.h:23 -msgid "Empathy can use the cellular network to guess the location" -msgstr "" -"Empathy можа выкарыстоўваць сотавую сетку для вызначэння месцазнаходжання" +msgid "Open new chats in separate windows" +msgstr "Адкрываць новыя чаты ў асобных вокнах" #: ../data/org.gnome.Empathy.gschema.xml.in.h:24 -msgid "Empathy can use the network to guess the location" -msgstr "Empathy можа выкарыстоўваць сетку для вызначэння месцазнаходжання" +msgid "Always open a separate chat window for new chats." +msgstr "Заўсёды адкрываць новае акно для новага чату." #: ../data/org.gnome.Empathy.gschema.xml.in.h:25 -msgid "Empathy default download folder" -msgstr "Прадвызначаная папка для сцягнутых файлаў" +msgid "Display incoming events in the status area" +msgstr "Паказваць уваходныя падзеі ў абшары стану" #: ../data/org.gnome.Empathy.gschema.xml.in.h:26 -msgid "Empathy should auto-away when idle" +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." msgstr "" -"Empathy мусіць аўтаматычна пераходзіць у рэжым адсутнасці пры бяздзейнасці" +"Паказваць уваходныя падзеі ў абшары стану. Калі выключана, адразу паказваць " +"іх карыстальніку." #: ../data/org.gnome.Empathy.gschema.xml.in.h:27 -msgid "Empathy should auto-connect on startup" -msgstr "Empathy мусіць аўтаматычна злучацца пры запуску" +msgid "The position for the chat window side pane" +msgstr "Размяшчэнне бакавога абшару ў акне чату" #: ../data/org.gnome.Empathy.gschema.xml.in.h:28 -msgid "Empathy should reduce the location's accuracy" -msgstr "Empathy мусіць пагаршаць дакладнасць месцазнаходжання" +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "Захаванае размяшчэнне бакавога абшару ў акне чату (у пікселах)." #: ../data/org.gnome.Empathy.gschema.xml.in.h:29 -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "Empathy мусіць выкарыстоўваць аватару кантакта як значок для акна чату" +msgid "Show contact groups" +msgstr "Паказваць групы кантактаў" #: ../data/org.gnome.Empathy.gschema.xml.in.h:30 -msgid "Enable WebKit Developer Tools" -msgstr "Уключыць прылады распрацоўшчыка WebKit" +msgid "Whether to show groups in the contact list." +msgstr "Ці трэба паказваць групы ў спісе кантактаў." #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 -msgid "Enable popup notifications for new messages" -msgstr "Ужываць выплыўныя апавяшчэнні для новых паведамленняў" +msgid "Contact list sort criterion" +msgstr "Крытэрый сартавання спіса кантактаў" #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 -msgid "Enable spell checker" -msgstr "Правяраць арфаграфію" +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." +msgstr "" +"Крытэрый сартавання спіса кантактаў. Прадвызначаныя паводзіны - сартаваць " +"паводле стану кантактаў - уключаюцца значэннем \"state\". Значэнне \"name\" " +"уключыць сартаванне паводле імёнаў кантактаў." #: ../data/org.gnome.Empathy.gschema.xml.in.h:33 -msgid "Hide main window" -msgstr "Схаваць галоўнае акно" +msgid "Use notification sounds" +msgstr "Агучваць апавяшчэнні" #: ../data/org.gnome.Empathy.gschema.xml.in.h:34 -msgid "Hide the main window." -msgstr "Схаваць галоўнае акно." +msgid "Whether to play a sound to notify of events." +msgstr "Ці трэба агучваць падзеі." #: ../data/org.gnome.Empathy.gschema.xml.in.h:35 -msgid "Last account selected in Join Room dialog" -msgstr "Апошні конт, выбраны ў дыялогу ўваходу ў пакой" +msgid "Disable sounds when away" +msgstr "Не ўжываць гукавыя сігналы ў рэжыме адсутнасці" #: ../data/org.gnome.Empathy.gschema.xml.in.h:36 -msgid "Nick completed character" -msgstr "Знак пасля дапоўненай мянушкі" +msgid "Whether to play sound notifications when away or busy." +msgstr "Ці трэба ўжываць гукавыя сігналы ў рэжыме адсутнасці ці занятасці." #: ../data/org.gnome.Empathy.gschema.xml.in.h:37 -msgid "Open new chats in separate windows" -msgstr "Адкрываць новыя чаты ў асобных вокнах" +msgid "Play a sound for incoming messages" +msgstr "Агучваць уваходныя паведамленні" #: ../data/org.gnome.Empathy.gschema.xml.in.h:38 -msgid "Path of the Adium theme to use" -msgstr "Сцежка да патрэбнага матыва Adium" +msgid "Whether to play a sound to notify of incoming messages." +msgstr "Ці трэба агучваць уваходныя паведамленні." #: ../data/org.gnome.Empathy.gschema.xml.in.h:39 -msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "Сцежка да патрэбнага матыва Adium, калі для чату ўжыты матыў Adium." +msgid "Play a sound for outgoing messages" +msgstr "Агучваць выхадныя паведамленні" #: ../data/org.gnome.Empathy.gschema.xml.in.h:40 -msgid "Play a sound for incoming messages" -msgstr "Агучваць уваходныя паведамленні" +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "Ці трэба агучваць выхадныя паведамленні." #: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Play a sound for new conversations" msgstr "Агучваць з'яўленне новых размоў" #: ../data/org.gnome.Empathy.gschema.xml.in.h:42 -msgid "Play a sound for outgoing messages" -msgstr "Агучваць выхадныя паведамленні" +msgid "Whether to play a sound to notify of new conversations." +msgstr "Ці трэба агучваць з'яўленне новых размоў." #: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when a contact logs in" msgstr "Агучваць уваход кантакта ў сетку" #: ../data/org.gnome.Empathy.gschema.xml.in.h:44 -msgid "Play a sound when a contact logs out" -msgstr "Агучваць выхад кантакта з сеткі" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "Ці трэба агучваць уваход кантактаў у сетку." #: ../data/org.gnome.Empathy.gschema.xml.in.h:45 -msgid "Play a sound when we log in" -msgstr "Агучваць злучэнне з сеткай" +msgid "Play a sound when a contact logs out" +msgstr "Агучваць выхад кантакта з сеткі" #: ../data/org.gnome.Empathy.gschema.xml.in.h:46 -msgid "Play a sound when we log out" -msgstr "Агучваць адлучэнне ад сеткі" +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "Ці трэба агучваць выхад кантактаў з сеткі." #: ../data/org.gnome.Empathy.gschema.xml.in.h:47 -msgid "Pop up notifications if the chat isn't focused" -msgstr "Ужываць выплыўныя апавяшчэнні, калі чат не мае фокусу" +msgid "Play a sound when we log in" +msgstr "Агучваць злучэнне з сеткай" #: ../data/org.gnome.Empathy.gschema.xml.in.h:48 -msgid "Pop up notifications when a contact logs in" -msgstr "Ужываць выплыўныя апавяшчэнні для ўваходу кантакта ў сетку" +msgid "Whether to play a sound when logging into a network." +msgstr "Ці трэба агучваць злучэнне з сеткай." #: ../data/org.gnome.Empathy.gschema.xml.in.h:49 -msgid "Pop up notifications when a contact logs out" -msgstr "Ужываць выплыўныя апавяшчэнні для выхаду кантакта з сеткі" +msgid "Play a sound when we log out" +msgstr "Агучваць адлучэнне ад сеткі" #: ../data/org.gnome.Empathy.gschema.xml.in.h:50 -msgid "Position the camera preview should be during a call." -msgstr "Размяшчэнне карцінкі з відэакамеры падчас званка." +msgid "Whether to play a sound when logging out of a network." +msgstr "Ці трэба агучваць адлучэнне ад сеткі." #: ../data/org.gnome.Empathy.gschema.xml.in.h:51 -msgid "Show Balance in contact list" -msgstr "Паказваць баланс рахунку у спісе кантактаў" +msgid "Enable popup notifications for new messages" +msgstr "Ужываць выплыўныя апавяшчэнні для новых паведамленняў" #: ../data/org.gnome.Empathy.gschema.xml.in.h:52 -msgid "Show avatars" -msgstr "Паказваць аватары" +msgid "Whether to show a popup notification when receiving a new message." +msgstr "" +"Ці трэба паказваць выплыўныя апавяшчэнні пры атрыманні новага паведамлення." #: ../data/org.gnome.Empathy.gschema.xml.in.h:53 -msgid "Show contact list in rooms" -msgstr "Паказваць спіс кантактаў у пакоях" +msgid "Disable popup notifications when away" +msgstr "Не паказваць выплыўныя апавяшчэнні ў рэжыме адсутнасці" #: ../data/org.gnome.Empathy.gschema.xml.in.h:54 -msgid "Show hint about closing the main window" -msgstr "Паказваць падказку пры закрыцці галоўнага акна" +msgid "Whether to show popup notifications when away or busy." +msgstr "" +"Ці трэба паказваць выплыўныя апавяшчэнні ў рэжыме адсутнасці ці занятасці." #: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -msgid "Show offline contacts" -msgstr "Паказваць пазасеткавыя кантакты" +msgid "Pop up notifications if the chat isn't focused" +msgstr "Ужываць выплыўныя апавяшчэнні, калі чат не мае фокусу" #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 -msgid "Show protocols" -msgstr "Паказваць інфармацыю аб пратаколе" +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" +"Ці трэба паказваць выплыўныя апавяшчэнні пры атрыманні новага паведамлення, " +"нават калі акно чату ўжо адкрыта, хоць і не мае фокусу." #: ../data/org.gnome.Empathy.gschema.xml.in.h:57 -msgid "Spell checking languages" -msgstr "Мовы для праверкі арфаграфіі" +msgid "Pop up notifications when a contact logs in" +msgstr "Ужываць выплыўныя апавяшчэнні для ўваходу кантакта ў сетку" #: ../data/org.gnome.Empathy.gschema.xml.in.h:58 -msgid "The default folder to save file transfers in." -msgstr "Прадвызначаная папка для захавання атрыманых файлаў." +msgid "Whether to show a popup notification when a contact goes online." +msgstr "" +"Ці трэба паказваць выплыўныя апавяшчэнні пры ўваходзе кантакта ў сетку." #: ../data/org.gnome.Empathy.gschema.xml.in.h:59 -msgid "The last directory that an avatar image was chosen from." -msgstr "Апошні каталог, з якога была выбрана аватара." +msgid "Pop up notifications when a contact logs out" +msgstr "Ужываць выплыўныя апавяшчэнні для выхаду кантакта з сеткі" #: ../data/org.gnome.Empathy.gschema.xml.in.h:60 -msgid "The position for the chat window side pane" -msgstr "Размяшчэнне бакавога абшару ў акне чату" +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "Ці трэба паказваць выплыўныя апавяшчэнні пры выхадзе кантакта з сеткі." #: ../data/org.gnome.Empathy.gschema.xml.in.h:61 -msgid "The stored position (in pixels) of the chat window side pane." -msgstr "Захаванае размяшчэнне бакавога абшару ў акне чату (у пікселах)." +msgid "Use graphical smileys" +msgstr "Ужываць графічныя смайлікі" #: ../data/org.gnome.Empathy.gschema.xml.in.h:62 -msgid "The theme that is used to display the conversation in chat windows." -msgstr "Матыў афармлення размоў у вокнах чату." +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "Ці трэба пераўтвараць смайлікі ў графічныя выявы ў тэксце размоў." #: ../data/org.gnome.Empathy.gschema.xml.in.h:63 -msgid "" -"The theme variant that is used to display the conversation in chat windows." -msgstr "Адмена матыва афармлення размоў у вокнах чату." +msgid "Show contact list in rooms" +msgstr "Паказваць спіс кантактаў у пакоях" #: ../data/org.gnome.Empathy.gschema.xml.in.h:64 -msgid "Use graphical smileys" -msgstr "Ужываць графічныя смайлікі" +msgid "Whether to show the contact list in chat rooms." +msgstr "Ці трэба паказваць спіс кантактаў у пакоях чату." #: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "Use notification sounds" -msgstr "Агучваць апавяшчэнні" +msgid "Chat window theme" +msgstr "Матыў акна чату" #: ../data/org.gnome.Empathy.gschema.xml.in.h:66 -msgid "Use theme for chat rooms" -msgstr "Ужываць матыў для пакояў чату" +msgid "The theme that is used to display the conversation in chat windows." +msgstr "Матыў афармлення размоў у вокнах чату." #: ../data/org.gnome.Empathy.gschema.xml.in.h:67 -msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "" -"Ці можа Empathy паведамляць аб месцазнаходжанні карыстальніка яго кантактам." +msgid "Chat window theme variant" +msgstr "Адмена матыва акна чату" #: ../data/org.gnome.Empathy.gschema.xml.in.h:68 -msgid "Whether Empathy can use the GPS to guess the location." -msgstr "Ці можа Empathy выкарыстоўваць GPS для вызначэння месцазнаходжання." +msgid "" +"The theme variant that is used to display the conversation in chat windows." +msgstr "Адмена матыва афармлення размоў у вокнах чату." #: ../data/org.gnome.Empathy.gschema.xml.in.h:69 -msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "" -"Ці можа Empathy выкарыстоўваць сотавую сетку для вызначэння месцазнаходжання." +msgid "Path of the Adium theme to use" +msgstr "Сцежка да патрэбнага матыва Adium" #: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "Whether Empathy can use the network to guess the location." -msgstr "Ці можа Empathy выкарыстоўваць сетку для вызначэння месцазнаходжання." +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "Сцежка да патрэбнага матыва Adium, калі для чату ўжыты матыў Adium." #: ../data/org.gnome.Empathy.gschema.xml.in.h:71 -msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "Ці мусіць Empathy аўтаматычна злучацца з сеткамі пры запуску." +msgid "Enable WebKit Developer Tools" +msgstr "Уключыць прылады распрацоўшчыка WebKit" #: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" -"Whether Empathy should go into away mode automatically if the user is idle." +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" -"Ці мусіць Empathy аўтаматычна пераходзіць у рэжым адсутнасці пры " -"бяздзейнасці карыстальніка." +"Ці трэба ўключыць прылады распрацоўшчыка WebKit (напрыклад, Web Inspector)." #: ../data/org.gnome.Empathy.gschema.xml.in.h:73 -msgid "" -"Whether Empathy should reduce the location's accuracy for privacy reasons." +msgid "Inform other users when you are typing to them" msgstr "" -"Ці мусіць Empathy пагаршаць дакладнасць месцазнаходжання карыстальніка дзеля " -"абароны яго права на прыватнасць." +"Паведамляць іншым карыстальнікам аб тым, што вы пішаце для іх паведамленне" #: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" -"Whether Empathy should use the avatar of the contact as the chat window icon." -msgstr "Ці мусіць Empathy выкарыстоўваць аватару кантакта як значок акна чату." +"Whether to send the 'composing' or 'paused' chat states. Does not currently " +"affect the 'gone' state." +msgstr "" +"Ці трэба пасылаць апавяшчэнні аб стане чату тыпу \"пішу\" ці \"перастаў " +"пісаць\". Пакуль што не ўплывае на стан адсутнасці." #: ../data/org.gnome.Empathy.gschema.xml.in.h:75 -msgid "" -"Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "" -"Ці трэба ўключыць прылады распрацоўшчыка WebKit (напрыклад, Web Inspector)." +msgid "Use theme for chat rooms" +msgstr "Ужываць матыў для пакояў чату" #: ../data/org.gnome.Empathy.gschema.xml.in.h:76 -msgid "" -"Whether connectivity managers should be used to automatically disconnect/" -"reconnect." -msgstr "" -"Ці трэба выкарыстоўваць кіраўнікоў злучэнняў для аўтаматычнага адлучэння/" -"перазлучэння." +msgid "Whether to use the theme for chat rooms." +msgstr "Ці трэба ўжываць гэты матыў для пакояў чату." #: ../data/org.gnome.Empathy.gschema.xml.in.h:77 -msgid "" -"Whether to check words typed against the languages you want to check with." -msgstr "" -"Ці трэба правяраць арфаграфію напісаных слоў па спісе магчымых моў тэксту." +msgid "Spell checking languages" +msgstr "Мовы для праверкі арфаграфіі" #: ../data/org.gnome.Empathy.gschema.xml.in.h:78 -msgid "Whether to convert smileys into graphical images in conversations." -msgstr "Ці трэба пераўтвараць смайлікі ў графічныя выявы ў тэксце размоў." +msgid "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +msgstr "" +"Спіс моў для праверкі арфаграфіі, падзеленых коскамі (напрыклад, \"en, be, ru" +"\")." #: ../data/org.gnome.Empathy.gschema.xml.in.h:79 -msgid "Whether to enable Pulseaudio's echo cancellation filter." -msgstr "Ці трэба ўключыць фільтрацыю рэха Pulseaudio." +msgid "Enable spell checker" +msgstr "Правяраць арфаграфію" #: ../data/org.gnome.Empathy.gschema.xml.in.h:80 -msgid "Whether to play a sound to notify of contacts logging into the network." -msgstr "Ці трэба агучваць уваход кантактаў у сетку." +msgid "" +"Whether to check words typed against the languages you want to check with." +msgstr "" +"Ці трэба правяраць арфаграфію напісаных слоў па спісе магчымых моў тэксту." #: ../data/org.gnome.Empathy.gschema.xml.in.h:81 -msgid "" -"Whether to play a sound to notify of contacts logging out of the network." -msgstr "Ці трэба агучваць выхад кантактаў з сеткі." +msgid "Nick completed character" +msgstr "Знак пасля дапоўненай мянушкі" #: ../data/org.gnome.Empathy.gschema.xml.in.h:82 -msgid "Whether to play a sound to notify of events." -msgstr "Ці трэба агучваць падзеі." +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "" +"Знак, які трэба ўстаўляць пасля мянушкі пры яе дапаўненні клавішай Тab у " +"групавым чаце." #: ../data/org.gnome.Empathy.gschema.xml.in.h:83 -msgid "Whether to play a sound to notify of incoming messages." -msgstr "Ці трэба агучваць уваходныя паведамленні." +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "Empathy мусіць выкарыстоўваць аватару кантакта як значок для акна чату" #: ../data/org.gnome.Empathy.gschema.xml.in.h:84 -msgid "Whether to play a sound to notify of new conversations." -msgstr "Ці трэба агучваць з'яўленне новых размоў." +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." +msgstr "Ці мусіць Empathy выкарыстоўваць аватару кантакта як значок акна чату." #: ../data/org.gnome.Empathy.gschema.xml.in.h:85 -msgid "Whether to play a sound to notify of outgoing messages." -msgstr "Ці трэба агучваць выхадныя паведамленні." +msgid "Last account selected in Join Room dialog" +msgstr "Апошні конт, выбраны ў дыялогу ўваходу ў пакой" #: ../data/org.gnome.Empathy.gschema.xml.in.h:86 -msgid "Whether to play a sound when logging into a network." -msgstr "Ці трэба агучваць злучэнне з сеткай." +msgid "D-Bus object path of the last account selected to join a room." +msgstr "" +"Сцежка аб'екта D-Bus, звязанага з апошнім контам, абраным для ўваходу ў " +"пакой." #: ../data/org.gnome.Empathy.gschema.xml.in.h:87 -msgid "Whether to play a sound when logging out of a network." -msgstr "Ці трэба агучваць адлучэнне ад сеткі." +msgid "Camera device" +msgstr "Прыстасаванне відэакамеры" #: ../data/org.gnome.Empathy.gschema.xml.in.h:88 -msgid "Whether to play sound notifications when away or busy." -msgstr "Ці трэба ўжываць гукавыя сігналы ў рэжыме адсутнасці ці занятасці." +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "" +"Прадвызначанае прыстасаванне відэакамеры для відэаразмоў, напрыклад \"/dev/" +"video0\"." #: ../data/org.gnome.Empathy.gschema.xml.in.h:89 -msgid "Whether to show a popup notification when a contact goes offline." -msgstr "Ці трэба паказваць выплыўныя апавяшчэнні пры выхадзе кантакта з сеткі." +msgid "Camera position" +msgstr "Размяшчэнне відэакамеры" #: ../data/org.gnome.Empathy.gschema.xml.in.h:90 -msgid "Whether to show a popup notification when a contact goes online." -msgstr "" -"Ці трэба паказваць выплыўныя апавяшчэнні пры ўваходзе кантакта ў сетку." +msgid "Position the camera preview should be during a call." +msgstr "Размяшчэнне карцінкі з відэакамеры падчас званка." #: ../data/org.gnome.Empathy.gschema.xml.in.h:91 -msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." -msgstr "" -"Ці трэба паказваць выплыўныя апавяшчэнні пры атрыманні новага паведамлення, " -"нават калі акно чату ўжо адкрыта, хоць і не мае фокусу." +msgid "Echo cancellation support" +msgstr "Падтрымка фільтрацыі рэха" #: ../data/org.gnome.Empathy.gschema.xml.in.h:92 -msgid "Whether to show a popup notification when receiving a new message." -msgstr "" -"Ці трэба паказваць выплыўныя апавяшчэнні пры атрыманні новага паведамлення." +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "Ці трэба ўключыць фільтрацыю рэха Pulseaudio." #: ../data/org.gnome.Empathy.gschema.xml.in.h:93 -msgid "Whether to show account balances in the contact list." -msgstr "Ці трэба паказваць баланс контаў у спісе кантактаў." +msgid "Show hint about closing the main window" +msgstr "Паказваць падказку пры закрыцці галоўнага акна" #: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "" -"Whether to show avatars for contacts in the contact list and chat windows." -msgstr "Ці трэба паказваць аватары ў спісе кантактаў і вокнах чату." +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." +msgstr "" +"Ці трэба паказваць дыялогавае акенца пры закрыцці галоўнага акна з дапамогай " +"кнопкі \"x\" у загалоўнай стужцы." #: ../data/org.gnome.Empathy.gschema.xml.in.h:95 -msgid "Whether to show contacts that are offline in the contact list." -msgstr "Ці трэба паказваць пазасеткавыя кантакты ў спісе кантактаў." +msgid "Empathy can publish the user's location" +msgstr "Empathy можа публікаваць месцазнаходжанне карыстальніка" #: ../data/org.gnome.Empathy.gschema.xml.in.h:96 -msgid "Whether to show popup notifications when away or busy." +msgid "Whether Empathy can publish the user's location to their contacts." msgstr "" -"Ці трэба паказваць выплыўныя апавяшчэнні ў рэжыме адсутнасці ці занятасці." +"Ці можа Empathy паведамляць аб месцазнаходжанні карыстальніка яго кантактам." #: ../data/org.gnome.Empathy.gschema.xml.in.h:97 -msgid "Whether to show protocols for contacts in the contact list." -msgstr "Ці трэба паказваць інфармацыю аб пратаколе ў спісе кантактаў." +msgid "Empathy can use the network to guess the location" +msgstr "Empathy можа выкарыстоўваць сетку для вызначэння месцазнаходжання" #: ../data/org.gnome.Empathy.gschema.xml.in.h:98 -msgid "Whether to show the contact list in chat rooms." -msgstr "Ці трэба паказваць спіс кантактаў у пакоях чату." +msgid "Whether Empathy can use the network to guess the location." +msgstr "Ці можа Empathy выкарыстоўваць сетку для вызначэння месцазнаходжання." #: ../data/org.gnome.Empathy.gschema.xml.in.h:99 -msgid "Whether to show the contact list in compact mode." -msgstr "Ці трэба паказваць спіс кантактаў у кампактным рэжыме." +msgid "Empathy can use the cellular network to guess the location" +msgstr "" +"Empathy можа выкарыстоўваць сотавую сетку для вызначэння месцазнаходжання" #: ../data/org.gnome.Empathy.gschema.xml.in.h:100 -msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." +msgid "Whether Empathy can use the cellular network to guess the location." msgstr "" -"Ці трэба паказваць дыялогавае акенца пры закрыцці галоўнага акна з дапамогай " -"кнопкі \"x\" у загалоўнай стужцы." +"Ці можа Empathy выкарыстоўваць сотавую сетку для вызначэння месцазнаходжання." #: ../data/org.gnome.Empathy.gschema.xml.in.h:101 -msgid "Whether to use the theme for chat rooms." -msgstr "Ці трэба ўжываць гэты матыў для пакояў чату." +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy можа выкарыстоўваць GPS для вызначэння месцазнаходжання" #: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Ці можа Empathy выкарыстоўваць GPS для вызначэння месцазнаходжання." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy мусіць пагаршаць дакладнасць месцазнаходжання" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 msgid "" -"Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." +"Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" -"Крытэрый сартавання спіса кантактаў. Прадвызначаныя паводзіны - сартаваць " -"паводле імёнаў кантактаў - уключаюцца значэннем \"name\". Значэнне \"state\" " -"уключыць сартаванне паводле стану кантактаў." +"Ці мусіць Empathy пагаршаць дакладнасць месцазнаходжання карыстальніка дзеля " +"абароны яго права на прыватнасць." +#. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2330 +msgid "Messaging and VoIP Accounts" +msgstr "Конты камунікатара і VoIP" + +#: ../data/empathy-accounts.desktop.in.in.h:2 msgid "Manage Messaging and VoIP accounts" msgstr "Кіраванне контамі камунікатара і VoIP" -#. Tweak the dialog -#: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2324 -msgid "Messaging and VoIP Accounts" -msgstr "Конты камунікатара і VoIP" +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Прычына не азначана" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Атрыманы запыт на змяненне стану" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Вы скасавалі перадачу файла" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Суразмоўца скасаваў перадачу файла" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Памылка пры спробе перадачы файла" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Суразмоўца не здолеў ажыццявіць перадачу файла" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "Невядомая прычына" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Перадача файла скончана, але файл аказаўся пашкоджаным" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Аддалены кантакт не падтрымлівае перадачу файлаў" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Выбраны файл не з'яўляецца звычайным файлам" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Выбраны файл пусты" @@ -536,169 +578,137 @@ msgstr "Званок да %s" msgid "Call from %s" msgstr "Званок ад %s" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "Тып сокета не падтрымліваецца" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "Прычына не азначана" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "Атрыманы запыт на змяненне стану" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "Вы скасавалі перадачу файла" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "Суразмоўца скасаваў перадачу файла" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "Памылка пры спробе перадачы файла" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "Суразмоўца не здолеў ажыццявіць перадачу файла" - -#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Невядомая прычына" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "Даступны" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "Заняты" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "Адсутны" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "Нябачны" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "Па-за сеткай" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "Невядома" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "Прычына не азначана" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "Уключаны рэжым па-за сеткай" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Сеткавая памылка" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "Няўдалая ідэнтыфікацыя" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "Памылка шыфравання" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "Імя ўжо занята" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "Сертыфікат не пададзены" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "Сертыфікат не заслугоўвае даверу" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "Сертыфікат састарэў" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "Сертыфікат не актывізаваны" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "Назва камп'ютара ў сертыфікаце не адпавядае патрэбнай" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "Адбітак сертыфіката не адпавядае патрэбнаму" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "Сертыфікат уласнаручна падпісаны" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "Памылка сертыфіката" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "Шыфраванне недаступнае" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "Хібны сертыфікат" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "Адмоўлена ў злучэнні" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "Не ўдалося ўсталяваць злучэнне" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "Злучэнне страчана" -#: ../libempathy/empathy-utils.c:354 -msgid "This resource is already connected to the server" -msgstr "Гэты рэсурс ужо злучаны з серверам" +#: ../libempathy/empathy-utils.c:355 +msgid "This account is already connected to the server" +msgstr "Гэты конт ужо злучаны з серверам" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "Злучэнне заменена новым для таго ж самага рэсурсу" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "Такі конт ужо існуе на серверы" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "Сервер надта заняты і не можа абслужыць гэта злучэнне" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "Сертыфікат быў адкліканы" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "Для сертыфіката выкарыстаны слабы або небяспечны алгарытм шыфравання" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:369 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -706,27 +716,31 @@ msgstr "" "Даўжыня сертыфіката сервера або глыбіня яго ланцуга перавышае абмежаванне, " "выстаўленае крыптаграфічнай бібліятэкай" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:373 msgid "Your software is too old" msgstr "Ваша апраграмаванне надта старое" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "Унутраная памылка" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "Людзі паблізу" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Yahoo! Японія" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Facebook" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" @@ -734,7 +748,7 @@ msgstr[0] "%d секунда таму" msgstr[1] "%d секунды таму" msgstr[2] "%d секунд таму" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -742,7 +756,7 @@ msgstr[0] "%d хвіліна таму" msgstr[1] "%d хвіліны таму" msgstr[2] "%d хвілін таму" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -750,7 +764,7 @@ msgstr[0] "%d гадзіна таму" msgstr[1] "%d гадзіны таму" msgstr[2] "%d гадзін таму" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -758,7 +772,7 @@ msgstr[0] "%d дзень таму" msgstr[1] "%d дні таму" msgstr[2] "%d дзён таму" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -766,7 +780,7 @@ msgstr[0] "%d тыдзень таму" msgstr[1] "%d тыдні таму" msgstr[2] "%d тыдняў таму" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -774,224 +788,196 @@ msgstr[0] "%d месяц таму" msgstr[1] "%d месяцы таму" msgstr[2] "%d месяцаў таму" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "у будучыні" -#: ../libempathy-gtk/empathy-account-chooser.c:540 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "Усе конты" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Конт" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Пароль" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Сервер" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Порт" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:765 +#: ../libempathy-gtk/empathy-account-widget.c:817 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -msgid "My Web Accounts" -msgstr "My Web Accounts" - -#: ../libempathy-gtk/empathy-account-widget.c:1209 -#, c-format -msgid "The account %s is edited via %s." -msgstr "Конт %s зменены з дапамогай %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1215 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Empathy не ўмее змяняць настройкі конта %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1234 -msgid "Launch My Web Accounts" -msgstr "Запусціць My Web Accounts" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1242 -#, c-format -msgid "Edit %s" -msgstr "Рэдагаваць %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1592 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget.c:1398 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Username:" msgstr "Імя карыстальніка:" -#: ../libempathy-gtk/empathy-account-widget.c:1910 +#: ../libempathy-gtk/empathy-account-widget.c:1710 msgid "A_pply" msgstr "У_жыць" -#: ../libempathy-gtk/empathy-account-widget.c:1940 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "L_og in" msgstr "_Увайсці" -#: ../libempathy-gtk/empathy-account-widget.c:2014 +#: ../libempathy-gtk/empathy-account-widget.c:1812 msgid "This account already exists on the server" msgstr "Такі конт ужо існуе на гэтым серверы" -#: ../libempathy-gtk/empathy-account-widget.c:2017 +#: ../libempathy-gtk/empathy-account-widget.c:1816 msgid "Create a new account on the server" msgstr "Стварыць новы конт на гэтым серверы" -#: ../libempathy-gtk/empathy-account-widget.c:2209 -msgid "Ca_ncel" -msgstr "_Скасаваць" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2487 +#: ../libempathy-gtk/empathy-account-widget.c:2241 #, c-format msgid "%1$s on %2$s" msgstr "%1$s на %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2513 +#: ../libempathy-gtk/empathy-account-widget.c:2267 #, c-format msgid "%s Account" msgstr "Конт %s" -#: ../libempathy-gtk/empathy-account-widget.c:2517 +#: ../libempathy-gtk/empathy-account-widget.c:2271 msgid "New account" msgstr "Новы конт" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 -msgid "Example: MyScreenName" -msgstr "Прыклад: МаёКантактнаеІмя" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Pass_word:" +msgstr "_Пароль:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 -msgid "Advanced" -msgstr "Адмысловае" +msgid "Screen _Name:" +msgstr "_Кантактнае імя:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +msgid "Example: MyScreenName" +msgstr "Прыклад: МаёКантактнаеІмя" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 -msgid "Pass_word:" -msgstr "_Пароль:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "Запомніць пароль" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -msgid "Remember Password" -msgstr "Запомніць пароль" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Port:" +msgstr "_Порт:" -#. remember password ticky box -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 -msgid "Remember password" -msgstr "Запомніць пароль" - -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 -msgid "Screen _Name:" -msgstr "_Кантактнае імя:" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "_Server:" +msgstr "_Сервер:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 -msgid "What is your AIM password?" -msgstr "Ваш пароль да конта AIM" +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Advanced" +msgstr "Адмысловае" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 msgid "What is your AIM screen name?" msgstr "Ваша кантактнае імя для конта AIM" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 -msgid "_Port:" -msgstr "_Порт:" - +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 +msgid "What is your AIM password?" +msgstr "Ваш пароль да конта AIM" + #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../src/empathy-new-chatroom-dialog.ui.h:9 -msgid "_Server:" -msgstr "_Сервер:" - -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "Example: username" -msgstr "Прыклад: імя_карыстальніка" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "Remember Password" +msgstr "Запомніць пароль" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "Ід_энтыфікатар конта:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Example: username" +msgstr "Прыклад: імя_карыстальніка" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 msgid "What is your GroupWise User ID?" msgstr "Ваш ідэнтыфікатар карыстальніка да конта GroupWise" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 msgid "What is your GroupWise password?" msgstr "Ваш пароль да конта GroupWise" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "ICQ-ід_энтыфікатар:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "Example: 123456789" msgstr "Прыклад: 123456789" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "Ch_aracter set:" msgstr "_Знаказбор:" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 -msgid "ICQ _UIN:" -msgstr "ICQ-ід_энтыфікатар:" - -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 msgid "What is your ICQ UIN?" msgstr "Ваш ідэнтыфікатар да конта ICQ" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 msgid "What is your ICQ password?" msgstr "Ваш пароль да конта ICQ" @@ -1028,11 +1014,23 @@ msgstr "Options" msgid "None" msgstr "Нічога" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Network" +msgstr "Сетка" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +msgid "Network:" +msgstr "Сетка:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Character set:" msgstr "Знаказбор:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +msgid "Servers" +msgstr "Серверы" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." @@ -1040,14 +1038,6 @@ msgstr "" "Большасць IRC-сервераў не патрабуе пароляў, таму калі вы не ўпэўнены, проста " "пакіньце графу пароля пустой." -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 -msgid "Network" -msgstr "Сетка" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 -msgid "Network:" -msgstr "Сетка:" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "Мянушка:" @@ -1064,48 +1054,20 @@ msgstr "Развітальнае паведамленне:" msgid "Real name:" msgstr "Сапраўднае імя:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 -msgid "Servers" -msgstr "Серверы" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 -msgid "What is your IRC nickname?" -msgstr "Ваша мянушка ў IRC-сетцы" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Which IRC network?" msgstr "IRC-сетка" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "Example: user@gmail.com" -msgstr "Прыклад: user@gmail.com" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "Example: user@jabber.org" -msgstr "Прыклад: user@jabber.org" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 -msgid "Encr_yption required (TLS/SSL)" -msgstr "_Абавязковае шыфраванне (TLS/SSL)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 -msgid "I_gnore SSL certificate errors" -msgstr "І_гнараваць памылкі SSL-сертыфіката" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 -msgid "Override server settings" -msgstr "Засланіць настройкі сервера ўласнымі" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 -msgid "Priori_ty:" -msgstr "_Прыярытэт:" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "What is your IRC nickname?" +msgstr "Ваша мянушка ў IRC-сетцы" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 -msgid "Reso_urce:" -msgstr "_Рэсурс:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "What is your Facebook username?" +msgstr "Ваша імя карыстальніка ў сетцы Facebook" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/badger, enter badger.\n" @@ -1118,179 +1080,203 @@ msgstr "" "Каб выбраць сабе імя, наведайце гэту старонку." -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 -msgid "Use old SS_L" -msgstr "_Выкарыстоўваць стары SSL-пратакол" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "What is your Facebook password?" msgstr "Ваш пароль да конта Facebook" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 -msgid "What is your Facebook username?" -msgstr "Ваша імя карыстальніка ў сетцы Facebook" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "What is your Google ID?" msgstr "Ваш ідэнтыфікатар Google" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Example: user@gmail.com" +msgstr "Прыклад: user@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "What is your Google password?" msgstr "Ваш пароль да конта Google" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +msgid "Example: user@jabber.org" +msgstr "Прыклад: user@jabber.org" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "I_gnore SSL certificate errors" +msgstr "І_гнараваць памылкі SSL-сертыфіката" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +msgid "Priori_ty:" +msgstr "_Прыярытэт:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +msgid "Reso_urce:" +msgstr "_Рэсурс:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "Encr_yption required (TLS/SSL)" +msgstr "_Абавязковае шыфраванне (TLS/SSL)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "Use old SS_L" +msgstr "_Выкарыстоўваць стары SSL-пратакол" + #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "Override server settings" +msgstr "Засланіць настройкі сервера ўласнымі" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 msgid "What is your Jabber ID?" msgstr "Ваш ідэнтыфікатар Jabber" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 -msgid "What is your Jabber password?" -msgstr "Ваш пароль да конта Jabber" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 msgid "What is your desired Jabber ID?" msgstr "Пажаданы ідэнтыфікатар Jabber" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +msgid "What is your Jabber password?" +msgstr "Ваш пароль да конта Jabber" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 msgid "What is your desired Jabber password?" msgstr "Ваш пароль да пажаданага конта Jabber" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 msgid "Example: user@hotmail.com" msgstr "Прыклад: user@hotmail.com" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 msgid "What is your Windows Live ID?" msgstr "Ваш ідэнтыфікатар Windows Live" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 msgid "What is your Windows Live password?" msgstr "Ваш пароль да конта Windows Live" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "E-_mail address:" -msgstr "_Электронны паштовы адрас:" - -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 msgid "Nic_kname:" msgstr "_Мянушка:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "_Last Name:" +msgstr "_Прозвішча:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 msgid "_First Name:" msgstr "Ім_я:" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +msgid "_Published Name:" +msgstr "_Апублікаванае імя:" + #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Jabber ID:" msgstr "Jabber-ід_энтыфікатар:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 -msgid "_Last Name:" -msgstr "_Прозвішча:" +msgid "E-_mail address:" +msgstr "_Электронны паштовы адрас:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -msgid "_Published Name:" -msgstr "_Апублікаванае імя:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "_Username:" +msgstr "Імя _карыстальніка:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Example: user@my.sip.server" msgstr "Прыклад: user@my.sip.server" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "Authentication username:" -msgstr "Імя для ідэнтыфікацыі карыстальніка:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover Binding" -msgstr "Пошук сувязі" - #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "Discover the STUN server automatically" -msgstr "Аўтаматычны пошук STUN-сервера" +msgid "Use this account to call _landlines and mobile phones" +msgstr "Выкарыстоўваць гэты конт для званкоў на _хатнія і мабільныя тэлефоны" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 -msgid "Ignore TLS Errors" -msgstr "Ігнараваць памылкі TLS-пратакола" +msgid "NAT Traversal Options" +msgstr "Опцыі праходу праз NAT" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "Interval (seconds)" -msgstr "Прамежак часу (у секундах)" +msgid "Proxy Options" +msgstr "Опцыі проксі-сервера" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -msgid "Keep-Alive Options" -msgstr "Опцыі падтрымкі сувязі" +msgid "Miscellaneous Options" +msgstr "Разнастайныя опцыі" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 -msgid "Loose Routing" -msgstr "Вольная маршрутызацыя" +msgid "STUN Server:" +msgstr "STUN-сервер:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 -msgid "Mechanism:" -msgstr "Механізм:" +msgid "Discover the STUN server automatically" +msgstr "Аўтаматычны пошук STUN-сервера" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 -msgid "Miscellaneous Options" -msgstr "Разнастайныя опцыі" +msgid "Discover Binding" +msgstr "Пошук сувязі" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -msgid "NAT Traversal Options" -msgstr "Опцыі праходу праз NAT" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "Сервер:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Keep-Alive Options" +msgstr "Опцыі падтрымкі сувязі" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 -msgid "Port:" -msgstr "Порт:" +msgid "Mechanism:" +msgstr "Механізм:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 +msgid "Interval (seconds)" +msgstr "Прамежак часу (у секундах)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Authentication username:" +msgstr "Імя для ідэнтыфікацыі карыстальніка:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 -msgid "Proxy Options" -msgstr "Опцыі проксі-сервера" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Transport:" +msgstr "Транспарт:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -msgid "STUN Server:" -msgstr "STUN-сервер:" +msgid "Loose Routing" +msgstr "Вольная маршрутызацыя" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contact-widget.c:347 -msgid "Server:" -msgstr "Сервер:" +msgid "Ignore TLS Errors" +msgstr "Ігнараваць памылкі TLS-пратакола" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -msgid "Transport:" -msgstr "Транспарт:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -msgid "Use this account to call _landlines and mobile phones" -msgstr "Выкарыстоўваць гэты конт для званкоў на _хатнія і мабільныя тэлефоны" +msgid "Port:" +msgstr "Порт:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 -msgid "What is your SIP account password?" -msgstr "Ваш пароль да конта SIP" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Ваш ідэнтыфікатар да конта SIP" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 -msgid "_Username:" -msgstr "Імя _карыстальніка:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP account password?" +msgstr "Ваш пароль да конта SIP" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Yahoo! I_D:" +msgstr "Yahoo!-ід_энтыфікатар:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "I_gnore conference and chat room invitations" msgstr "І_гнараваць запрашэнні на канферэнцыі і ў пакоі чату" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Room List locale:" +msgstr "_Настройкі мясцовасці для спіса пакояў:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "What is your Yahoo! ID?" msgstr "Ваш ідэнтыфікатар да конта Yahoo!" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "What is your Yahoo! password?" msgstr "Ваш пароль да конта Yahoo!" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "Yahoo! I_D:" -msgstr "Yahoo!-ід_энтыфікатар:" - -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 -msgid "_Room List locale:" -msgstr "_Настройкі мясцовасці для спіса пакояў:" - #: ../libempathy-gtk/empathy-avatar-chooser.c:471 #: ../libempathy-gtk/empathy-avatar-chooser.c:556 msgid "Couldn't convert image" @@ -1353,40 +1339,40 @@ msgstr "Гэты пратакол не падтрымлівае экстранн msgid "You don't have enough credit in order to place this call" msgstr "Вам не стае грошай, каб перанакіраваць гэты званок" -#: ../libempathy-gtk/empathy-chat.c:706 +#: ../libempathy-gtk/empathy-chat.c:728 msgid "Failed to open private chat" msgstr "Не ўдалося распачаць прыватны чат" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:786 msgid "Topic not supported on this conversation" msgstr "Гэтая размова не падтрымлівае тэмы" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:792 msgid "You are not allowed to change the topic" msgstr "Вы не маеце дазволу на змяненне тэмы размовы" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:991 #, c-format msgid "“%s” is not a valid contact ID" msgstr "\"%s\" не з'яўляецца прыдатным ідэнтыфікатарам кантакта" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1086 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: ачысціць усе паведамленні ў адкрытым акне размовы" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1089 msgid "/topic : set the topic of the current conversation" msgstr "/topic <тэма>: прызначыць тэму для актыўнай размовы" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/join : join a new chat room" msgstr "/join <ідэнтыфікатар пакоя>: далучыцца да групавога чату ў пакоі" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "/j : join a new chat room" msgstr "/j <ідэнтыфікатар пакоя>: далучыцца да групавога чату ў пакоі" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "" "/part [] []: leave the chat room, by default the " "current one" @@ -1394,24 +1380,24 @@ msgstr "" "/part [<ідэнтыфікатар пакоя>] [<прычына>]: пакінуць групавы чат, звычайна " "актыўны" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "/query []: open a private chat" msgstr "/query <кантакт> [<паведамленне>]: распачаць прыватны чат" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "/msg : open a private chat" msgstr "/msg <кантакт> <паведамленне>: распачаць прыватны чат" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "/nick : change your nickname on the current server" msgstr "/nick <мянушка>: змяніць сваю мянушку на актыўным серверы" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "/me : send an ACTION message to the current conversation" msgstr "" "/me <паведамленне>: паслаць ACTION-паведамленне ў адкрытае акно размовы" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1422,11 +1408,11 @@ msgstr "" "\". Напрыклад: \"/say /join выкарыстоўваецца для далучэння да новага " "групавога чату ў пакоі\"" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1120 msgid "/whois : display information about a contact" msgstr "/whois <кантакт>: паказаць інфармацыю аб кантакце" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1123 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1434,122 +1420,128 @@ msgstr "" "/help [<загад>]: паказаць усе вядомыя загады. Калі пададзены <загад>, " "паказаць правілы яго выкарыстання." -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1142 #, c-format msgid "Usage: %s" msgstr "Правілы карыстання: %s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1187 msgid "Unknown command" msgstr "Невядомы загад" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1313 msgid "Unknown command; see /help for the available commands" msgstr "" "Невядомы загад. Каб паглядзець спіс усіх вядомых загадаў, выканайце /help" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1564 msgid "insufficient balance to send message" msgstr "не стае грошай для пасылкі паведамлення" -#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582 +#: ../libempathy-gtk/empathy-chat.c:1645 #, c-format msgid "Error sending message '%s': %s" msgstr "Памылка пасылкі паведамлення \"%s\": %s" -#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587 +#: ../libempathy-gtk/empathy-chat.c:1649 #, c-format msgid "Error sending message: %s" msgstr "Памылка пасылкі паведамлення: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1469 +#: ../libempathy-gtk/empathy-chat.c:1576 #, c-format msgid "insufficient balance to send message. Top up." msgstr "" "не стае грошай для пасылкі паведамлення. Папоўніце рахунак." -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "not capable" msgstr "не падтрымліваецца" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "offline" msgstr "па-за сеткай" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1626 msgid "invalid contact" msgstr "хібны кантакт" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1629 msgid "permission denied" msgstr "адмоўлена ў дазволе" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1632 msgid "too long message" msgstr "надта доўгае паведамленне" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1635 msgid "not implemented" msgstr "не рэалізавана" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1639 msgid "unknown" msgstr "невядома" -#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "Тэма:" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1721 #, c-format msgid "Topic set to: %s" msgstr "Тэма вызначана як: %s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1723 +#, c-format +msgid "Topic set by %s to: %s" +msgstr "Тэма вызначана кантактам %s як: %s" + +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1728 msgid "No topic defined" msgstr "Тэма не вызначана" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2244 msgid "(No Suggestions)" msgstr "(няма прапаноў)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2312 #, c-format msgid "Add '%s' to Dictionary" msgstr "Дадаць \"%s\" у слоўнік" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2349 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Дадаць \"%s\" у слоўнік (%s)" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2419 msgid "Insert Smiley" msgstr "Уставіць смайлік" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 -#: ../libempathy-gtk/empathy-ui-utils.c:1843 +#: ../libempathy-gtk/empathy-chat.c:2437 +#: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "_Паслаць" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2373 +#: ../libempathy-gtk/empathy-chat.c:2494 msgid "_Spelling Suggestions" msgstr "Прапанаваныя _варыянты выпраўлення" -#: ../libempathy-gtk/empathy-chat.c:2462 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Не ўдалося атрымаць свежыя журналы" -#: ../libempathy-gtk/empathy-chat.c:2599 +#: ../libempathy-gtk/empathy-chat.c:2722 #, c-format msgid "%s has disconnected" msgstr "Удзельнік %s цяпер па-за сеткай" @@ -1557,12 +1549,12 @@ msgstr "Удзельнік %s цяпер па-за сеткай" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2606 +#: ../libempathy-gtk/empathy-chat.c:2729 #, c-format msgid "%1$s was kicked by %2$s" msgstr "Удзельнік %2$s выпхнуў удзельніка %1$s" -#: ../libempathy-gtk/empathy-chat.c:2609 +#: ../libempathy-gtk/empathy-chat.c:2732 #, c-format msgid "%s was kicked" msgstr "Удзельніка %s выпхнулі з пакоя" @@ -1570,17 +1562,17 @@ msgstr "Удзельніка %s выпхнулі з пакоя" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2617 +#: ../libempathy-gtk/empathy-chat.c:2740 #, c-format msgid "%1$s was banned by %2$s" msgstr "Удзельнік %2$s забаніў удзельніка %1$s" -#: ../libempathy-gtk/empathy-chat.c:2620 +#: ../libempathy-gtk/empathy-chat.c:2743 #, c-format msgid "%s was banned" msgstr "Удзельніка %s забанілі" -#: ../libempathy-gtk/empathy-chat.c:2624 +#: ../libempathy-gtk/empathy-chat.c:2747 #, c-format msgid "%s has left the room" msgstr "Удзельнік %s пакінуў пакой" @@ -1590,17 +1582,17 @@ msgstr "Удзельнік %s пакінуў пакой" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2633 +#: ../libempathy-gtk/empathy-chat.c:2756 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2658 +#: ../libempathy-gtk/empathy-chat.c:2781 #, c-format msgid "%s has joined the room" msgstr "Удзельнік %s увайшоў у пакой" -#: ../libempathy-gtk/empathy-chat.c:2683 +#: ../libempathy-gtk/empathy-chat.c:2806 #, c-format msgid "%s is now known as %s" msgstr "Удзельнік %s цяпер называецца %s" @@ -1608,90 +1600,90 @@ msgstr "Удзельнік %s цяпер называецца %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2836 -#: ../src/empathy-streamed-media-window.c:1895 -#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1535 -#: ../src/empathy-call-window.c:1585 ../src/empathy-call-window.c:2631 +#: ../libempathy-gtk/empathy-chat.c:2993 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545 +#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638 msgid "Disconnected" msgstr "Адлучаны" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3482 +#: ../libempathy-gtk/empathy-chat.c:3657 msgid "Would you like to store this password?" msgstr "Ці вы хочаце захаваць гэты пароль?" -#: ../libempathy-gtk/empathy-chat.c:3488 +#: ../libempathy-gtk/empathy-chat.c:3663 msgid "Remember" msgstr "Запомніць" -#: ../libempathy-gtk/empathy-chat.c:3498 +#: ../libempathy-gtk/empathy-chat.c:3673 msgid "Not now" msgstr "Не зараз" -#: ../libempathy-gtk/empathy-chat.c:3542 +#: ../libempathy-gtk/empathy-chat.c:3717 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Паўтарыць" -#: ../libempathy-gtk/empathy-chat.c:3546 +#: ../libempathy-gtk/empathy-chat.c:3721 msgid "Wrong password; please try again:" msgstr "Хібны пароль. Паўтарыце спробу:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3676 +#: ../libempathy-gtk/empathy-chat.c:3851 msgid "This room is protected by a password:" msgstr "Гэты пакой абаронены паролем:" -#: ../libempathy-gtk/empathy-chat.c:3703 +#: ../libempathy-gtk/empathy-chat.c:3878 msgid "Join" msgstr "Далучыцца" -#: ../libempathy-gtk/empathy-chat.c:3891 ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Злучаны" -#: ../libempathy-gtk/empathy-chat.c:3946 +#: ../libempathy-gtk/empathy-chat.c:4125 msgid "Conversation" msgstr "Размова" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3951 +#: ../libempathy-gtk/empathy-chat.c:4130 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Невядомы ці хібны ідэнтыфікатар" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Блакіраванне кантактаў часова недаступна" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Блакіраванне кантактаў недаступна" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Адмоўлена ў дазволе" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Не ўдалося блакіраваць кантакт" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Рэдагаванне спіса блакіраваных кантактаў" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1489 -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "Account:" msgstr "Конт:" @@ -1701,63 +1693,54 @@ msgstr "Блакіраваныя кантакты" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:2 #: ../src/empathy-chatrooms-window.ui.h:3 msgid "Remove" msgstr "Выдаліць" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "_Скапіраваць адрас спасылкі" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 +#: ../libempathy-gtk/empathy-chat-text-view.c:329 #: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "_Адкрыць спасылку" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:417 msgid "%A %B %d %Y" msgstr "%A, %d %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Рэдагаванне кантактных звестак" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 -msgid "Personal Information" -msgstr "Асабістыя звесткі" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "Новы кантакт" -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "Блакіраваць %s?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "" "Ці вы сапраўды хочаце блакіраваць \"%s\" у магчымасці кантактавання з вамі?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 msgid "_Block" msgstr "_Блакіраваць" -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Паскардзіцца на гэты кантакт" @@ -1765,390 +1748,315 @@ msgstr[1] "_Паскардзіцца на гэтыя кантакты" msgstr[2] "_Паскардзіцца на гэтыя кантакты" #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "_Вырашыць пазней" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "Запыт на падпіску" -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "_Block User" msgstr "_Блакіраваць карыстальніка" -#: ../libempathy-gtk/empathy-contact-list-view.c:1935 -#: ../libempathy-gtk/empathy-individual-view.c:2375 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Ці вы сапраўды хочаце выдаліць групу \"%s\"?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1937 -#: ../libempathy-gtk/empathy-individual-view.c:2378 -msgid "Removing group" -msgstr "Выдаленне групы" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-contact-list-view.c:2063 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 -msgid "_Remove" -msgstr "_Выдаліць" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2016 -#: ../libempathy-gtk/empathy-individual-view.c:2500 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Ці вы сапраўды хочаце выдаліць кантакт \"%s\"?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2018 -#: ../libempathy-gtk/empathy-individual-view.c:2521 -msgid "Removing contact" -msgstr "Выдаленне кантакта" - -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "_Дадаць кантакт..." - -#: ../libempathy-gtk/empathy-contact-menu.c:292 -msgid "_Block Contact" -msgstr "_Блакіраваць кантакт" - -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:321 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../libempathy-gtk/empathy-new-message-dialog.c:319 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "_Чат" - -#: ../libempathy-gtk/empathy-contact-menu.c:353 -#: ../libempathy-gtk/empathy-individual-menu.c:850 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Аўдыязванок" - -#: ../libempathy-gtk/empathy-contact-menu.c:386 -#: ../libempathy-gtk/empathy-individual-menu.c:895 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Відэазванок" - -#: ../libempathy-gtk/empathy-contact-menu.c:432 -#: ../libempathy-gtk/empathy-individual-menu.c:948 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "_Папярэднія размовы" - -#: ../libempathy-gtk/empathy-contact-menu.c:454 -#: ../libempathy-gtk/empathy-individual-menu.c:989 -msgid "Send File" -msgstr "Паслаць файл" - -#: ../libempathy-gtk/empathy-contact-menu.c:477 -#: ../libempathy-gtk/empathy-individual-menu.c:1031 -msgid "Share My Desktop" -msgstr "Падзяліцца доступам да стала" - -#: ../libempathy-gtk/empathy-contact-menu.c:506 -#: ../libempathy-gtk/empathy-individual-menu.c:1094 -msgid "Infor_mation" -msgstr "_Звесткі" - -#: ../libempathy-gtk/empathy-contact-menu.c:552 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "_Рэдагаваць" - -#: ../libempathy-gtk/empathy-contact-menu.c:606 -#: ../libempathy-gtk/empathy-individual-menu.c:1285 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Запрашаю вас у гэты пакой" - -#: ../libempathy-gtk/empathy-contact-menu.c:637 -#: ../libempathy-gtk/empathy-individual-menu.c:1331 -msgid "_Invite to Chat Room" -msgstr "_Запрасіць у пакой групавога чату" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "Decide _Later" +msgstr "_Вырашыць пазней" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Пошук кантактаў" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Пошук: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "_Дадаць кантакт" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Кантактаў не знойдзена" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "Прывітальнае паведамленне:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "Калі ласка, дазвольце мне бачыць, калі вы ў сетцы. Дзякуй!" -#: ../libempathy-gtk/empathy-contact-widget.c:336 -#: ../libempathy-gtk/empathy-individual-widget.c:153 -msgid "Full name:" -msgstr "Поўнае імя:" - -#: ../libempathy-gtk/empathy-contact-widget.c:337 -#: ../libempathy-gtk/empathy-individual-widget.c:154 -msgid "Phone number:" -msgstr "Тэлефонны нумар:" - -#: ../libempathy-gtk/empathy-contact-widget.c:338 -#: ../libempathy-gtk/empathy-individual-widget.c:155 -msgid "E-mail address:" -msgstr "Электронны паштовы адрас:" - -#: ../libempathy-gtk/empathy-contact-widget.c:339 -#: ../libempathy-gtk/empathy-individual-widget.c:156 -msgid "Website:" -msgstr "Сеціўная пляцоўка:" - -#: ../libempathy-gtk/empathy-contact-widget.c:340 -#: ../libempathy-gtk/empathy-individual-widget.c:157 -msgid "Birthday:" -msgstr "Дзень нараджэння:" - -#. Note to translators: this is the caption for a string of the form "5 -#. * minutes ago", and refers to the time since the contact last interacted -#. * with their IM client. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:346 -msgid "Last seen:" -msgstr "Быў ля камп'ютара:" - -#: ../libempathy-gtk/empathy-contact-widget.c:348 -msgid "Connected from:" -msgstr "Назва камп'ютара:" - -#. FIXME: once Idle implements SimplePresence using this information, we can -#. * and should bin this. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:353 -msgid "Away message:" -msgstr "Паведамленне пры адсутнасці:" - -#: ../libempathy-gtk/empathy-contact-widget.c:606 +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Каналы:" -#: ../libempathy-gtk/empathy-contact-widget.c:897 -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "ISO-код краіны:" -#: ../libempathy-gtk/empathy-contact-widget.c:899 -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Краіна:" -#: ../libempathy-gtk/empathy-contact-widget.c:901 -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Штат:" -#: ../libempathy-gtk/empathy-contact-widget.c:903 -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Горад:" -#: ../libempathy-gtk/empathy-contact-widget.c:905 -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Край:" -#: ../libempathy-gtk/empathy-contact-widget.c:907 -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Паштовы індэкс:" -#: ../libempathy-gtk/empathy-contact-widget.c:909 -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Вуліца:" -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Будынак:" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Паверх:" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Офіс:" -#: ../libempathy-gtk/empathy-contact-widget.c:917 -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Тэкст:" -#: ../libempathy-gtk/empathy-contact-widget.c:919 -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Апісанне:" -#: ../libempathy-gtk/empathy-contact-widget.c:921 -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI-адрас:" -#: ../libempathy-gtk/empathy-contact-widget.c:923 -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Ступень дакладнасці:" -#: ../libempathy-gtk/empathy-contact-widget.c:925 -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Памылка:" -#: ../libempathy-gtk/empathy-contact-widget.c:927 -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Вертыкальная памылка (у метрах):" -#: ../libempathy-gtk/empathy-contact-widget.c:929 -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Гарызантальная памылка (у метрах):" -#: ../libempathy-gtk/empathy-contact-widget.c:931 -#: ../libempathy-gtk/empathy-individual-widget.c:503 +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Хуткасць:" -#: ../libempathy-gtk/empathy-contact-widget.c:933 -#: ../libempathy-gtk/empathy-individual-widget.c:505 +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Кірунак:" -#: ../libempathy-gtk/empathy-contact-widget.c:935 -#: ../libempathy-gtk/empathy-individual-widget.c:507 +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Хуткасць пад'ёму:" -#: ../libempathy-gtk/empathy-contact-widget.c:937 -#: ../libempathy-gtk/empathy-individual-widget.c:509 +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Час апошняга абнаўлення:" -#: ../libempathy-gtk/empathy-contact-widget.c:939 -#: ../libempathy-gtk/empathy-individual-widget.c:511 +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Даўгата:" -#: ../libempathy-gtk/empathy-contact-widget.c:941 -#: ../libempathy-gtk/empathy-individual-widget.c:513 +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Шырата:" -#: ../libempathy-gtk/empathy-contact-widget.c:943 -#: ../libempathy-gtk/empathy-individual-widget.c:515 +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Вышыня:" -#: ../libempathy-gtk/empathy-contact-widget.c:996 -#: ../libempathy-gtk/empathy-contact-widget.c:1011 -#: ../libempathy-gtk/empathy-individual-widget.c:607 -#: ../libempathy-gtk/empathy-individual-widget.c:622 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:35 msgid "Location" msgstr "Месцазнаходжанне" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:1013 -#: ../libempathy-gtk/empathy-individual-widget.c:624 +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-contact-widget.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:673 +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%e %B, %Y у %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1147 -#: ../libempathy-gtk/empathy-individual-widget.c:915 +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Захаваць аватару" -#: ../libempathy-gtk/empathy-contact-widget.c:1203 -#: ../libempathy-gtk/empathy-individual-widget.c:973 +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Не ўдалося захаваць аватару" -#: ../libempathy-gtk/empathy-contact-widget.c:1887 -#: ../libempathy-gtk/empathy-individual-menu.c:1066 -#: ../libempathy-gtk/empathy-individual-widget.c:1372 -msgid "Favorite" -msgstr "Упадабаны" +#: ../libempathy-gtk/empathy-contact-widget.c:1446 +msgid "Personal Details" +msgstr "Асабістыя падрабязнасці" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -msgid "Location at (date)\t" -msgstr "Месцазнаходжанне (дата)\t" +#: ../libempathy-gtk/empathy-contact-widget.c:1449 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +msgid "Contact Details" +msgstr "Падрабязнасці аб кантакце" -#. Alias -#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1308 -msgid "Alias:" -msgstr "Псеўданім:" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +msgid "Full name" +msgstr "Поўнае імя" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "Client Information" -msgstr "Звесткі аб кліенце" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "Тэлефонны нумар" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 -msgid "Client:" -msgstr "Кліент:" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "Электронны паштовы адрас" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 -msgid "Contact Details" -msgstr "Падрабязнасці аб кантакце" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +msgid "Website" +msgstr "Сеціўная пляцоўка" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +msgid "Birthday" +msgstr "Дзень нараджэння" + +#. Note to translators: this is the caption for a string of the form "5 +#. * minutes ago", and refers to the time since the contact last interacted +#. * with their IM client. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +msgid "Last seen:" +msgstr "Быў ля камп'ютара:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +msgid "Connected from:" +msgstr "Назва камп'ютара:" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +msgid "Away message:" +msgstr "Паведамленне пры адсутнасці:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +msgid "work" +msgstr "працоўны" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +msgid "home" +msgstr "дамашні" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +msgid "mobile" +msgstr "мабільны" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +msgid "voice" +msgstr "голасам" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +msgid "preferred" +msgstr "асноўны" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "для пошты" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +msgid "parcel" +msgstr "для пасылак" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1517 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "Ідэнтыфікатар:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +#. Alias +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 +msgid "Alias:" +msgstr "Псеўданім:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Location at (date)\t" +msgstr "Месцазнаходжанне (дата)\t" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 msgid "Information requested…" msgstr "Высланы запыт звестак..." -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Client Information" +msgstr "Звесткі аб кліенце" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "OS:" msgstr "АС:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Version:" msgstr "Версія:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Client:" +msgstr "Кліент:" + +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "Групы" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2156,107 +2064,173 @@ msgstr "" "Вызначыце групы для гэтага кантакта. Заўважце, што можна не выбіраць ні " "адной групы або выбраць адразу некалькі." -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "_Дадаць групу" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Выбар" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1967 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1970 msgid "Group" msgstr "Група" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Наступная ідэнтычнасць будзе заблакіраванай:" msgstr[1] "Наступныя ідэнтычнасці будуць заблакіраваныя:" msgstr[2] "Наступныя ідэнтычнасці будуць заблакіраваныя:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Наступная ідэнтычнасць не можа быць заблакіраванай:" msgstr[1] "Наступныя ідэнтычнасці не могуць быць заблакіраванымі:" msgstr[2] "Наступныя ідэнтычнасці не могуць быць заблакіраванымі:" -#. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 -msgid "Linked Contacts" -msgstr "Звязаныя кантакты" - -#: ../libempathy-gtk/empathy-individual-linker.c:370 -msgid "Select contacts to link" -msgstr "Вызначыце кантакты для сувязі" - -#: ../libempathy-gtk/empathy-individual-linker.c:444 -msgid "New contact preview" -msgstr "Папярэдні агляд новага кантакта" - -#: ../libempathy-gtk/empathy-individual-linker.c:488 -msgid "Contacts selected in the list on the left will be linked together." -msgstr "Кантакты, вылучаныя ў левым спісе, будуць аб'яднаныя ў адно." +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Рэдагаванне кантактных звестак" #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:145 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Выберыце конт для перанакіравання званка" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 -#: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1300 -#: ../src/empathy-call-window.ui.h:2 +#: ../libempathy-gtk/empathy-individual-menu.c:348 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "Званок" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Мабільны тэлефон" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Працоўны тэлефон" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "Хатні тэлефон" +#: ../libempathy-gtk/empathy-individual-menu.c:658 +msgid "_Block Contact" +msgstr "_Блакіраваць кантакт" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1017 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:1 +msgid "_Chat" +msgstr "_Чат" + #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:805 +#: ../libempathy-gtk/empathy-individual-menu.c:1052 #: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "П_аслаць SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1143 +#: ../libempathy-gtk/empathy-individual-menu.c:1085 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Аўдыязванок" + +#: ../libempathy-gtk/empathy-individual-menu.c:1118 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Відэазванок" + +#: ../libempathy-gtk/empathy-individual-menu.c:1159 +#: ../src/empathy-roster-window-menubar.ui.h:4 +msgid "_Previous Conversations" +msgstr "_Папярэднія размовы" + +#: ../libempathy-gtk/empathy-individual-menu.c:1188 +msgid "Send File" +msgstr "Паслаць файл" + +#: ../libempathy-gtk/empathy-individual-menu.c:1218 +msgid "Share My Desktop" +msgstr "Падзяліцца доступам да стала" + +#: ../libempathy-gtk/empathy-individual-menu.c:1244 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Упадабаны" + +#: ../libempathy-gtk/empathy-individual-menu.c:1263 +msgid "gnome-contacts not installed" +msgstr "gnome-contacts не ўсталяваны" + +#: ../libempathy-gtk/empathy-individual-menu.c:1266 +msgid "Please install gnome-contacts to access contacts details." +msgstr "" +"Усталюйце gnome-contacts, каб атрымаць доступ да падрабязнасцяў кантактаў." + +#: ../libempathy-gtk/empathy-individual-menu.c:1380 +msgid "Infor_mation" +msgstr "_Звесткі" + +#: ../libempathy-gtk/empathy-individual-menu.c:1429 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Рэдагаваць" -#. Translators: this is a verb meaning "to connect two contacts together -#. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1169 -msgctxt "Link individual (contextual menu)" -msgid "_Link Contacts…" -msgstr "_Аб'яднаць кантакты..." +#: ../libempathy-gtk/empathy-individual-menu.c:1546 +#: ../src/empathy-chat-window.c:1175 +msgid "Inviting you to this room" +msgstr "Запрашаю вас у гэты пакой" + +#: ../libempathy-gtk/empathy-individual-menu.c:1592 +msgid "_Invite to Chat Room" +msgstr "_Запрасіць у пакой групавога чату" + +#: ../libempathy-gtk/empathy-individual-menu.c:1788 +#: ../src/empathy-roster-window-menubar.ui.h:5 +msgid "_Add Contact…" +msgstr "_Дадаць кантакт..." -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-view.c:2306 msgid "Delete and _Block" msgstr "Выдаліць і _блакіраваць" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +#: ../libempathy-gtk/empathy-individual-view.c:2341 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Ці вы сапраўды хочаце выдаліць групу \"%s\"?" + +#: ../libempathy-gtk/empathy-individual-view.c:2344 +msgid "Removing group" +msgstr "Выдаленне групы" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2399 +#: ../libempathy-gtk/empathy-individual-view.c:2603 +msgid "_Remove" +msgstr "_Выдаліць" + +#: ../libempathy-gtk/empathy-individual-view.c:2476 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Ці вы сапраўды хочаце выдаліць кантакт \"%s\"?" + +#: ../libempathy-gtk/empathy-individual-view.c:2485 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2265,7 +2239,11 @@ msgstr "" "Ці вы сапраўды хочаце выдаліць аб'яднальны кантакт \"%s\"? Гэта аперацыя " "таксама выдаліць яго складовыя кантакты." -#: ../libempathy-gtk/empathy-individual-widget.c:1656 +#: ../libempathy-gtk/empathy-individual-view.c:2497 +msgid "Removing contact" +msgstr "Выдаленне кантакта" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2277,23 +2255,23 @@ msgstr[2] "Аб'яднальны кантакт для %u кантактаў" msgid "Location at (date)" msgstr "Месцазнаходжанне (дата)" -#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 msgid "Online from a phone or mobile device" msgstr "У сетцы, з тэлефона або мабільнага прыстасавання" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "Новая сетка" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "Выберыце IRC-сетку" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "_Ануляваць змены ў спісе сетак" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Выбраць" @@ -2306,91 +2284,48 @@ msgstr "новы сервер" msgid "SSL" msgstr "SSL" -#. Translators: this is the title of the linking dialogue (reached by -#. * right-clicking on a contact and selecting "Link…"). "Link" in this title -#. * is a verb. -#: ../libempathy-gtk/empathy-linking-dialog.c:115 -msgid "Link Contacts" -msgstr "Аб'яднанне кантактаў" - -#: ../libempathy-gtk/empathy-linking-dialog.c:120 -msgctxt "Unlink individual (button)" -msgid "_Unlink…" -msgstr "_Раз'яднаць..." - -#: ../libempathy-gtk/empathy-linking-dialog.c:121 -msgid "" -"Completely split the displayed linked contacts into the separate contacts." -msgstr "Цалкам раздзяліць аб'яднаныя кантакты." - -#. Add button -#. Translators: this is an action button in the linking dialogue. "Link" is -#. * used here as a verb meaning "to connect two contacts to form a -#. * meta-contact". -#: ../libempathy-gtk/empathy-linking-dialog.c:136 -msgid "_Link" -msgstr "_Аб'яднаць" - -#: ../libempathy-gtk/empathy-linking-dialog.c:183 -#, c-format -msgid "Unlink linked contacts '%s'?" -msgstr "Раз'яднаць аб'яднаныя кантакты \"%s\"?" - -#: ../libempathy-gtk/empathy-linking-dialog.c:186 -msgid "" -"Are you sure you want to unlink these linked contacts? This will completely " -"split the linked contacts into separate contacts." -msgstr "" -"Ці вы сапраўды хочаце раз'яднаць аб'яднаныя кантакты? Гэта прывядзе да іх " -"поўнага падзелу." - -#: ../libempathy-gtk/empathy-linking-dialog.c:190 -msgctxt "Unlink individual (button)" -msgid "_Unlink" -msgstr "_Раз'яднаць" - -#: ../libempathy-gtk/empathy-log-window.c:634 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Журнал" -#: ../libempathy-gtk/empathy-log-window.c:689 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Паказаць" -#: ../libempathy-gtk/empathy-log-window.c:711 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Пошук" -#: ../libempathy-gtk/empathy-log-window.c:1159 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Чат у %s" -#: ../libempathy-gtk/empathy-log-window.c:1161 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Чат з %s" -#: ../libempathy-gtk/empathy-log-window.c:1211 -#: ../libempathy-gtk/empathy-log-window.c:1358 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 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:1300 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1306 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" @@ -2398,7 +2333,7 @@ msgstr[0] "%s секунда" msgstr[1] "%s секунды" msgstr[2] "%s секунд" -#: ../libempathy-gtk/empathy-log-window.c:1389 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" @@ -2406,171 +2341,167 @@ msgstr[0] "%s хвіліна" msgstr[1] "%s хвіліны" msgstr[2] "%s хвілін" -#: ../libempathy-gtk/empathy-log-window.c:1397 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Званок працягваўся %s, скончаны ў %s" -#: ../libempathy-gtk/empathy-log-window.c:1729 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Сёння" -#: ../libempathy-gtk/empathy-log-window.c:1733 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Учора" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1748 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e %B %Y" #: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3444 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "За ўвесь час" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2372 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Усе" -#: ../libempathy-gtk/empathy-log-window.c:2685 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Хто" -#: ../libempathy-gtk/empathy-log-window.c:2889 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Калі" -#: ../libempathy-gtk/empathy-log-window.c:3005 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Усё" -#: ../libempathy-gtk/empathy-log-window.c:3007 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Тэкставыя чаты" -#: ../libempathy-gtk/empathy-log-window.c:3009 -#: ../src/empathy-preferences.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "Званкі" -#: ../libempathy-gtk/empathy-log-window.c:3014 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Уваходныя званкі" -#: ../libempathy-gtk/empathy-log-window.c:3015 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Выхадныя званкі" -#: ../libempathy-gtk/empathy-log-window.c:3016 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Прапушчаныя званкі" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Што" -#: ../libempathy-gtk/empathy-log-window.c:3747 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Ці вы сапраўды хочаце выдаліць усе журналы мінулых размоў?" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Ачысціць усё" -#: ../libempathy-gtk/empathy-log-window.c:3758 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Выдаліць для:" #: ../libempathy-gtk/empathy-log-window.ui.h:1 -msgid "Loading..." -msgstr "Загрузка..." +msgid "_File" +msgstr "_Файл" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 -#: ../src/empathy-chat-window.ui.h:3 -msgid "Chat" -msgstr "Чат" +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:12 +msgid "_Edit" +msgstr "_Праўка" -#: ../libempathy-gtk/empathy-log-window.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Delete All History..." msgstr "Выдаліць усе журналы размоў..." -#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "Profile" msgstr "Профіль" -#: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:20 -msgid "Video" -msgstr "Відэа" +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:19 +msgid "Chat" +msgstr "Чат" #: ../libempathy-gtk/empathy-log-window.ui.h:7 -#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 -msgid "_Edit" -msgstr "_Праўка" +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "Video" +msgstr "Відэа" #: ../libempathy-gtk/empathy-log-window.ui.h:8 -msgid "_File" -msgstr "_Файл" - -#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "старонка 2" -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 -msgid "Contact ID:" -msgstr "Ідэнтыфікатар кантакта:" +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "Loading..." +msgstr "Загрузка..." -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "Гэты кантакт па-за сеткай" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 msgid "The specified contact is either invalid or unknown" msgstr "Гэты кантакт або хібны, або невядомы" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" msgstr "Гэты кантакт не падтрымлівае такога спосабу размовы" -#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 msgid "The requested functionality is not implemented for this protocol" msgstr "" "Для гэтага пратакола адсутнічае рэалізацыя запатрабаванай функцыянальнасці" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 msgid "Could not start a conversation with the given contact" msgstr "Не ўдалося пачаць размову з азначаным кантактам" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "Вас забанілі на гэтым канале" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "Гэты канал перапоўнены" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 msgid "You must be invited to join this channel" msgstr "Каб далучыцца да гэтага канала, трэба атрымаць запрашэнне" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" msgstr "Немагчыма працягваць у адлучаным стане" -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "Адмоўлена ў дазволе" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "Узнікла памылка пры пачатку размовы" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "Упішыце ідэнтыфікатар кантакту або тэлефонны нумар:" @@ -2594,7 +2525,13 @@ msgstr "_Аўдыязванок" msgid "New Call" msgstr "Новы званок" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Няўдалая ідэнтыфікацыя для конта %s" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2631,12 +2568,8 @@ msgstr "Пстрыкніце, каб зрабіць гэта паведамле msgid "Set status" msgstr "Вызначыць стан" -#: ../libempathy-gtk/empathy-presence-chooser.c:943 -msgid "Set your presence and current status" -msgstr "Вызначыць стан прысутнасці і яго апісанне" - #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1131 +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 msgid "Custom messages…" msgstr "Уласныя паведамленні..." @@ -2654,20 +2587,20 @@ msgid "Find:" msgstr "Шукаць:" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -msgid "Mat_ch case" -msgstr "_Улічваць рэгістр літар" +msgid "_Previous" +msgstr "На_зад" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Phrase not found" -msgstr "Выраз не знойдзены" - -#: ../libempathy-gtk/empathy-search-bar.ui.h:4 msgid "_Next" msgstr "_Наперад" +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "Mat_ch case" +msgstr "_Улічваць рэгістр літар" + #: ../libempathy-gtk/empathy-search-bar.ui.h:5 -msgid "_Previous" -msgstr "На_зад" +msgid "Phrase not found" +msgstr "Выраз не знойдзены" #: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" @@ -2713,12 +2646,12 @@ msgstr "Галасавы званок скончаны" msgid "Edit Custom Messages" msgstr "Рэдагаванне ўласных паведамленняў" -#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "Паведамленне зменена ў %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1752 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "Звычайны" @@ -2795,34 +2728,38 @@ msgid "Certificate hostname: %s" msgstr "Назва камп'ютара з сертыфіката: %s" #: ../libempathy-gtk/empathy-tls-dialog.c:281 -msgid "Continue" -msgstr "Працягнуць" +msgid "C_ontinue" +msgstr "_Працягнуць" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "Не вартае даверу злучэнне" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Гэта злучэнне не вартае даверу. Усё роўна працягнуць працэдуру?" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "Запомніць гэты выбар для наступных злучэнняў" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "Падрабязнасці аб сертыфікаце" -#: ../libempathy-gtk/empathy-ui-utils.c:1738 +#: ../libempathy-gtk/empathy-ui-utils.c:1741 msgid "Unable to open URI" msgstr "Не ўдалося адкрыць URI-адрас" -#: ../libempathy-gtk/empathy-ui-utils.c:1835 +#: ../libempathy-gtk/empathy-ui-utils.c:1859 msgid "Select a file" msgstr "Выбар файла" -#: ../libempathy-gtk/empathy-ui-utils.c:1907 +#: ../libempathy-gtk/empathy-ui-utils.c:1934 msgid "Insufficient free space to save file" msgstr "Не стае вольнай прасторы для захавання файла" -#: ../libempathy-gtk/empathy-ui-utils.c:1915 +#: ../libempathy-gtk/empathy-ui-utils.c:1942 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2831,7 +2768,7 @@ msgstr "" "Каб захаваць гэты файл, патрэбна %s вольнай прасторы, а даступна толькі %s. " "Выберыце іншае месца для файла." -#: ../libempathy-gtk/empathy-ui-utils.c:1959 +#: ../libempathy-gtk/empathy-ui-utils.c:1986 #, c-format msgid "Incoming file from %s" msgstr "Уваходны файл ад %s" @@ -3003,31 +2940,31 @@ msgstr "Заходні" msgid "Vietnamese" msgstr "В'етнамскі" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Няма паведамлення аб памылцы" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Імгненнае паведамленне (Empathy)" -#: ../src/empathy.c:434 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Не злучацца пры запуску" -#: ../src/empathy.c:438 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Не паказваць спіс кантактаў ды іншыя акенцы пры запуску" -#: ../src/empathy.c:453 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "- Інтэрнэт-камунікатар Empathy" -#: ../src/empathy.c:640 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Памылка сувязі з кіраўніком контаў" -#: ../src/empathy.c:642 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3072,11 +3009,11 @@ msgstr "" "апраграмавання на адрас: the Free Software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Інтэрнэт-камунікатар для GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "insomnia \n" @@ -3113,35 +3050,36 @@ msgstr "" "меню Праўка." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1276 msgid "An error occurred" msgstr "Узнікла памылка" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Тып вашага конта для чату" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "Ці вы маеце іншыя конты для чату, якія б вы таксама хацелі настроіць?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Падайце падрабязныя звесткі аб вашым конце" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Тып новага конта для чату" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Ці трэба стварыць іншыя конты для чату?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Падайце падрабязныя звесткі аб новым конце" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3153,41 +3091,41 @@ msgstr "" "праграмамі для чату. Калі вы маеце мікрафон ці сеціўную відэакамеру, таксама " "можна рабіць аўдыя- і відэазванкі." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "Ці вы маеце конт, якім ужо карысталіся ў іншай праграме для чату?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Так, трэба імпартаваць настройкі конта з " -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Так, я падам настройкі конта" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Не, мне патрэбны новы конт" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Не, пакуль што я толькі хачу ўбачыць людзей паблізу мяне" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Вызначыце конты для імпартавання:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Так" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Не, пакуль што ўсё" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3200,16 +3138,16 @@ msgstr "" "гэтыя настройкі або наогул выключыць гэту функцыю ў дыялогавым акенцы \"Конты" "\"." -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 msgid "Edit->Accounts" msgstr "Праўка->Конты" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "Пакуль не _трэба ўключаць гэту функцыю" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1148 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3221,85 +3159,93 @@ msgstr "" "усталюйце пакунак \"telepathy-salut\" і стварыце конт \"Людзі паблізу\" у " "акенцы \"Конты\"." -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1154 msgid "telepathy-salut not installed" msgstr "telepathy-salut не ўсталяваны" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1200 msgid "Messaging and VoIP Accounts Assistant" msgstr "Памочнік настройкі контаў для чату і VoIP" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1234 msgid "Welcome to Empathy" msgstr "Вітаем у Empathy" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1243 msgid "Import your existing accounts" msgstr "Імпартаванне наяўных контаў" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1261 msgid "Please enter personal details" msgstr "Запоўніце анкету з асабістымі звесткамі" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Ваш конт %s мае незахаваныя змены." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Ваш новы конт яшчэ не захаваны." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:753 -#: ../src/empathy-call-window.c:1319 +#: ../src/empathy-accounts-dialog.c:347 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1332 msgid "Connecting…" msgstr "Злучэнне..." -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:388 #, c-format msgid "Offline — %s" msgstr "Па-за сеткай - %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:400 #, c-format msgid "Disconnected — %s" msgstr "Адлучаны - %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:411 msgid "Offline — No Network Connection" msgstr "Па-за сеткай - Няма сеткавага злучэння" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:418 msgid "Unknown Status" msgstr "Невядомы стан" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:430 msgid "Offline — Account Disabled" msgstr "Па-за сеткай - Конт выключаны" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Вы ствараеце новы конт, што прывядзе да страты\n" -"вашых змен. Ці вы сапраўды хочаце працягнуць працэдуру?" +#: ../src/empathy-accounts-dialog.c:533 +msgid "Edit Connection Parameters" +msgstr "Змяненне параметраў злучэння" -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:696 +msgid "Failed to retrieve your personal information from the server." +msgstr "Не ўдалося атрымаць асабістыя звесткі з сервера." + +#: ../src/empathy-accounts-dialog.c:702 +msgid "Go online to edit your personal information." +msgstr "Злучыцеся з сеткай, каб змагчы рэдагаваць асабістыя звесткі." + +#: ../src/empathy-accounts-dialog.c:787 +msgid "_Edit Connection Parameters..." +msgstr "_Змяніць параметры злучэння..." + +#: ../src/empathy-accounts-dialog.c:1292 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Ці вы сапраўды хочаце выдаліць %s са свайго камп'ютара?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1296 msgid "This will not remove your account on the server." msgstr "Гэтае дзеянне не выдаліць ваш конт на серверы." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1532 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3308,15 +3254,15 @@ msgstr "" "вашых змен. Ці вы сапраўды хочаце працягнуць працэдуру?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1708 msgid "_Enable" msgstr "_Уключыць" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1709 msgid "_Disable" msgstr "_Выключыць" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2179 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3328,19 +3274,15 @@ msgstr "" msgid "Add…" msgstr "Дадаць..." -#: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Loading account information" -msgstr "Загрузка звестак аб конце" - #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "No protocol installed" -msgstr "Модулі для працы з пратаколамі не ўсталяваныя" +msgid "_Import…" +msgstr "І_мпартаваць..." #: ../src/empathy-accounts-dialog.ui.h:4 msgid "Protocol:" msgstr "Пратакол:" -#: ../src/empathy-accounts-dialog.ui.h:6 +#: ../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." @@ -3348,15 +3290,19 @@ msgstr "" "Каб дадаць новы конт, спачатку трэба ўсталяваць модуль падтрымкі адпаведнага " "пратакола." +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "Модулі для працы з пратаколамі не ўсталяваныя" + #: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Import…" -msgstr "І_мпартаваць..." +msgid "Loading account information" +msgstr "Загрузка звестак аб конце" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr "- ідэнтыфікацыйны кліент Empathy" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Ідэнтыфікацыйны кліент Empathy" @@ -3364,104 +3310,104 @@ msgstr "Ідэнтыфікацыйны кліент Empathy" msgid "People nearby" msgstr "Людзі паблізу" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:193 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:203 msgid "- Empathy Audio/Video Client" msgstr "- Аўдыя- і відэакліент Empathy" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:218 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:228 msgid "Empathy Audio/Video Client" msgstr "Аўдыя- і відэакліент Empathy" -#: ../src/empathy-streamed-media-window.c:430 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Кантраснасць" -#: ../src/empathy-streamed-media-window.c:433 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Яркасць" -#: ../src/empathy-streamed-media-window.c:436 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Гама" -#: ../src/empathy-streamed-media-window.c:541 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Гучнасць" -#: ../src/empathy-streamed-media-window.c:1109 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "_Бакавая паліца" -#: ../src/empathy-streamed-media-window.c:1129 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Аўдыяўваход" -#: ../src/empathy-streamed-media-window.c:1133 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Відэаўваход" -#: ../src/empathy-streamed-media-window.c:1141 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Панэль набору нумару" -#: ../src/empathy-streamed-media-window.c:1152 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Падрабязнасці" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1221 -#: ../src/empathy-call-window.c:1928 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1934 #, c-format msgid "Call with %s" msgstr "Званок: %s" -#: ../src/empathy-streamed-media-window.c:1454 -#: ../src/empathy-call-window.c:2172 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2178 msgid "The IP address as seen by the machine" msgstr "IP-адрас, які бачыць машына" -#: ../src/empathy-streamed-media-window.c:1456 -#: ../src/empathy-call-window.c:2174 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2180 msgid "The IP address as seen by a server on the Internet" msgstr "IP-адрас, які бачыць сервер у інтэрнэце" -#: ../src/empathy-streamed-media-window.c:1458 -#: ../src/empathy-call-window.c:2176 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2182 msgid "The IP address of the peer as seen by the other side" msgstr "IP-адрас суразмоўцы, бачны з іншага боку злучэння" -#: ../src/empathy-streamed-media-window.c:1460 -#: ../src/empathy-call-window.c:2178 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2184 msgid "The IP address of a relay server" msgstr "IP-адрас рэтранслятарнага сервера" -#: ../src/empathy-streamed-media-window.c:1462 -#: ../src/empathy-call-window.c:2180 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2186 msgid "The IP address of the multicast group" msgstr "IP-адрас мультыкаст-групы" +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 #: ../src/empathy-streamed-media-window.c:1844 #: ../src/empathy-streamed-media-window.c:1847 -#: ../src/empathy-streamed-media-window.c:1850 -#: ../src/empathy-streamed-media-window.c:1853 msgctxt "codec" msgid "Unknown" msgstr "Невядомы" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2145 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "Працягласць злучэння - %d:%02d хв" -#: ../src/empathy-streamed-media-window.c:2206 -#: ../src/empathy-call-window.c:2950 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3040 msgid "Technical Details" msgstr "Тэхнічныя падрабязнасці" -#: ../src/empathy-streamed-media-window.c:2244 -#: ../src/empathy-call-window.c:2988 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3079 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3470,8 +3416,8 @@ msgstr "" "Апраграмаванне, якім карыстаецца %s, не разумее ні аднаго з аўдыяфарматаў, " "якія падтрымлівае ваш камп'ютар" -#: ../src/empathy-streamed-media-window.c:2249 -#: ../src/empathy-call-window.c:2993 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3084 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3480,8 +3426,8 @@ msgstr "" "Апраграмаванне, якім карыстаецца %s, не разумее ні аднаго з відэафарматаў, " "якія падтрымлівае ваш камп'ютар" -#: ../src/empathy-streamed-media-window.c:2255 -#: ../src/empathy-call-window.c:2999 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3490,29 +3436,29 @@ msgstr "" "Не ўдалося ўсталяваць злучэнне з %s. Відаць, хтосьці з вас далучаны да " "сеткі, якая не дазваляе непасрэднае злучэнне." -#: ../src/empathy-streamed-media-window.c:2261 -#: ../src/empathy-call-window.c:3005 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3096 msgid "There was a failure on the network" msgstr "У сетцы ўзнікла памылка" -#: ../src/empathy-streamed-media-window.c:2265 -#: ../src/empathy-call-window.c:3009 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3100 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "Апраграмаванне для аўдыяфарматаў, патрэбных для абслугоўвання гэтага званка, " "не ўсталявана на гэтым камп'ютары" -#: ../src/empathy-streamed-media-window.c:2268 -#: ../src/empathy-call-window.c:3012 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3103 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Апраграмаванне для відэафарматаў, патрэбных для абслугоўвання гэтага званка, " "не ўсталявана на гэтым камп'ютары" -#: ../src/empathy-streamed-media-window.c:2278 -#: ../src/empathy-call-window.c:3024 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3115 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please паведаміце аб гэтай хібе ў праграме і прычапіце журнальны вывад з " "акенца \"Адладка\" ў меню \"Дапамога\"." -#: ../src/empathy-streamed-media-window.c:2286 -#: ../src/empathy-call-window.c:3033 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3124 msgid "There was a failure in the call engine" msgstr "У рухавіку званкоў узнікла памылка" -#: ../src/empathy-streamed-media-window.c:2289 -#: ../src/empathy-call-window.c:3036 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3127 msgid "The end of the stream was reached" msgstr "Дасягнуты канец струменя" -#: ../src/empathy-streamed-media-window.c:2329 -#: ../src/empathy-call-window.c:3076 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3167 msgid "Can't establish audio stream" msgstr "Не ўдалося распачаць аўдыяструменяванне" -#: ../src/empathy-streamed-media-window.c:2339 -#: ../src/empathy-call-window.c:3086 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3177 msgid "Can't establish video stream" msgstr "Не ўдалося распачаць відэаструменяванне" -#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2 +#: ../src/empathy-call-window.ui.h:1 #: ../src/empathy-streamed-media-window.ui.h:1 -msgid "Audio" -msgstr "Аўдыя" +msgid "_Call" +msgstr "_Званок" #: ../src/empathy-call-window.ui.h:3 -#: ../src/empathy-streamed-media-window.ui.h:5 -msgid "Decoding Codec:" -msgstr "Дэкадавальны кодэк:" +msgid "_Microphone" +msgstr "_Мікрафон" #: ../src/empathy-call-window.ui.h:4 -msgid "Disable camera" -msgstr "Выключыць відэакамеру" +msgid "_Camera" +msgstr "_Камера" #: ../src/empathy-call-window.ui.h:5 -msgid "Display the dialpad" -msgstr "Паказаць панэль набору" +msgid "_Settings" +msgstr "_Настройкі" #: ../src/empathy-call-window.ui.h:6 -#: ../src/empathy-streamed-media-window.ui.h:9 -msgid "Encoding Codec:" -msgstr "Кадавальны кодэк:" +#: ../src/empathy-roster-window-menubar.ui.h:17 +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "_View" +msgstr "_Від" -#: ../src/empathy-call-window.ui.h:7 -#: ../src/empathy-streamed-media-window.ui.h:10 -msgid "Hang up" -msgstr "Павесіць трубку" +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:27 +msgid "_Help" +msgstr "_Дапамога" -#: ../src/empathy-call-window.ui.h:8 -#: ../src/empathy-streamed-media-window.ui.h:11 -msgid "Hang up current call" -msgstr "Закончыць гэту размову" +#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:28 +msgid "_Contents" +msgstr "_Змест" #: ../src/empathy-call-window.ui.h:9 -#: ../src/empathy-streamed-media-window.ui.h:12 -msgid "Local Candidate:" -msgstr "Мясцовы кандыдат:" +#: ../src/empathy-roster-window-menubar.ui.h:29 +msgid "_Debug" +msgstr "Ад_ладка" #: ../src/empathy-call-window.ui.h:10 -msgid "Maximise me" -msgstr "Разгарнуць мяне" +msgid "Swap camera" +msgstr "Памяняць камеру" #: ../src/empathy-call-window.ui.h:11 msgid "Minimise me" msgstr "Згарнуць мяне" #: ../src/empathy-call-window.ui.h:12 -#: ../src/empathy-streamed-media-window.ui.h:15 -msgid "Remote Candidate:" -msgstr "Аддалены кандыдат:" +msgid "Maximise me" +msgstr "Разгарнуць мяне" #: ../src/empathy-call-window.ui.h:13 -#: ../src/empathy-streamed-media-window.ui.h:16 -msgid "Send Audio" -msgstr "Пасылаць аўдыясігнал" +msgid "Disable camera" +msgstr "Выключыць відэакамеру" #: ../src/empathy-call-window.ui.h:14 -msgid "Send Video" -msgstr "Пасылаць відэасігнал" +#: ../src/empathy-streamed-media-window.ui.h:2 +msgid "Hang up" +msgstr "Павесіць трубку" #: ../src/empathy-call-window.ui.h:15 -msgid "Show dialpad" -msgstr "Паказаць панэль набору" +#: ../src/empathy-streamed-media-window.ui.h:9 +msgid "Hang up current call" +msgstr "Закончыць гэту размову" #: ../src/empathy-call-window.ui.h:16 +msgid "Video call" +msgstr "Відэазванок" + +#: ../src/empathy-call-window.ui.h:17 msgid "Start a video call" msgstr "Распачаць відэазванок" -#: ../src/empathy-call-window.ui.h:17 +#: ../src/empathy-call-window.ui.h:19 msgid "Start an audio call" msgstr "Распачаць аўдыязванок" -#: ../src/empathy-call-window.ui.h:18 -msgid "Swap camera" -msgstr "Памяняць камеру" - -#: ../src/empathy-call-window.ui.h:19 -#: ../src/empathy-streamed-media-window.ui.h:17 -msgid "Toggle audio transmission" -msgstr "Пераключыць перадачу аўдыясігналу" - #: ../src/empathy-call-window.ui.h:20 -msgid "Toggle video transmission" -msgstr "Пераключыць перадачу відэасігналу" +msgid "Show dialpad" +msgstr "Паказаць панэль набору" #: ../src/empathy-call-window.ui.h:21 -#: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581 -#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 -msgid "Unknown" -msgstr "Невядома" +msgid "Display the dialpad" +msgstr "Паказаць панэль набору" + +#: ../src/empathy-call-window.ui.h:22 +msgid "Send Video" +msgstr "Пасылаць відэасігнал" #: ../src/empathy-call-window.ui.h:23 -msgid "Video call" -msgstr "Відэазванок" +msgid "Toggle video transmission" +msgstr "Пераключыць перадачу відэасігналу" #: ../src/empathy-call-window.ui.h:24 -#: ../src/empathy-streamed-media-window.ui.h:24 -msgid "_Call" -msgstr "_Званок" +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Send Audio" +msgstr "Пасылаць аўдыясігнал" #: ../src/empathy-call-window.ui.h:25 -msgid "_Camera" -msgstr "_Камера" - -#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 -msgid "_Contents" -msgstr "_Змест" +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Toggle audio transmission" +msgstr "Пераключыць перадачу аўдыясігналу" #: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 -msgid "_Debug" -msgstr "Ад_ладка" +#: ../src/empathy-streamed-media-window.ui.h:20 +msgid "Encoding Codec:" +msgstr "Кадавальны кодэк:" -#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 -msgid "_Help" -msgstr "_Дапамога" +#: ../src/empathy-call-window.ui.h:28 +#: ../src/empathy-streamed-media-window.ui.h:21 +#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588 +#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590 +msgid "Unknown" +msgstr "Невядома" + +#: ../src/empathy-call-window.ui.h:29 +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Decoding Codec:" +msgstr "Дэкадавальны кодэк:" #: ../src/empathy-call-window.ui.h:30 -msgid "_Microphone" -msgstr "_Мікрафон" +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Remote Candidate:" +msgstr "Аддалены кандыдат:" #: ../src/empathy-call-window.ui.h:31 -msgid "_Settings" -msgstr "_Настройкі" +#: ../src/empathy-streamed-media-window.ui.h:24 +msgid "Local Candidate:" +msgstr "Мясцовы кандыдат:" -#: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 +#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24 #: ../src/empathy-streamed-media-window.ui.h:25 -msgid "_View" -msgstr "_Від" +msgid "Audio" +msgstr "Аўдыя" + +#: ../src/empathy-chat-window.c:285 +msgid "Close this window?" +msgstr "Закрыць гэта акно?" + +#: ../src/empathy-chat-window.c:290 +#, c-format +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "" +"Закрыўшы гэта акно, вы выйдзеце з %s. Вы больш не будзеце атрымліваць новых " +"паведамленняў да паўторнага ўваходу." -#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 +#: ../src/empathy-chat-window.c:301 +#, 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] "" +"Закрыўшы гэта акно, вы выйдзеце з %u пакоя. Вы больш не будзеце атрымліваць " +"новых паведамленняў да паўторнага ўваходу." +msgstr[1] "" +"Закрыўшы гэта акно, вы выйдзеце з %u пакояў. Вы больш не будзеце атрымліваць " +"новых паведамленняў да паўторнага ўваходу." +msgstr[2] "" +"Закрыўшы гэта акно, вы выйдзеце з %u пакояў. Вы больш не будзеце атрымліваць " +"новых паведамленняў да паўторнага ўваходу." + +#: ../src/empathy-chat-window.c:310 +#, c-format +msgid "Leave %s?" +msgstr "Выйсці з %s?" + +#: ../src/empathy-chat-window.c:311 +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "" +"Вы больш не будзеце атрымліваць новых паведамленняў з гэтага пакоя да " +"паўторнага ўваходу." + +#: ../src/empathy-chat-window.c:330 +msgid "Close window" +msgstr "Закрыць акно" + +#: ../src/empathy-chat-window.c:330 +msgid "Leave room" +msgstr "Выйсці з пакоя" + +#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -3685,7 +3683,7 @@ msgstr[0] "%s (%d непрачытана)" msgstr[1] "%s (%d непрачытана)" msgstr[2] "%s (%d непрачытана)" -#: ../src/empathy-chat-window.c:493 +#: ../src/empathy-chat-window.c:648 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -3693,7 +3691,7 @@ msgstr[0] "%s (і яшчэ %u размова)" msgstr[1] "%s (і яшчэ %u размовы)" msgstr[2] "%s (і яшчэ %u размоў)" -#: ../src/empathy-chat-window.c:509 +#: ../src/empathy-chat-window.c:664 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -3701,7 +3699,7 @@ msgstr[0] "%s (%d непрачытанае паведамленне ад інш msgstr[1] "%s (%d непрачытаныя паведамленні ад іншых)" msgstr[2] "%s (%d непрачытаных паведамленняў ад іншых)" -#: ../src/empathy-chat-window.c:518 +#: ../src/empathy-chat-window.c:673 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -3709,11 +3707,11 @@ msgstr[0] "%s (%d непрачытанае паведамленне ад усі msgstr[1] "%s (%d непрачытаныя паведамленні ад усіх)" msgstr[2] "%s (%d непрачытаных паведамленняў ад усіх)" -#: ../src/empathy-chat-window.c:733 +#: ../src/empathy-chat-window.c:888 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:743 +#: ../src/empathy-chat-window.c:898 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3721,69 +3719,69 @@ msgstr[0] "Пасылка %d паведамлення" msgstr[1] "Пасылка %d паведамленняў" msgstr[2] "Пасылка %d паведамленняў" -#: ../src/empathy-chat-window.c:765 +#: ../src/empathy-chat-window.c:920 msgid "Typing a message." msgstr "Піша паведамленне." #: ../src/empathy-chat-window.ui.h:1 -msgid "C_lear" -msgstr "_Ачысціць" +msgid "_Conversation" +msgstr "_Размова" #: ../src/empathy-chat-window.ui.h:2 -msgid "C_ontact" -msgstr "_Кантакт" +msgid "C_lear" +msgstr "_Ачысціць" -#: ../src/empathy-chat-window.ui.h:4 +#: ../src/empathy-chat-window.ui.h:3 msgid "Insert _Smiley" msgstr "_Уставіць смайлік" +#: ../src/empathy-chat-window.ui.h:4 +msgid "_Favorite Chat Room" +msgstr "_Упадабаны пакой для групавога чату" + #: ../src/empathy-chat-window.ui.h:5 -msgid "Invite _Participant…" -msgstr "_Запрасіць удзельнікаў..." +msgid "Notify for All Messages" +msgstr "Апавяшчаць аб усіх паведамленнях" -#: ../src/empathy-chat-window.ui.h:6 -msgid "Move Tab _Left" -msgstr "Пасунуць картку ў_лева" +#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1 +msgid "_Show Contact List" +msgstr "_Паказаць спіс кантактаў" #: ../src/empathy-chat-window.ui.h:7 -msgid "Move Tab _Right" -msgstr "Пасунуць картку ў_права" +msgid "Invite _Participant…" +msgstr "_Запрасіць удзельнікаў..." #: ../src/empathy-chat-window.ui.h:8 -msgid "Notify for All Messages" -msgstr "Апавяшчаць аб усіх паведамленнях" +msgid "C_ontact" +msgstr "_Кантакт" #: ../src/empathy-chat-window.ui.h:10 -msgid "_Conversation" -msgstr "_Размова" +msgid "_Tabs" +msgstr "_Карткі" #: ../src/empathy-chat-window.ui.h:11 -msgid "_Detach Tab" -msgstr "_Адчапіць картку" - -#: ../src/empathy-chat-window.ui.h:13 -msgid "_Favorite Chat Room" -msgstr "_Упадабаны пакой для групавога чату" +msgid "_Previous Tab" +msgstr "Да _папярэдняй карткі" -#: ../src/empathy-chat-window.ui.h:15 +#: ../src/empathy-chat-window.ui.h:12 msgid "_Next Tab" msgstr "Да _наступнай карткі" -#: ../src/empathy-chat-window.ui.h:16 -msgid "_Previous Tab" -msgstr "Да _папярэдняй карткі" +#: ../src/empathy-chat-window.ui.h:13 +msgid "_Undo Close Tab" +msgstr "_Вярнуць закрытую картку" -#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5 -msgid "_Show Contact List" -msgstr "_Паказаць спіс кантактаў" +#: ../src/empathy-chat-window.ui.h:14 +msgid "Move Tab _Left" +msgstr "Пасунуць картку ў_лева" -#: ../src/empathy-chat-window.ui.h:18 -msgid "_Tabs" -msgstr "_Карткі" +#: ../src/empathy-chat-window.ui.h:15 +msgid "Move Tab _Right" +msgstr "Пасунуць картку ў_права" -#: ../src/empathy-chat-window.ui.h:19 -msgid "_Undo Close Tab" -msgstr "_Вярнуць закрытую картку" +#: ../src/empathy-chat-window.ui.h:16 +msgid "_Detach Tab" +msgstr "_Адчапіць картку" #: ../src/empathy-chatrooms-window.c:251 msgid "Name" @@ -3797,100 +3795,100 @@ msgstr "Пакой" msgid "Auto-Connect" msgstr "Аўтаматычнае злучэнне" -#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-chatrooms-window.ui.h:1 msgid "Manage Favorite Rooms" msgstr "Кіраванне спісам упадабаных пакояў для групавога чату" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Уваходны відэазванок" -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1552 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562 msgid "Incoming call" msgstr "Уваходны званок" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s просіць відэаразмовы. Адкажаце?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s·просіць размовы. Адкажаце?" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1558 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568 #, c-format msgid "Incoming call from %s" msgstr "Уваходны званок ад %s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "_Скінуць" -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_Адказаць" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "_Адказаць з відэа" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1558 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1568 #, c-format msgid "Incoming video call from %s" msgstr "Уваходны відэазванок ад %s" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Запрашэнне ў пакой для групавога чату" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Запрашэнне ў %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "Удзельнік %s запрашае вас далучыцца да %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_Адмовіцца" -#: ../src/empathy-event-manager.c:858 -#: ../src/empathy-new-chatroom-dialog.ui.h:7 +#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "_Join" msgstr "_Прыняць запрашэнне" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "Удзельнік %s запрасіў вас у %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "Вас запрасілі ў %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Уваходны файл ад %s" -#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374 msgid "Password required" msgstr "Патрэбны пароль" -#: ../src/empathy-event-manager.c:1210 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s просіць дазволу на прагляд вашага сеткавага стану" -#: ../src/empathy-event-manager.c:1214 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3900,105 +3898,105 @@ msgstr "" "Паведамленне: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Невядома" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s з %s, хуткасць: %s/с" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s з %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Атрыманне \"%s\" ад %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Пасылка \"%s\" да %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Памылка атрымання \"%s\" ад %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Памылка атрымання файла" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Памылка пасылкі \"%s\" да %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Памылка пасылкі файла" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "\"%s\" атрыманы ад %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "\"%s\" пасланы да %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Перадача файла закончана" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Чакаем адказу ад суразмоўцы" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Праверка цэласці \"%s\"" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Падлік хэшу \"%s\"" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Файл" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Засталося" @@ -4024,165 +4022,180 @@ msgid "Import Accounts" msgstr "Імпартаванне контаў" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "Імпартаванне" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Пратакол" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Крыніца" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-roster-window.c:391 msgid "Provide Password" msgstr "Падаць пароль" -#: ../src/empathy-main-window.c:401 +#: ../src/empathy-roster-window.c:397 msgid "Disconnect" msgstr "Адлучыцца" -#: ../src/empathy-main-window.c:642 +#: ../src/empathy-roster-window.c:657 +msgid "You need to setup an account to see contacts here." +msgstr "Каб убачыць кантакты, трэба настроіць конт." + +#: ../src/empathy-roster-window.c:673 msgid "No match found" msgstr "Адпаведнікаў не знойдзена" -#: ../src/empathy-main-window.c:750 +#: ../src/empathy-roster-window.c:783 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" "На жаль, пакуль вы не абновіце апраграмаванне %2$s, немагчыма будзе " "карыстацца контамі %1$s." -#: ../src/empathy-main-window.c:818 +#: ../src/empathy-roster-window.c:849 msgid "Update software..." msgstr "Абнавіць апраграмаванне..." -#: ../src/empathy-main-window.c:824 ../src/empathy-main-window.c:949 +#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972 msgid "Close" msgstr "Закрыць" -#: ../src/empathy-main-window.c:937 +#: ../src/empathy-roster-window.c:960 msgid "Reconnect" msgstr "Перазлучыцца" -#: ../src/empathy-main-window.c:943 +#: ../src/empathy-roster-window.c:966 msgid "Edit Account" msgstr "Змяніць настройкі конта" #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:1088 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1110 #, c-format msgid "Top up %s (%s)..." msgstr "Папоўніць %s (%s)..." -#: ../src/empathy-main-window.c:1135 +#: ../src/empathy-roster-window.c:1156 msgid "Top up account credit" msgstr "Папоўніць грашовы баланс конта" #. top up button -#: ../src/empathy-main-window.c:1206 +#: ../src/empathy-roster-window.c:1228 msgid "Top Up..." msgstr "Папоўніць..." -#: ../src/empathy-main-window.c:1949 +#: ../src/empathy-roster-window.c:1952 msgid "Contact" msgstr "Кантакт" -#: ../src/empathy-main-window.c:2324 +#: ../src/empathy-roster-window.c:2150 +msgid "You need to enable one of your accounts to see contacts here." +msgstr "Каб убачыць кантакты, трэба ўключыць які-небудзь конт." + +#. translators: argument is an account name +#: ../src/empathy-roster-window.c:2158 +#, c-format +msgid "You need to enable %s to see contacts here." +msgstr "Каб убачыць кантакты, трэба ўключыць %s." + +#: ../src/empathy-roster-window.c:2460 msgid "Contact List" msgstr "Спіс кантактаў" -#: ../src/empathy-main-window-menubar.ui.h:1 -msgid "Contacts on a _Map" -msgstr "_Кантакты на карце" +#: ../src/empathy-roster-window.ui.h:1 +msgid "Account settings" +msgstr "Настройкі конта" -#: ../src/empathy-main-window-menubar.ui.h:2 -msgid "Credit Balance" -msgstr "Грашовы баланс конта" +#: ../src/empathy-roster-window-menubar.ui.h:2 +#: ../src/empathy-status-icon.ui.h:2 +msgid "_New Conversation…" +msgstr "_Новая размова..." -#: ../src/empathy-main-window-menubar.ui.h:3 -msgid "Find in Contact _List" -msgstr "_Пошук у спісе кантактаў" +#: ../src/empathy-roster-window-menubar.ui.h:3 +#: ../src/empathy-status-icon.ui.h:3 +msgid "New _Call…" +msgstr "Новы _званок..." -#: ../src/empathy-main-window-menubar.ui.h:4 -msgid "Join _Favorites" -msgstr "_Далучыцца да ўпадабаных пакояў" +#: ../src/empathy-roster-window-menubar.ui.h:6 +msgid "_Search for Contacts…" +msgstr "_Пошук кантактаў..." -#: ../src/empathy-main-window-menubar.ui.h:5 -msgid "Manage Favorites" -msgstr "Настройка спіса ўпадабаных пакояў" +#: ../src/empathy-roster-window-menubar.ui.h:7 +msgid "_File Transfers" +msgstr "Перадача _файлаў" -#: ../src/empathy-main-window-menubar.ui.h:6 -msgid "N_ormal Size" -msgstr "_Звычайны памер акна" +#: ../src/empathy-roster-window-menubar.ui.h:8 +msgid "_Offline Contacts" +msgstr "Паказваць _кантакты па-за сеткай" -#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 -msgid "New _Call…" -msgstr "Новы _званок..." +#: ../src/empathy-roster-window-menubar.ui.h:9 +msgid "Show P_rotocols" +msgstr "_Паказваць інфармацыю аб пратаколе" -#: ../src/empathy-main-window-menubar.ui.h:8 -msgid "Normal Size With _Avatars" -msgstr "Звычайны памер акна з _аватарамі" +#: ../src/empathy-roster-window-menubar.ui.h:10 +msgid "Credit Balance" +msgstr "Грашовы баланс конта" + +#: ../src/empathy-roster-window-menubar.ui.h:11 +msgid "Contacts on a _Map" +msgstr "_Кантакты на карце" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:13 +msgid "_Accounts" +msgstr "_Конты" + +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Blocked Contacts" +msgstr "_Блакіраваныя кантакты" + +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "P_references" msgstr "_Настройкі" -#: ../src/empathy-main-window-menubar.ui.h:10 -msgid "Show P_rotocols" -msgstr "_Паказваць інфармацыю аб пратаколе" +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "Find in Contact _List" +msgstr "_Пошук у спісе кантактаў" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "Sort by _Name" msgstr "Сартаваць паводле і_мёнаў" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "Sort by _Status" msgstr "Сартаваць паводле с_тану" -#: ../src/empathy-main-window-menubar.ui.h:13 -msgid "_Accounts" -msgstr "_Конты" +#: ../src/empathy-roster-window-menubar.ui.h:20 +msgid "Normal Size With _Avatars" +msgstr "Звычайны памер акна з _аватарамі" -#: ../src/empathy-main-window-menubar.ui.h:15 -msgid "_Blocked Contacts" -msgstr "_Блакіраваныя кантакты" +#: ../src/empathy-roster-window-menubar.ui.h:21 +msgid "N_ormal Size" +msgstr "_Звычайны памер акна" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Compact Size" msgstr "_Кампактны памер акна" -#: ../src/empathy-main-window-menubar.ui.h:21 -msgid "_File Transfers" -msgstr "Перадача _файлаў" +#: ../src/empathy-roster-window-menubar.ui.h:23 +msgid "_Room" +msgstr "Пак_ой" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:24 msgid "_Join…" msgstr "_Далучыцца..." -#: ../src/empathy-main-window-menubar.ui.h:24 -#: ../src/empathy-status-icon.ui.h:3 -msgid "_New Conversation…" -msgstr "_Новая размова..." - -#: ../src/empathy-main-window-menubar.ui.h:25 -msgid "_Offline Contacts" -msgstr "Паказваць _кантакты па-за сеткай" - -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "_Асабістыя звесткі" - -#: ../src/empathy-main-window-menubar.ui.h:28 -msgid "_Room" -msgstr "Пак_ой" +#: ../src/empathy-roster-window-menubar.ui.h:25 +msgid "Join _Favorites" +msgstr "_Далучыцца да ўпадабаных пакояў" -#: ../src/empathy-main-window-menubar.ui.h:29 -msgid "_Search for Contacts…" -msgstr "_Пошук кантактаў..." +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "Manage Favorites" +msgstr "Настройка спіса ўпадабаных пакояў" #: ../src/empathy-new-chatroom-dialog.c:369 msgid "Chat Room" @@ -4194,7 +4207,7 @@ msgstr "Удзельнікі" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:623 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4207,22 +4220,22 @@ msgstr "" "Патрабуецца пароль: %s\n" "Удзельнікі: %s" -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "Не" -#: ../src/empathy-new-chatroom-dialog.c:654 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "Не ўдалося атрымаць спіс пакояў" -#: ../src/empathy-new-chatroom-dialog.c:664 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "Не ўдалося спыніць атрыманне спіса пакояў" -#: ../src/empathy-new-chatroom-dialog.ui.h:2 -msgid "Couldn't load room list" -msgstr "Не ўдалося загрузіць спіс пакояў" +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Join Room" +msgstr "Увайсці ў пакой" #: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "" @@ -4232,6 +4245,10 @@ msgstr "" "пакояў са спіса." #: ../src/empathy-new-chatroom-dialog.ui.h:4 +msgid "_Room:" +msgstr "Пак_ой:" + +#: ../src/empathy-new-chatroom-dialog.ui.h:5 msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" @@ -4239,184 +4256,200 @@ msgstr "" "Упішыце назву сервера, які змяшчае пакой, або пакіньце графу пустой, калі ён " "змяшчаецца на галоўным серверы конта" -#: ../src/empathy-new-chatroom-dialog.ui.h:5 -msgid "Join Room" -msgstr "Увайсці ў пакой" +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "Couldn't load room list" +msgstr "Не ўдалося загрузіць спіс пакояў" -#: ../src/empathy-new-chatroom-dialog.ui.h:6 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 msgid "Room List" msgstr "Спіс пакояў" -#: ../src/empathy-new-chatroom-dialog.ui.h:8 -msgid "_Room:" -msgstr "Пак_ой:" - -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Атрыманне паведамлення" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Пасылка паведамлення" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Новая размова" -#: ../src/empathy-preferences.c:172 -msgid "Contact goes online" +#: ../src/empathy-preferences.c:169 +msgid "Contact comes online" msgstr "Уваход кантакту ў сетку" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "Выхад кантакту з сеткі" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Злучэнне конта" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Адлучэнне конта" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Мова" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:726 msgid "Juliet" msgstr "Марыся" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:733 msgid "Romeo" msgstr "Грышка" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:739 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Ах, Грышка, нядобры! Як ты спалохаў мяне, гневаюся не жартам!.." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:743 msgid "Deny thy father and refuse thy name;" msgstr "Гневаешся? Няпраўда! А чаму ж ты на мяне так міленька пазіраеш?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:746 msgid "Or if thou wilt not, be but sworn my love" msgstr "" "Так, са злосці!.. Дзе ты забаўляўся? Гэта ж зараз прыйдуць бацькі, а мы так " "многа маем з табою перагаварыць." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:749 msgid "And I'll no longer be a Capulet." msgstr "" "Выбачай, − чуць золак, я з'ездзіў ужо да места, кінуўся ў ногі асэсару і " "прасіў, каб ён узяў нас пад сваю апеку." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:752 msgid "Shall I hear more, or shall I speak at this?" msgstr "Трэба было завезці які гасцінчык." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" msgstr "Удзельнік Марыся цяпер па-за сеткай" -#: ../src/empathy-preferences.c:1175 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "Настройкі" #: ../src/empathy-preferences.ui.h:1 +msgid "Show _smileys as images" +msgstr "Паказваць выявы _замест смайлікаў" + +#: ../src/empathy-preferences.ui.h:2 +msgid "Show contact _list in rooms" +msgstr "_Паказваць спіс кантактаў у пакоях" + +#: ../src/empathy-preferences.ui.h:3 msgid "Appearance" msgstr "Выгляд" -#: ../src/empathy-preferences.ui.h:3 -msgid "Behavior" -msgstr "Паводзіны" +#: ../src/empathy-preferences.ui.h:4 +msgid "Start chats in:" +msgstr "Адкрываць чат у:" #: ../src/empathy-preferences.ui.h:5 -msgid "Chat Th_eme:" -msgstr "_Матыў аздаблення чату:" +msgid "new ta_bs" +msgstr "новай _картцы" #: ../src/empathy-preferences.ui.h:6 -msgid "Disable notifications when _away or busy" -msgstr "Выключаць апавяшчэнні ў рэжыме _адсутнасці ці занятасці" +msgid "new _windows" +msgstr "новым _акне" #: ../src/empathy-preferences.ui.h:7 -msgid "Disable sounds when _away or busy" -msgstr "Выключыць гукавыя сігналы ў рэжыме _адсутнасці ці занятасці" - -#: ../src/empathy-preferences.ui.h:8 msgid "Display incoming events in the notification area" msgstr "Паказваць уваходныя паведамленні ў абшары апавяшчэнняў" +#: ../src/empathy-preferences.ui.h:8 +msgid "_Automatically connect on startup" +msgstr "_Аўтаматычна злучацца пры запуску" + #: ../src/empathy-preferences.ui.h:9 -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 "" -"Фільтрацыя рэха дапамагае палепшыць якасць гучання вашага голасу для " -"суразмоўцы, але можа выклікаць на некаторых камп'ютарах пэўныя праблемы. " -"Калі вы ці ваш суразмоўца падчас размовы чуеце дзіўны шум ці шчаўчкі, " -"паспрабуйце выключыць фільтрацыю рэха і паўтарыць званок." +msgid "Log conversations" +msgstr "Весці журнал размоў" #: ../src/empathy-preferences.ui.h:10 -msgid "Enable notifications when a contact comes online" -msgstr "Апавяшчаць, калі кантакт уваходзіць у сетку" +msgid "Behavior" +msgstr "Паводзіны" #: ../src/empathy-preferences.ui.h:11 -msgid "Enable notifications when a contact goes offline" -msgstr "Апавяшчаць, калі кантакт выходзіць з сеткі" +msgid "General" +msgstr "Агульнае" #: ../src/empathy-preferences.ui.h:12 -msgid "Enable notifications when the _chat is not focused" -msgstr "Апавяшчаць, калі акно _чату не мае фокусу" +msgid "_Enable bubble notifications" +msgstr "_Уключыць апавяшчэнні ў вынасках" #: ../src/empathy-preferences.ui.h:13 -msgid "Enable spell checking for languages:" -msgstr "Правяраць арфаграфію для наступных моў:" +msgid "Disable notifications when _away or busy" +msgstr "Выключаць апавяшчэнні ў рэжыме _адсутнасці ці занятасці" #: ../src/empathy-preferences.ui.h:14 -msgid "General" -msgstr "Агульнае" +msgid "Enable notifications when the _chat is not focused" +msgstr "Апавяшчаць, калі акно _чату не мае фокусу" #: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "Узровень уводу:" +msgid "Enable notifications when a contact comes online" +msgstr "Апавяшчаць, калі кантакт уваходзіць у сетку" #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "Гучнасць уводу:" +msgid "Enable notifications when a contact goes offline" +msgstr "Апавяшчаць, калі кантакт выходзіць з сеткі" + +#: ../src/empathy-preferences.ui.h:17 +msgid "Notifications" +msgstr "Апавяшчэнні" #: ../src/empathy-preferences.ui.h:18 -msgid "Location sources:" -msgstr "Крыніцы даных аб месцазнаходжанні:" +msgid "_Enable sound notifications" +msgstr "_Агучваць апавяшчэнні" #: ../src/empathy-preferences.ui.h:19 -msgid "Log conversations" -msgstr "Весці журнал размоў" +msgid "Disable sounds when _away or busy" +msgstr "Выключыць гукавыя сігналы ў рэжыме _адсутнасці ці занятасці" #: ../src/empathy-preferences.ui.h:20 -msgid "Notifications" -msgstr "Апавяшчэнні" - -#: ../src/empathy-preferences.ui.h:21 msgid "Play sound for events" msgstr "Агучваць падзеі" +#: ../src/empathy-preferences.ui.h:21 +msgid "Sounds" +msgstr "Гукі" + #: ../src/empathy-preferences.ui.h:22 -msgid "Privacy" -msgstr "Прыватнасць" +msgid "Use _echo cancellation to improve call quality" +msgstr "_Ужыць фільтрацыю рэха для паляпшэння якасці гучання званкоў" #: ../src/empathy-preferences.ui.h:23 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 "" +"Фільтрацыя рэха дапамагае палепшыць якасць гучання вашага голасу для " +"суразмоўцы, але можа выклікаць на некаторых камп'ютарах пэўныя праблемы. " +"Калі вы ці ваш суразмоўца падчас размовы чуеце дзіўны шум ці шчаўчкі, " +"паспрабуйце выключыць фільтрацыю рэха і паўтарыць званок." + +#: ../src/empathy-preferences.ui.h:26 +msgid "_Publish location to my contacts" +msgstr "_Паведамляць маім кантактам аб месцазнаходжанні" + +#: ../src/empathy-preferences.ui.h:27 +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." @@ -4425,134 +4458,114 @@ msgstr "" "будуць толькі даныя аб горадзе, штаце і краіне вашага месцазнаходжання. GPS-" "каардынаты будуць акруглены да 1 знака пасля коскі." -#: ../src/empathy-preferences.ui.h:24 -msgid "Show _smileys as images" -msgstr "Паказваць выявы _замест смайлікаў" - -#: ../src/empathy-preferences.ui.h:25 -msgid "Show contact _list in rooms" -msgstr "_Паказваць спіс кантактаў у пакоях" - -#: ../src/empathy-preferences.ui.h:26 -msgid "Sounds" -msgstr "Гукі" - -#: ../src/empathy-preferences.ui.h:27 -msgid "Spell Checking" -msgstr "Праверка арфаграфіі" - -#: ../src/empathy-preferences.ui.h:28 -msgid "" -"The list of languages reflects only the languages for which you have a " -"dictionary installed." -msgstr "Спіс моў паказвае толькі мовы, для якіх вы маеце ўсталяваныя слоўнікі." - +#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees. #: ../src/empathy-preferences.ui.h:29 -msgid "Themes" -msgstr "Матывы" +msgid "_Reduce location accuracy" +msgstr "Па_гаршаць дакладнасць месцазнаходжання" #: ../src/empathy-preferences.ui.h:30 -msgid "Use _echo cancellation to improve call quality" -msgstr "_Ужыць фільтрацыю рэха для паляпшэння якасці гучання званкоў" +msgid "Privacy" +msgstr "Прыватнасць" #: ../src/empathy-preferences.ui.h:31 -msgid "Variant:" -msgstr "Варыянт:" +msgid "_GPS" +msgstr "_GPS" #: ../src/empathy-preferences.ui.h:32 -msgid "_Automatically connect on startup" -msgstr "_Аўтаматычна злучацца пры запуску" - -#: ../src/empathy-preferences.ui.h:33 msgid "_Cellphone" msgstr "_Мабільны тэлефон" -#: ../src/empathy-preferences.ui.h:34 -msgid "_Enable bubble notifications" -msgstr "_Уключыць апавяшчэнні ў вынасках" +#: ../src/empathy-preferences.ui.h:33 +msgid "_Network (IP, Wi-Fi)" +msgstr "_Сетка (IP, Wi-Fi)" -#: ../src/empathy-preferences.ui.h:35 -msgid "_Enable sound notifications" -msgstr "_Агучваць апавяшчэнні" +#: ../src/empathy-preferences.ui.h:34 +msgid "Location sources:" +msgstr "Крыніцы даных аб месцазнаходжанні:" #: ../src/empathy-preferences.ui.h:36 -msgid "_GPS" -msgstr "_GPS" +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "Спіс моў паказвае толькі мовы, для якіх вы маеце ўсталяваныя слоўнікі." #: ../src/empathy-preferences.ui.h:37 -msgid "_Network (IP, Wi-Fi)" -msgstr "_Сетка (IP, Wi-Fi)" +msgid "Enable spell checking for languages:" +msgstr "Правяраць арфаграфію для наступных моў:" #: ../src/empathy-preferences.ui.h:38 -msgid "_Open new chats in separate windows" -msgstr "_Адкрываць новыя размовы ў асобных вокнах" +msgid "Spell Checking" +msgstr "Праверка арфаграфіі" #: ../src/empathy-preferences.ui.h:39 -msgid "_Publish location to my contacts" -msgstr "_Паведамляць маім кантактам аб месцазнаходжанні" +msgid "Chat Th_eme:" +msgstr "_Матыў аздаблення чату:" + +#: ../src/empathy-preferences.ui.h:40 +msgid "Variant:" +msgstr "Варыянт:" -#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees. #: ../src/empathy-preferences.ui.h:41 -msgid "_Reduce location accuracy" -msgstr "Па_гаршаць дакладнасць месцазнаходжання" +msgid "Themes" +msgstr "Матывы" -#: ../src/empathy-status-icon.ui.h:2 +#: ../src/empathy-status-icon.ui.h:4 msgid "Status" msgstr "Стан" -#: ../src/empathy-status-icon.ui.h:4 +#: ../src/empathy-status-icon.ui.h:5 msgid "_Quit" msgstr "_Выйсці" -#: ../src/empathy-streamed-media-window.ui.h:2 -msgid "Call the contact again" -msgstr "Зноў пазваніць кантакту" - #: ../src/empathy-streamed-media-window.ui.h:3 -msgid "Camera Off" -msgstr "Выключыць камеру" +msgid "Redial" +msgstr "Перазваніць" #: ../src/empathy-streamed-media-window.ui.h:4 -msgid "Camera On" -msgstr "Уключыць камеру" +msgid "V_ideo" +msgstr "_Відэа" + +#: ../src/empathy-streamed-media-window.ui.h:5 +msgid "Video Off" +msgstr "Выключыць відэа" #: ../src/empathy-streamed-media-window.ui.h:6 -msgid "Disable camera and stop sending video" -msgstr "Выключыць відэакамеру і спыніць перадачу відэасігналу" +msgid "Video Preview" +msgstr "Папярэдні відэаагляд" #: ../src/empathy-streamed-media-window.ui.h:7 -msgid "Enable camera and send video" -msgstr "Уключыць відэакамеру і пачаць перадачу відэасігналу" +msgid "Video On" +msgstr "Уключыць відэа" -#: ../src/empathy-streamed-media-window.ui.h:8 -msgid "Enable camera but don't send video" -msgstr "Уключыць відэакамеру, але не пачынаць перадачу відэасігналу" +#: ../src/empathy-streamed-media-window.ui.h:10 +msgid "Call the contact again" +msgstr "Зноў пазваніць кантакту" #: ../src/empathy-streamed-media-window.ui.h:13 -msgid "Preview" -msgstr "Папярэдні агляд" +msgid "Camera Off" +msgstr "Выключыць камеру" #: ../src/empathy-streamed-media-window.ui.h:14 -msgid "Redial" -msgstr "Перазваніць" +msgid "Disable camera and stop sending video" +msgstr "Выключыць відэакамеру і спыніць перадачу відэасігналу" -#: ../src/empathy-streamed-media-window.ui.h:19 -msgid "V_ideo" -msgstr "_Відэа" +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Preview" +msgstr "Папярэдні агляд" -#: ../src/empathy-streamed-media-window.ui.h:21 -msgid "Video Off" -msgstr "Выключыць відэа" +#: ../src/empathy-streamed-media-window.ui.h:16 +msgid "Enable camera but don't send video" +msgstr "Уключыць відэакамеру, але не пачынаць перадачу відэасігналу" -#: ../src/empathy-streamed-media-window.ui.h:22 -msgid "Video On" -msgstr "Уключыць відэа" +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Camera On" +msgstr "Уключыць камеру" -#: ../src/empathy-streamed-media-window.ui.h:23 -msgid "Video Preview" -msgstr "Папярэдні відэаагляд" +#: ../src/empathy-streamed-media-window.ui.h:18 +msgid "Enable camera and send video" +msgstr "Уключыць відэакамеру і пачаць перадачу відэасігналу" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Прагляд карты кантактаў" @@ -4619,103 +4632,103 @@ msgid "" msgstr "" "Выбраны кіраўнік злучэнняў не падтрымлівае пашырэнне аддаленай адладкі." -#: ../src/empathy-invite-participant-dialog.c:186 -#: ../src/empathy-invite-participant-dialog.c:214 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Запрасіць удзельніка" -#: ../src/empathy-invite-participant-dialog.c:187 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Выберыце кантакт, каб запрасіць яго да размовы:" -#: ../src/empathy-invite-participant-dialog.c:210 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Запрасіць" -#: ../src/empathy-accounts.c:184 +#: ../src/empathy-accounts.c:183 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "" "Не паказваць дыялогавых акенцаў; выканаць працу (напрыклад, імпартаванне) і " "выйсці" -#: ../src/empathy-accounts.c:188 +#: ../src/empathy-accounts.c:187 msgid "" "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "" "Не паказваць дыялогавых акенцаў, калі толькі не існуе іншых контаў акрамя " "\"Людзей паблізу\"" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:191 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "Спачатку вылучыць азначаны конт (напрыклад, \"gabble/jabber/" "foo_40example_2eorg0\")" -#: ../src/empathy-accounts.c:194 +#: ../src/empathy-accounts.c:193 msgid "" msgstr "<ідэнтыфікатар-конта>" -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:196 msgid "Show account assistant" msgstr "Паказаць памочніка контаў" -#: ../src/empathy-accounts.c:203 +#: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" msgstr "- Конты Empathy" -#: ../src/empathy-accounts.c:242 +#: ../src/empathy-accounts.c:238 msgid "Empathy Accounts" msgstr "Конты Empathy" -#: ../src/empathy-debugger.c:70 +#: ../src/empathy-debugger.c:69 msgid "Show a particular service" msgstr "Паказаць канкрэтную службу" -#: ../src/empathy-debugger.c:75 +#: ../src/empathy-debugger.c:74 msgid "- Empathy Debugger" msgstr "- Адладчык Empathy" -#: ../src/empathy-debugger.c:114 +#: ../src/empathy-debugger.c:113 msgid "Empathy Debugger" msgstr "Адладчык Empathy" -#: ../src/empathy-chat.c:107 +#: ../src/empathy-chat.c:109 msgid "- Empathy Chat Client" msgstr "- Кліент чату Empathy" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Адказаць" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1562 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1572 msgid "Reject" msgstr "Скінуць" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1563 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1573 msgid "Answer" msgstr "Адказаць" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Адказаць з відэа" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Адмовіцца" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Прыняць" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Падаць пароль" @@ -4727,28 +4740,45 @@ msgstr "" #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 +#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202 msgid "i" msgstr "і" -#: ../src/empathy-call-window.c:2879 +#: ../src/empathy-call-window.c:2936 msgid "On hold" msgstr "У чаканні" -#: ../src/empathy-call-window.c:2882 +#: ../src/empathy-call-window.c:2939 msgid "Mute" msgstr "Абязгучана" -#: ../src/empathy-call-window.c:2884 +#: ../src/empathy-call-window.c:2941 msgid "Duration" msgstr "Працягласць" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2887 +#: ../src/empathy-call-window.c:2944 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02d хв" +#: ../src/empathy-call-window.c:3214 +#, c-format +msgid "Your current balance is %s." +msgstr "Бягучы баланс: %s." + +#: ../src/empathy-call-window.c:3218 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "Вам не стае грошай, каб выканаць гэты званок." + +#: ../src/empathy-call-window.c:3220 +msgid "Top Up" +msgstr "Папоўніць" + #: ../libempathy-gtk/empathy-search-bar.c:243 msgid "_Match case" msgstr "_Улічваць рэгістр літар" + +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Стварэнне новага конта" diff --git a/po/cs.po b/po/cs.po index 1e5ef930..447c07b8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -12,21 +12,21 @@ # Jiri Eischmann , 2010. # Pavel Šefránek , 2011. # Petr Kovar , 2008, 2009, 2010, 2011. -# Marek Černocký , 2010, 2011. +# Marek Černocký , 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2011-10-28 07:54+0000\n" -"PO-Revision-Date: 2011-10-30 12:10+0100\n" +"POT-Creation-Date: 2012-01-09 11:44+0000\n" +"PO-Revision-Date: 2012-01-19 22:18+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.2\n" @@ -51,22 +51,14 @@ msgid "Always open a separate chat window for new chats." msgstr "Pro nové konverzace vždy otevírat oddělená okna." #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Hlasitost hovoru" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Hlasitost hovoru, v procentech." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "Camera device" msgstr "Zařízení kamery" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 msgid "Camera position" msgstr "Poloha kamery" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." @@ -74,62 +66,62 @@ msgstr "" "Znak, který má být přidán za přezdívku při použití doplňování přezdívek " "(tabulátorem) ve skupinové konverzaci." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 msgid "Chat window theme" msgstr "Motiv okna konverzace" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "Chat window theme variant" msgstr "Varianta motivu okna konverzace" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" "Čárkami oddělený seznam jazyků používaných ke kontrole pravopisu (např. „en, " "fr, nl“)." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Compact contact list" msgstr "Kompaktní seznam kontaktů" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 msgid "Connection managers should be used" msgstr "Měli byste používat správce připojení" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Contact list sort criterion" msgstr "Kritérium pro řazení seznamu kontaktů" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 msgid "D-Bus object path of the last account selected to join a room." msgstr "" "Cesta objektu D-Bus pro účet, který byl vybrán jako poslední pro vstup do " "místnosti." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "" "Výchozí zařízení kamery, které se má používat pro videohovory, např. /dev/" "video0." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Default directory to select an avatar image from" msgstr "Výchozí adresář pro výběr obrázku avataru" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Disable popup notifications when away" msgstr "Zakázat vyskakující upozornění v případě mé nepřítomnosti" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Disable sounds when away" msgstr "Zakázat zvuky v případě mé nepřítomnosti" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Display incoming events in the status area" msgstr "Zobrazovat příchozí události ve stavové oblasti" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "" "Display incoming events in the status area. If false, present them to the " "user immediately." @@ -137,244 +129,244 @@ msgstr "" "Zobrazovat příchozí události ve stavové oblasti. Když je něco špatně, tak se " "to uživatel ihned dozví." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Echo cancellation support" msgstr "Podpora potlačení ozvěny" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy can publish the user's location" msgstr "Empathy může zveřejnit polohu uživatele" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy se může pokusit určit vaši polohu pomocí GPS" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy can use the cellular network to guess the location" msgstr "Empathy se může pokusit určit vaši polohu pomocí mobilní sítě" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy can use the network to guess the location" msgstr "Empathy se může pokusit určit vaši polohu pomocí sítě" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Empathy default download folder" msgstr "Výchozí adresář pro stahování aplikace Empathy" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Empathy should auto-away when idle" msgstr "Empathy by měl při nečinnosti automaticky nastavit na nepřítomen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Empathy should auto-connect on startup" msgstr "Automaticky připojovat Empathy po spuštění" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Empathy should reduce the location's accuracy" msgstr "Přesnost plohy by měla být omezena" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "Používat avatar kontaktu jako ikonku okna konverzace" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Enable WebKit Developer Tools" msgstr "Povolit vývojové nástroje pro WebKit" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Enable popup notifications for new messages" msgstr "Povolit vyskakující upozornění na nové zprávy" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Enable spell checker" msgstr "Povolit kontrolu pravopisu" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Hide main window" msgstr "Skrýt hlavní okno" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Hide the main window." msgstr "Skrýt hlavní okno." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Last account selected in Join Room dialog" msgstr "Poslední účet vybraný v dialogovém okně pro vstup do místnosti" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Nick completed character" msgstr "Znak doplňování přezdívek" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Open new chats in separate windows" msgstr "Otevírat nové konverzace v oddělených oknech" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Path of the Adium theme to use" msgstr "Cesta k požadovanému motivu Adium" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "" "Cesta k motivu Adium, který bude v případě, že Adium používáte, vybrán." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound for incoming messages" msgstr "Přehrávat zvuk pro příchozí zprávy" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for new conversations" msgstr "Přehrát zvuk při nové konverzaci" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for outgoing messages" msgstr "Přehrávat zvuk pro odchozí zprávy" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Play a sound when a contact logs in" msgstr "Přehrávat zvuk, když se kontakt přihlásí" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound when a contact logs out" msgstr "Přehrát zvuk, pokud se kontakt odhlásí" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when we log in" msgstr "Přehrávat zvuk, když se přihlásím" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound when we log out" msgstr "Přehrávat zvuk, když se odhlásím" # is chat different than conversation? -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Pop up notifications if the chat isn't focused" msgstr "Vyskakující upozornění, pokud není vybrána konverzace" # is chat different than conversation? -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Pop up notifications when a contact logs in" msgstr "Vyskakující upozornění při přihlášení kontaktu" # is chat different than conversation? -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Pop up notifications when a contact logs out" msgstr "Vyskakující upozornění při odhlášení kontaktu" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Position the camera preview should be during a call." msgstr "Poloha náhledové kamery, jak by měla být během hovoru." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "Show Balance in contact list" msgstr "Zobrazovat zůstatek kreditu v seznamu kontaktů" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Show avatars" msgstr "Zobrazovat avatary" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Show contact list in rooms" msgstr "Zobrazit seznam kontaktů v diskuzních místnostech" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Show hint about closing the main window" msgstr "Zobrazovat nápovědu, pokud se chystáte zavřít hlavní okno" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Show offline contacts" msgstr "Zobrazovat odpojené kontakty" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Show protocols" msgstr "Zobrazovat protokoly" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Spell checking languages" msgstr "Jazyky s kontrolovaným pravopisem" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "The default folder to save file transfers in." msgstr "Výchozí adresář pro ukládání přenášených souborů." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "The last directory that an avatar image was chosen from." msgstr "Poslední adresář, ze kterého byl vybrán obrázek avataru." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "The position for the chat window side pane" msgstr "Poloha pro postranní panel okna s konverzací" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "The stored position (in pixels) of the chat window side pane." msgstr "Uložená poloha (v pixelech) postranního panelu okna s konverzací" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "The theme that is used to display the conversation in chat windows." msgstr "Motiv, který je používán pro zobrazení konverzací v oknech konverzací." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "Motiv, který je používán pro zobrazení konverzací v oknech konverzací." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "Používat grafické smajlíky" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Use notification sounds" msgstr "Používat zvuková upozornění" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use theme for chat rooms" msgstr "Používat motiv pro diskuzní místnosti" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "Jestli může Empathy zveřejňovat kontaktům vaši polohu." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Jestli může Empathy používat GPS k určení polohy." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "Jestli může Empathy použít mobilní síť k určení polohy." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether Empathy can use the network to guess the location." msgstr "Zda může Empathy použít sít k určení polohy." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "Jestli se má Empathy po spuštění automaticky připojovat k vašim účtům." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "" "Whether Empathy should go into away mode automatically if the user is idle." msgstr "" "Zda by měla aplikace Empathy při nečinnosti uživatele přepínat na stav " "nepřítomen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" "Jestli má Empathy omezit přesnost polohy pro lepší ochranu vašeho soukromí." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "Zda má Empathy používat avatar kontaktu jako ikonu okna s konverzací." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" "Zda mají být povoleny vývojové nástroje pro Webkit, například Web Inspektor." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." @@ -382,69 +374,69 @@ msgstr "" "Jestli má být používán správce připojení k automatickému připojování a " "odpojování." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "" "Whether to check words typed against the languages you want to check with." msgstr "Jestli u zadávaných slov kontrolovat pravopis." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Whether to convert smileys into graphical images in conversations." msgstr "Jestli v konverzacích převádět smajlíky na obrázky." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "Zda zapnout filtr Pulseaudio pro potlačení ozvěny." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "" "Jestli přehrávat zvuky jako upozornění na přihlašování kontaktu k síti." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "" "Jestli přehrávat zvuky jako upozornění na odhlašování kontaktu od sítě." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Whether to play a sound to notify of events." msgstr "Jestli přehrávat zvuky jako upozornění na události." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to play a sound to notify of incoming messages." msgstr "Jestli přehrávat zvuk jako upozornění na příchozí zprávy." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Whether to play a sound to notify of new conversations." msgstr "Jestli přehrávat zvuk jako upozornění na novou konverzaci." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to play a sound to notify of outgoing messages." msgstr "Jestli přehrávat zvuk jako upozornění na odchozí zprávy." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Whether to play a sound when logging into a network." msgstr "Jestli přehrávat zvuk, když se přihlašuji do sítě." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to play a sound when logging out of a network." msgstr "Zda přehrávat zvuk, když se odhlašuji ze sítě." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to play sound notifications when away or busy." msgstr "" "Zda přehrávat zvuková upozornění v případě mé nepřítomnosti nebo " "zaneprázdněnosti." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to show a popup notification when a contact goes offline." msgstr "Jestli zobrazovat vyskakující upozornění při odpojení uživatele." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Whether to show a popup notification when a contact goes online." msgstr "Jestli zobrazovat vyskakující upozornění při přihlášení kontaktu." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." @@ -452,43 +444,43 @@ msgstr "" "Zdali zobrazovat vyskakující upozornění na novou zprávu, i když konverzace " "byla již otevřena, ale není vybrána." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Whether to show a popup notification when receiving a new message." msgstr "Zdali zobrazovat vyskakující upozornění při přijetí nové zprávy." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Whether to show account balances in the contact list." msgstr "Jestli zobrazovat zůstatek kreditu v seznamu kontaktů." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "" "Zda zobrazovat avatary kontaktů v seznamu kontaktů a oknech s konverzacemi." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Whether to show contacts that are offline in the contact list." msgstr "Zda v seznamu kontaktů zobrazovat odpojené kontakty." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Whether to show popup notifications when away or busy." msgstr "" "Zda zobrazovat vyskakující upozornění v případě mé nepřítomnosti nebo " "zaneprázdněnosti." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to show protocols for contacts in the contact list." msgstr "Jestli zobrazovat protokoly kontaktů v seznamu kontaktů." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Whether to show the contact list in chat rooms." msgstr "Jestli zobrazovat seznam kontaktů v diskuzních místnostech." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "Whether to show the contact list in compact mode." msgstr "Jestli zobrazovat seznam kontaktů v kompaktním režimu." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." @@ -496,11 +488,11 @@ msgstr "" "Zda zobrazovat varování při uzavírání hlavního okna prostřednictvím tlačítka " "„x“ (křížek) v záhlaví okna." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether to use the theme for chat rooms." msgstr "Zda používat motiv pro diskuzní místnosti." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's name with the value \"name\". A value of \"state\" will sort " @@ -516,23 +508,51 @@ msgstr "Spravovat účty IM a VoIP" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2307 +#: ../src/empathy-accounts-dialog.c:2406 msgid "Messaging and VoIP Accounts" msgstr "Účty IM a VoIP" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Nebyl udán žádný důvod" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Byla vyžádána změna stavu" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Zrušili jste přenos souboru" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Protistrana zrušila přenos souboru" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Chyba při pokusu o odeslání souboru" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Protistrana není schopna přenosu souborů" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311 +msgid "Unknown reason" +msgstr "Neznámý důvod" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Přenos souboru byl dokončen, ale soubor byl poškozen" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Přenos souborů není podporován vzdálenou stranou" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Vybraný soubor není běžným souborem" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Vybraný soubor je prázdný" @@ -552,171 +572,139 @@ msgstr "Hovor s kontaktem %s" msgid "Call from %s" msgstr "Příchozí hovor od kontaktu %s" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "Typ soketu není podporován" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "Nebyl udán žádný důvod" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "Byla vyžádána změna stavu" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "Zrušili jste přenos souboru" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "Protistrana zrušila přenos souboru" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "Chyba při pokusu o odeslání souboru" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "Protistrana není schopna přenosu souborů" - -#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Neznámý důvod" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:231 msgid "Available" msgstr "Přítomen" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:233 msgid "Busy" msgstr "Zaneprázdněn" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:236 msgid "Away" msgstr "Nepřítomen" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:238 msgid "Invisible" msgstr "Neviditelný" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:240 msgid "Offline" msgstr "Odpojen" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:243 msgctxt "presence" msgid "Unknown" msgstr "Neznámo" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:283 msgid "No reason specified" msgstr "Neudán žádný důvod" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341 msgid "Status is set to offline" msgstr "Stav nastaven na „Odhlášen“" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Chyba sítě" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 msgid "Authentication failed" -msgstr "Ověření selhalo" +msgstr "Autentizace selhala" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Encryption error" msgstr "Chyba šifrování" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:293 msgid "Name in use" msgstr "Jméno používáno" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327 msgid "Certificate not provided" msgstr "Certifikát nebyl poskytnut" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate untrusted" msgstr "Nedůvěryhodný certifikát" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate expired" msgstr "Platnost certifikátu vypršela" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate not activated" msgstr "Certifikát není aktivován" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate hostname mismatch" msgstr "Certifikát názvu počítače nesouhlasí" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate fingerprint mismatch" msgstr "Certifikát otisku prstu nesouhlasí" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate self-signed" msgstr "Certifikát je podepsán sám sebou" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:309 msgid "Certificate error" msgstr "Chyba certifikátu" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:343 msgid "Encryption is not available" msgstr "Šifrování není dostupné" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:345 msgid "Certificate is invalid" msgstr "Certifikát je neplatný" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:347 msgid "Connection has been refused" msgstr "Spojení bylo odmítnuto" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:349 msgid "Connection can't be established" msgstr "Spojení nemohlo být navázáno" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:351 msgid "Connection has been lost" msgstr "Spojení bylo ztraceno" -#: ../libempathy/empathy-utils.c:354 +#: ../libempathy/empathy-utils.c:353 msgid "This resource is already connected to the server" msgstr "Zdroj je již připojen k serveru" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:355 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "Spojení bylo nahrazeno novým spojením, které používá stejný zdroj" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:358 msgid "The account already exists on the server" msgstr "Takový účet již na serveru existuje" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:360 msgid "Server is currently too busy to handle the connection" msgstr "Server je právě příliš zaneprázdněn na to, aby obsloužil spojení" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:362 msgid "Certificate has been revoked" msgstr "Certifikát byl odvolán" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:364 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "Certifikát používá nepříliš bezpečný šifrovací algoritmus nebo je z " "kryptografického hlediska slabý" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:367 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -724,23 +712,23 @@ msgstr "" "Délka certifikátu serveru nebo délka zřetězených certifikátů serveru " "přesáhla omezení dané kryptografickou knihovnou" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:371 msgid "Your software is too old" msgstr "Váš software je příliš zastaralý" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:530 msgid "People Nearby" msgstr "Lidé v okolí" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:535 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:564 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:565 msgid "Facebook Chat" msgstr "Facebook Chat" @@ -796,102 +784,74 @@ msgstr[2] "před %d měsíci" msgid "in the future" msgstr "v budoucnosti" -#: ../libempathy-gtk/empathy-account-chooser.c:659 +#: ../libempathy-gtk/empathy-account-chooser.c:688 msgid "All accounts" msgstr "Všechny účty" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Účet" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Heslo" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Server" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Port" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:763 +#: ../libempathy-gtk/empathy-account-widget.c:815 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -msgid "My Web Accounts" -msgstr "My Web Accounts" - -#: ../libempathy-gtk/empathy-account-widget.c:1209 -#, c-format -msgid "The account %s is edited via %s." -msgstr "Účet %s je upravován přes %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1215 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Účet %s nelze upravovat v aplikaci Empathy." - -#: ../libempathy-gtk/empathy-account-widget.c:1234 -msgid "Launch My Web Accounts" -msgstr "Spustit My Web Accounts" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1242 -#, c-format -msgid "Edit %s" -msgstr "Upravit %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1592 +#: ../libempathy-gtk/empathy-account-widget.c:1396 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "Uživatelské jméno:" -#: ../libempathy-gtk/empathy-account-widget.c:1910 +#: ../libempathy-gtk/empathy-account-widget.c:1708 msgid "A_pply" msgstr "_Použít" -#: ../libempathy-gtk/empathy-account-widget.c:1940 +#: ../libempathy-gtk/empathy-account-widget.c:1737 msgid "L_og in" msgstr "Přip_ojit" -#: ../libempathy-gtk/empathy-account-widget.c:2014 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "Takový účet již existuje" -#: ../libempathy-gtk/empathy-account-widget.c:2017 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "Vytvořit nový účet na serveru" -#: ../libempathy-gtk/empathy-account-widget.c:2209 -msgid "Ca_ncel" -msgstr "_Zrušit" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2487 +#: ../libempathy-gtk/empathy-account-widget.c:2239 #, 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:2513 +#: ../libempathy-gtk/empathy-account-widget.c:2265 #, c-format msgid "%s Account" msgstr "Účet služby %s" -#: ../libempathy-gtk/empathy-account-widget.c:2517 +#: ../libempathy-gtk/empathy-account-widget.c:2269 msgid "New account" msgstr "Nový účet" @@ -939,7 +899,7 @@ msgstr "Zapamatovat heslo" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 msgid "Remember password" msgstr "Zapamatovat heslo" @@ -1265,7 +1225,7 @@ msgid "STUN Server:" msgstr "Server STUN:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 msgid "Server:" msgstr "Server:" @@ -1371,40 +1331,40 @@ msgstr "Tento protokol nepodporuje tísňová volání" msgid "You don't have enough credit in order to place this call" msgstr "Nemáte dostatečný kredit k provedení tohoto volání" -#: ../libempathy-gtk/empathy-chat.c:706 +#: ../libempathy-gtk/empathy-chat.c:705 msgid "Failed to open private chat" msgstr "Nepovedlo se otevřít soukromou konverzaci" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:763 msgid "Topic not supported on this conversation" msgstr "Tato konverzace toto téma nepodporuje" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:769 msgid "You are not allowed to change the topic" msgstr "Nemáte oprávnění potřebná pro změnu tématu" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:970 #, c-format msgid "“%s” is not a valid contact ID" msgstr "„%s“ není platné ID kontaktu" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1065 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: vymazat všechny zprávy z této konverzace" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1068 msgid "/topic : set the topic of the current conversation" msgstr "/topic : nastavit téma aktuální konverzace" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/join : join a new chat room" msgstr "/join : vstoupit do nové místnosti" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1074 msgid "/j : join a new chat room" msgstr "/j : vstoupit do nové místnosti" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "" "/part [] []: leave the chat room, by default the " "current one" @@ -1412,23 +1372,23 @@ msgstr "" "/part [] []: opustit místnost, bez udání tu právě " "aktuální" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1082 msgid "/query []: open a private chat" msgstr "/query []: otevřít novou soukromou konverzaci" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/msg : open a private chat" msgstr "/msg : otevřít novou soukromou konverzaci" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/nick : change your nickname on the current server" msgstr "/nick : změnit svoji přezdívku na aktuálním serveru" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/me : send an ACTION message to the current conversation" msgstr "/me : zaslat zprávu AKCE do aktuální konverzace" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1438,11 +1398,11 @@ msgstr "" "posílání zpráv začínajících s „/“. Například: „/say /join je použito pro " "připojení do místnosti“" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "/whois : display information about a contact" msgstr "/whois : zobrazit informace o kontaktu" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1450,120 +1410,120 @@ msgstr "" "/help []: vypsat seznam podporovaných příkazů. Pokud je zadán " ", vypsat jeho použití." -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1121 #, c-format msgid "Usage: %s" msgstr "Použití: %s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1166 msgid "Unknown command" msgstr "Neznámý příkaz" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1292 msgid "Unknown command; see /help for the available commands" msgstr "Neznámý příkaz, pro výpis dostupných příkazů použijte /help" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1456 msgid "insufficient balance to send message" msgstr "Nemáte dostatečný kredit k poslání zprávy" -#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474 +#: ../libempathy-gtk/empathy-chat.c:1537 #, c-format msgid "Error sending message '%s': %s" msgstr "Chyba při odesílání zprávy „%s“: %s" -#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479 +#: ../libempathy-gtk/empathy-chat.c:1541 #, c-format msgid "Error sending message: %s" msgstr "Chyba při odesílání zprávy: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1469 +#: ../libempathy-gtk/empathy-chat.c:1468 #, c-format msgid "insufficient balance to send message. Top up." msgstr "nedostatečný zůstatek k zaslání zprávy. Dobít.." -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1508 msgid "not capable" msgstr "není k dispozici" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1515 msgid "offline" msgstr "odpojen" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1518 msgid "invalid contact" msgstr "neplatný kontakt" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1521 msgid "permission denied" msgstr "oprávnění odepřeno" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1524 msgid "too long message" msgstr "příliš dlouhá zpráva" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1527 msgid "not implemented" msgstr "neimplementováno" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1531 msgid "unknown" msgstr "neznámý" -#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761 msgid "Topic:" msgstr "Téma:" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1610 #, c-format msgid "Topic set to: %s" msgstr "Nastavit téma na: %s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "No topic defined" msgstr "Nestanoveno žádné téma" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2125 msgid "(No Suggestions)" msgstr "(Žádné návrhy)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2193 #, c-format msgid "Add '%s' to Dictionary" msgstr "Přidat „%s“ do slovníku" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2230 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Přidat „%s“ do slovníku %s" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2300 msgid "Insert Smiley" msgstr "Vložit smajlíka" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 -#: ../libempathy-gtk/empathy-ui-utils.c:1843 +#: ../libempathy-gtk/empathy-chat.c:2318 +#: ../libempathy-gtk/empathy-ui-utils.c:1868 msgid "_Send" msgstr "_Odeslat" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2373 +#: ../libempathy-gtk/empathy-chat.c:2375 msgid "_Spelling Suggestions" msgstr "Návrhy pravopi_sných oprav" -#: ../libempathy-gtk/empathy-chat.c:2462 +#: ../libempathy-gtk/empathy-chat.c:2464 msgid "Failed to retrieve recent logs" msgstr "Nepovedlo se získat záznam nedávné historie" -#: ../libempathy-gtk/empathy-chat.c:2599 +#: ../libempathy-gtk/empathy-chat.c:2601 #, c-format msgid "%s has disconnected" msgstr "%s se odpojil" @@ -1571,12 +1531,12 @@ msgstr "%s se odpojil" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2606 +#: ../libempathy-gtk/empathy-chat.c:2608 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s byl vyhozen uživatelem %2$s" -#: ../libempathy-gtk/empathy-chat.c:2609 +#: ../libempathy-gtk/empathy-chat.c:2611 #, c-format msgid "%s was kicked" msgstr "%s byl vyhozen" @@ -1584,17 +1544,17 @@ msgstr "%s byl vyhozen" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2617 +#: ../libempathy-gtk/empathy-chat.c:2619 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s byl zakázán uživatelem %2$s" -#: ../libempathy-gtk/empathy-chat.c:2620 +#: ../libempathy-gtk/empathy-chat.c:2622 #, c-format msgid "%s was banned" msgstr "%s byl zakázán" -#: ../libempathy-gtk/empathy-chat.c:2624 +#: ../libempathy-gtk/empathy-chat.c:2626 #, c-format msgid "%s has left the room" msgstr "%s opustil místnost" @@ -1604,17 +1564,17 @@ msgstr "%s opustil místnost" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2633 +#: ../libempathy-gtk/empathy-chat.c:2635 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2658 +#: ../libempathy-gtk/empathy-chat.c:2660 #, c-format msgid "%s has joined the room" msgstr "%s se připojil do místnosti" -#: ../libempathy-gtk/empathy-chat.c:2683 +#: ../libempathy-gtk/empathy-chat.c:2685 #, c-format msgid "%s is now known as %s" msgstr "%s je teď znám jako %s" @@ -1622,87 +1582,88 @@ msgstr "%s je teď znám jako %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2836 -#: ../src/empathy-streamed-media-window.c:1896 -#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1536 -#: ../src/empathy-call-window.c:1586 ../src/empathy-call-window.c:2632 +#: ../libempathy-gtk/empathy-chat.c:2846 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "Odpojen" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3482 +#: ../libempathy-gtk/empathy-chat.c:3492 msgid "Would you like to store this password?" msgstr "Přejete si uchovat toto heslo?" -#: ../libempathy-gtk/empathy-chat.c:3488 +#: ../libempathy-gtk/empathy-chat.c:3498 msgid "Remember" msgstr "Zapamatovat" -#: ../libempathy-gtk/empathy-chat.c:3498 +#: ../libempathy-gtk/empathy-chat.c:3508 msgid "Not now" msgstr "Nyní ne" -#: ../libempathy-gtk/empathy-chat.c:3542 +#: ../libempathy-gtk/empathy-chat.c:3552 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Opakovat" -#: ../libempathy-gtk/empathy-chat.c:3546 +#: ../libempathy-gtk/empathy-chat.c:3556 msgid "Wrong password; please try again:" msgstr "Špatné heslo, zkuste to prosím znovu:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3676 +#: ../libempathy-gtk/empathy-chat.c:3686 msgid "This room is protected by a password:" msgstr "Tato místnost je chráněna heslem:" -#: ../libempathy-gtk/empathy-chat.c:3703 +#: ../libempathy-gtk/empathy-chat.c:3713 msgid "Join" msgstr "Připojit" -#: ../libempathy-gtk/empathy-chat.c:3891 ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Připojen" -#: ../libempathy-gtk/empathy-chat.c:3946 +#: ../libempathy-gtk/empathy-chat.c:3956 msgid "Conversation" msgstr "Konverzace" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3951 +#: ../libempathy-gtk/empathy-chat.c:3961 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Neznámý nebo neplatný identifikátor" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Blokování kontaktů není dočasně k dispozici" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Blokování kontaktů není k dispozici" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Oprávnění odepřeno" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Nelze blokovat kontakt" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Upravit blokované kontakty" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1441 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" @@ -1720,417 +1681,311 @@ msgid "Remove" msgstr "Odstranit" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "_Kopírovat adresu odkazu" -#. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 -#: ../libempathy-gtk/empathy-webkit-utils.c:284 -msgid "_Open Link" -msgstr "_Otevřít odkaz" - -#. Translators: timestamp displayed between conversations in -#. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 -msgid "%A %B %d %Y" -msgstr "%A, %e. %B %Y" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Upravit informace o kontaktu" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 -msgid "Personal Information" -msgstr "Osobní informace" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 -msgid "New Contact" -msgstr "Nový kontakt" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 -#, c-format -msgid "Block %s?" -msgstr "Blokovat %s?" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 -#, c-format -msgid "Are you sure you want to block '%s' from contacting you again?" -msgstr "Opravdu chcete blokovat „%s“, aby vás znovu nekontaktoval?" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 -msgid "_Block" -msgstr "_Blokovat" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 -msgid "_Report this contact as abusive" -msgid_plural "_Report these contacts as abusive" -msgstr[0] "Na_hlásit tento kontakt jako obtěžující" -msgstr[1] "Na_hlásit tyto kontakty jako obtěžující" -msgstr[2] "Na_hlásit tyto kontakty jako obtěžující" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "_Rozhodnout se později" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 -msgid "Subscription Request" -msgstr "Požadavek na přihlášení" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 -msgid "_Block User" -msgstr "_Blokovat uživatele" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1935 -#: ../libempathy-gtk/empathy-individual-view.c:2375 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Opravdu chcete odstranit skupinu „%s“?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1937 -#: ../libempathy-gtk/empathy-individual-view.c:2378 -msgid "Removing group" -msgstr "Skupina se odstraňuje" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-contact-list-view.c:2063 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 -msgid "_Remove" -msgstr "_Odstranit" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2016 -#: ../libempathy-gtk/empathy-individual-view.c:2500 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Opravdu chcete odstranit kontakt „%s“?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2018 -#: ../libempathy-gtk/empathy-individual-view.c:2521 -msgid "Removing contact" -msgstr "Kontakt se odstraňuje" - -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "_Přidat kontakt…" - -#: ../libempathy-gtk/empathy-contact-menu.c:292 -msgid "_Block Contact" -msgstr "_Blokovat kontakt" +#. Open Link menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:329 +#: ../libempathy-gtk/empathy-webkit-utils.c:284 +msgid "_Open Link" +msgstr "_Otevřít odkaz" -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:321 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../libempathy-gtk/empathy-new-message-dialog.c:320 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "_Diskuze" +#. Translators: timestamp displayed between conversations in +#. * chat windows (strftime format string) +#: ../libempathy-gtk/empathy-chat-text-view.c:417 +msgid "%A %B %d %Y" +msgstr "%A, %e. %B %Y" -#: ../libempathy-gtk/empathy-contact-menu.c:353 -#: ../libempathy-gtk/empathy-individual-menu.c:850 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Audiohovor" +#: ../libempathy-gtk/empathy-contact-dialogs.c:278 +msgid "Personal Information" +msgstr "Osobní informace" -#: ../libempathy-gtk/empathy-contact-menu.c:386 -#: ../libempathy-gtk/empathy-individual-menu.c:895 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Videohovor" +#: ../libempathy-gtk/empathy-contact-dialogs.c:379 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +msgid "New Contact" +msgstr "Nový kontakt" -#: ../libempathy-gtk/empathy-contact-menu.c:432 -#: ../libempathy-gtk/empathy-individual-menu.c:948 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "_Předchozí konverzace" +#: ../libempathy-gtk/empathy-contact-dialogs.c:448 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 +#, c-format +msgid "Block %s?" +msgstr "Blokovat %s?" -#: ../libempathy-gtk/empathy-contact-menu.c:454 -#: ../libempathy-gtk/empathy-individual-menu.c:989 -msgid "Send File" -msgstr "Odeslat soubor" +#: ../libempathy-gtk/empathy-contact-dialogs.c:453 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#, c-format +msgid "Are you sure you want to block '%s' from contacting you again?" +msgstr "Opravdu chcete blokovat „%s“, aby vás znovu nekontaktoval?" -#: ../libempathy-gtk/empathy-contact-menu.c:477 -#: ../libempathy-gtk/empathy-individual-menu.c:1031 -msgid "Share My Desktop" -msgstr "Sdílet moji plochu" +#: ../libempathy-gtk/empathy-contact-dialogs.c:458 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +msgid "_Block" +msgstr "_Blokovat" -#: ../libempathy-gtk/empathy-contact-menu.c:506 -#: ../libempathy-gtk/empathy-individual-menu.c:1094 -msgid "Infor_mation" -msgstr "Infor_mace" +#: ../libempathy-gtk/empathy-contact-dialogs.c:476 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +msgid "_Report this contact as abusive" +msgid_plural "_Report these contacts as abusive" +msgstr[0] "Na_hlásit tento kontakt jako obtěžující" +msgstr[1] "Na_hlásit tyto kontakty jako obtěžující" +msgstr[2] "Na_hlásit tyto kontakty jako obtěžující" -#: ../libempathy-gtk/empathy-contact-menu.c:552 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "_Upravit" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 +msgid "Decide _Later" +msgstr "_Rozhodnout se později" -#: ../libempathy-gtk/empathy-contact-menu.c:606 -#: ../libempathy-gtk/empathy-individual-menu.c:1285 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Pozvání do místnosti" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 +msgid "Subscription Request" +msgstr "Požadavek na přihlášení" -#: ../libempathy-gtk/empathy-contact-menu.c:637 -#: ../libempathy-gtk/empathy-individual-menu.c:1331 -msgid "_Invite to Chat Room" -msgstr "Pozvat do diskuzní místnost_i" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "_Block User" +msgstr "_Blokovat uživatele" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Hledat kontakty" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Hledat: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "Přid_at kontakt" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Nenalezen žádný kontakt" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "Vaše zpráva, kterou se představujete:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "Dejte mi prosím vědět, až budete připojen. Děkuji!" -#: ../libempathy-gtk/empathy-contact-widget.c:502 +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Kanály:" -#: ../libempathy-gtk/empathy-contact-widget.c:797 -#: ../libempathy-gtk/empathy-individual-widget.c:421 +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "Kód země ISO:" -#: ../libempathy-gtk/empathy-contact-widget.c:799 -#: ../libempathy-gtk/empathy-individual-widget.c:423 +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Země:" -#: ../libempathy-gtk/empathy-contact-widget.c:801 -#: ../libempathy-gtk/empathy-individual-widget.c:425 +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Kraj:" -#: ../libempathy-gtk/empathy-contact-widget.c:803 -#: ../libempathy-gtk/empathy-individual-widget.c:427 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Město:" -#: ../libempathy-gtk/empathy-contact-widget.c:805 -#: ../libempathy-gtk/empathy-individual-widget.c:429 +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Oblast:" -#: ../libempathy-gtk/empathy-contact-widget.c:807 -#: ../libempathy-gtk/empathy-individual-widget.c:431 +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "PSČ:" -#: ../libempathy-gtk/empathy-contact-widget.c:809 -#: ../libempathy-gtk/empathy-individual-widget.c:433 +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Ulice:" -#: ../libempathy-gtk/empathy-contact-widget.c:811 -#: ../libempathy-gtk/empathy-individual-widget.c:435 +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Budova:" -#: ../libempathy-gtk/empathy-contact-widget.c:813 -#: ../libempathy-gtk/empathy-individual-widget.c:437 +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Podlaží:" -#: ../libempathy-gtk/empathy-contact-widget.c:815 -#: ../libempathy-gtk/empathy-individual-widget.c:439 +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Místnost:" -#: ../libempathy-gtk/empathy-contact-widget.c:817 -#: ../libempathy-gtk/empathy-individual-widget.c:441 +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Text:" -#: ../libempathy-gtk/empathy-contact-widget.c:819 -#: ../libempathy-gtk/empathy-individual-widget.c:443 +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Popis:" -#: ../libempathy-gtk/empathy-contact-widget.c:821 -#: ../libempathy-gtk/empathy-individual-widget.c:445 +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:823 -#: ../libempathy-gtk/empathy-individual-widget.c:447 +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Úroveň přesnosti:" -#: ../libempathy-gtk/empathy-contact-widget.c:825 -#: ../libempathy-gtk/empathy-individual-widget.c:449 +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Chyba:" -#: ../libempathy-gtk/empathy-contact-widget.c:827 -#: ../libempathy-gtk/empathy-individual-widget.c:451 +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Vertikální chyba (v metrech):" -#: ../libempathy-gtk/empathy-contact-widget.c:829 -#: ../libempathy-gtk/empathy-individual-widget.c:453 +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Horizontální chyba (v metrech):" -#: ../libempathy-gtk/empathy-contact-widget.c:831 -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Rychlost:" -#: ../libempathy-gtk/empathy-contact-widget.c:833 -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Azimut:" -#: ../libempathy-gtk/empathy-contact-widget.c:835 -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Rychlost stoupání:" -#: ../libempathy-gtk/empathy-contact-widget.c:837 -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Poslední aktualizace:" -#: ../libempathy-gtk/empathy-contact-widget.c:839 -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Zeměpisná délka:" -#: ../libempathy-gtk/empathy-contact-widget.c:841 -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Zeměpisná šířka:" -#: ../libempathy-gtk/empathy-contact-widget.c:843 -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Nadmořská výška:" -#: ../libempathy-gtk/empathy-contact-widget.c:896 -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:559 -#: ../libempathy-gtk/empathy-individual-widget.c:574 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:15 msgid "Location" msgstr "Poloha" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:576 +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:965 -#: ../libempathy-gtk/empathy-individual-widget.c:625 +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y v %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1047 -#: ../libempathy-gtk/empathy-individual-widget.c:867 +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Uložit avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:1103 -#: ../libempathy-gtk/empathy-individual-widget.c:925 +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Nelze uložit avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:1787 -#: ../libempathy-gtk/empathy-individual-menu.c:1066 -#: ../libempathy-gtk/empathy-individual-widget.c:1324 -msgid "Favorite" -msgstr "Oblíbený" - -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 msgid "Full name" msgstr "Celé jméno" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 msgid "Phone number" msgstr "Telefonní číslo" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 msgid "E-mail address" msgstr "E-mailová adresa" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Website" msgstr "Webové stránky" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Birthday" msgstr "Narozeniny" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Last seen:" msgstr "Naposledy spatřen:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 msgid "Connected from:" msgstr "Připojen z:" #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 msgid "Away message:" msgstr "Zpráva v nepřítomnosti:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "work" msgstr "pracovní" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 msgid "home" msgstr "domů" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 msgid "mobile" msgstr "mobilní" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 msgid "voice" msgstr "hlasový" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 msgid "preferred" msgstr "upřednostňovaný" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 msgid "postal" msgstr "poštovní" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 msgid "parcel" msgstr "doručovací" @@ -2140,7 +1995,7 @@ msgstr "Poloha (dne)\t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1260 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "Alias:" @@ -2160,7 +2015,7 @@ msgstr "Podrobnosti o kontaktu" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1469 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "Identifikátor:" @@ -2199,97 +2054,178 @@ msgid "Select" msgstr "Vybrat" #: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1967 +#: ../src/empathy-main-window.c:1949 msgid "Group" msgstr "Skupina" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Následující identita bude blokována:" msgstr[1] "Následující identity budou blokovány:" msgstr[2] "Následující identity budou blokovány:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Následující identitu nelze blokovat:" msgstr[1] "Následující identity nelze blokovat:" msgstr[2] "Následující identity nelze blokovat:" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Upravit informace o kontaktu" + #. Translators: the heading at the top of the Information dialogue #: ../libempathy-gtk/empathy-individual-information-dialog.c:288 msgid "Linked Contacts" msgstr "Pospojované kontakty" -#: ../libempathy-gtk/empathy-individual-linker.c:370 +#: ../libempathy-gtk/empathy-individual-linker.c:372 msgid "Select contacts to link" msgstr "Vyberte kontakty, které se mají pospojovat" -#: ../libempathy-gtk/empathy-individual-linker.c:444 +#: ../libempathy-gtk/empathy-individual-linker.c:447 msgid "New contact preview" msgstr "Náhled nového kontaktu" -#: ../libempathy-gtk/empathy-individual-linker.c:488 +#: ../libempathy-gtk/empathy-individual-linker.c:491 msgid "Contacts selected in the list on the left will be linked together." msgstr "Kontakty vybrané v seznamu na levé straně budou pospojovány dohromady." #. 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:145 +#: ../libempathy-gtk/empathy-individual-menu.c:181 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:363 msgid "Select account to use to place the call" msgstr "Výběr účtu pro umístění volání" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 +#: ../libempathy-gtk/empathy-individual-menu.c:367 #: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1301 +#: ../src/empathy-streamed-media-window.c:1288 #: ../src/empathy-call-window.ui.h:2 msgid "Call" msgstr "Hovor" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:432 msgid "Mobile" msgstr "Mobilní" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:434 msgid "Work" msgstr "Pracovní" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:436 msgid "HOME" msgstr "Soukromý" +#: ../libempathy-gtk/empathy-individual-menu.c:677 +msgid "_Block Contact" +msgstr "_Blokovat kontakt" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-main-window-menubar.ui.h:16 +msgid "_Chat" +msgstr "_Diskuze" + #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:805 -#: ../libempathy-gtk/empathy-new-message-dialog.c:314 +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1143 +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Audiohovor" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Videohovor" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-main-window-menubar.ui.h:27 +msgid "_Previous Conversations" +msgstr "_Předchozí konverzace" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +msgid "Send File" +msgstr "Odeslat soubor" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "Sdílet moji plochu" + +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Oblíbený" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "Infor_mace" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Upravit" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1169 +#: ../libempathy-gtk/empathy-individual-menu.c:1385 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "Po_spojovat kontakty…" -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1011 +msgid "Inviting you to this room" +msgstr "Pozvání do místnosti" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +msgid "_Invite to Chat Room" +msgstr "Pozvat do diskuzní místnost_i" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-main-window-menubar.ui.h:14 +msgid "_Add Contact…" +msgstr "_Přidat kontakt…" + +#: ../libempathy-gtk/empathy-individual-view.c:2355 msgid "Delete and _Block" msgstr "Smazat a _blokovat" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +#: ../libempathy-gtk/empathy-individual-view.c:2390 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Opravdu chcete odstranit skupinu „%s“?" + +#: ../libempathy-gtk/empathy-individual-view.c:2393 +msgid "Removing group" +msgstr "Skupina se odstraňuje" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2448 +#: ../libempathy-gtk/empathy-individual-view.c:2665 +msgid "_Remove" +msgstr "_Odstranit" + +#: ../libempathy-gtk/empathy-individual-view.c:2525 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Opravdu chcete odstranit kontakt „%s“?" + +#: ../libempathy-gtk/empathy-individual-view.c:2534 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2298,7 +2234,11 @@ msgstr "" "Opravdu chcete odstranit pospojovaný kontakt „%s“? Uvědomte si, že tím se " "odstraní všechny kontakty, které tento pospojovaný kontakt tvoří." -#: ../libempathy-gtk/empathy-individual-widget.c:1608 +#: ../libempathy-gtk/empathy-individual-view.c:2546 +msgid "Removing contact" +msgstr "Kontakt se odstraňuje" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2382,48 +2322,48 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "_Rozpojit" -#: ../libempathy-gtk/empathy-log-window.c:634 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Historie" -#: ../libempathy-gtk/empathy-log-window.c:689 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Zobrazit" -#: ../libempathy-gtk/empathy-log-window.c:711 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Hledat" -#: ../libempathy-gtk/empathy-log-window.c:1159 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Konverzace v místnosti %s" -#: ../libempathy-gtk/empathy-log-window.c:1161 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Konverzace s kontaktem %s" -#: ../libempathy-gtk/empathy-log-window.c:1211 -#: ../libempathy-gtk/empathy-log-window.c:1358 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e. %B %Y, %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1300 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1306 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" @@ -2431,7 +2371,7 @@ msgstr[0] "%s sekunda" msgstr[1] "%s sekundy" msgstr[2] "%s sekund" -#: ../libempathy-gtk/empathy-log-window.c:1389 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" @@ -2439,80 +2379,80 @@ msgstr[0] "%s minuta" msgstr[1] "%s minuty" msgstr[2] "%s minut" -#: ../libempathy-gtk/empathy-log-window.c:1397 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Hovor trval %s, skončil %s" -#: ../libempathy-gtk/empathy-log-window.c:1729 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Dnes" -#: ../libempathy-gtk/empathy-log-window.c:1733 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Včera" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1748 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e. %B %Y" #: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3444 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Kdykoli" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2372 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Kdokoli" -#: ../libempathy-gtk/empathy-log-window.c:2685 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Kdo" -#: ../libempathy-gtk/empathy-log-window.c:2889 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Kdy" -#: ../libempathy-gtk/empathy-log-window.c:3005 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Cokoli" -#: ../libempathy-gtk/empathy-log-window.c:3007 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Konverzace" -#: ../libempathy-gtk/empathy-log-window.c:3009 +#: ../libempathy-gtk/empathy-log-window.c:3044 #: ../src/empathy-preferences.ui.h:4 msgid "Calls" msgstr "Hovory" -#: ../libempathy-gtk/empathy-log-window.c:3014 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Příchozí hovory" -#: ../libempathy-gtk/empathy-log-window.c:3015 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Odchozí hovory" -#: ../libempathy-gtk/empathy-log-window.c:3016 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Zmeškané hovory" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Co" -#: ../libempathy-gtk/empathy-log-window.c:3747 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Opravdu chcete vymazat všechny předchozí konverzace?" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Vymazat vše" -#: ../libempathy-gtk/empathy-log-window.c:3758 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Smazat z:" @@ -2553,76 +2493,82 @@ msgstr "_Soubor" msgid "page 2" msgstr "strana 2" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "Kontakt je odpojen" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 msgid "The specified contact is either invalid or unknown" msgstr "Vybraný kontakt buď není platný nebo je neznámý" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" msgstr "Kontakt nepodporuje tento druh konverzace" -#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 msgid "The requested functionality is not implemented for this protocol" msgstr "Požadovaná funkcionalita není pro tento protokol implementována" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 msgid "Could not start a conversation with the given contact" msgstr "Nelze začít konverzaci s daným kontaktem" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "Na tomto kanálu máte zákaz" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "Tento kanál je plný" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 msgid "You must be invited to join this channel" msgstr "Abyste se mohl připojit k tomuto kanálu, musíte mít pozvání" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" msgstr "Nelze pokračovat bez připojení" -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "Oprávnění odepřeno" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "Při spouštění konverzace došlo k chybě" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "Zadejte identifikátor kontaktu nebo telefonní číslo:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:334 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Nová konverzace" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:226 +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "_Video Call" msgstr "_Videohovor" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:236 +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 msgid "_Audio Call" msgstr "Hl_asový hovor" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:246 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Nový hovor" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Autentizace selhala pro účet %s" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2833,19 +2779,19 @@ msgstr "Zapamatovat tuto volbu pro budoucí připojení" msgid "Certificate Details" msgstr "Podrobnosti certifikátu" -#: ../libempathy-gtk/empathy-ui-utils.c:1738 +#: ../libempathy-gtk/empathy-ui-utils.c:1742 msgid "Unable to open URI" msgstr "Nelze otevřít URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1835 +#: ../libempathy-gtk/empathy-ui-utils.c:1860 msgid "Select a file" msgstr "Vybrat soubor" -#: ../libempathy-gtk/empathy-ui-utils.c:1907 +#: ../libempathy-gtk/empathy-ui-utils.c:1935 msgid "Insufficient free space to save file" msgstr "Nedostatek volného místa pro uložení souboru" -#: ../libempathy-gtk/empathy-ui-utils.c:1915 +#: ../libempathy-gtk/empathy-ui-utils.c:1943 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2854,7 +2800,7 @@ msgstr "" "Pro uložení tohoto souboru je zapotřebí %s volného místa, ale k dispozici je " "jen %s. Zvolte prosím jiné umístění." -#: ../libempathy-gtk/empathy-ui-utils.c:1959 +#: ../libempathy-gtk/empathy-ui-utils.c:1987 #, c-format msgid "Incoming file from %s" msgstr "Příchozí soubor od %s" @@ -3026,31 +2972,31 @@ msgstr "západní" msgid "Vietnamese" msgstr "vietnamské" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Není dostupné chybové hlášení" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Rychlá zpráva (Empathy)" -#: ../src/empathy.c:433 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Nepřipojovat se po spuštění" -#: ../src/empathy.c:437 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Nezobrazovat seznam kontaktů nebo žádné jiné dialogy po spuštění" -#: ../src/empathy.c:452 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "– komunikátor Empathy" -#: ../src/empathy.c:639 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Chyba při kontaktování správce účtu" -#: ../src/empathy.c:641 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3095,11 +3041,11 @@ msgstr "" "Empathy; pokud se tak nestalo, napište si o ni Free Software Foundation, " "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Klient rychlého zasílání zpráv pro pracovní prostředí GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Miloslav Trmač \n" @@ -3142,35 +3088,36 @@ msgstr "" "ukončit a k přidat účet později prostřednictvím nabídky „Upravit“." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1274 msgid "An error occurred" msgstr "Došlo k chybě" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Jaký typ účtu chcete vytvořit?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "Chcete založit ještě další účty?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Zadejte podrobnosti svého účtu" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Jaký typ účtu chcete vytvořit?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Chcete vytvořit další účty?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Zadejte podrobnosti nového účtu" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3182,41 +3129,41 @@ msgstr "" "dalších komunikátorů. Pokud máte mikrofon a webovou kameru můžete se " "navzájem vidět a hovořit spolu." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "Máte účet, který jste používali v jiném komunikátoru?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Ano, chci importovat účty z programu " -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Ano, zadám údaje svého účtu" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Ne, chci vytvořit nový účet" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Ne, momentálně chci vidět pouze lidi v sousedství" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Vyberte účty, které mají být importovány:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:631 +#: ../src/empathy-new-chatroom-dialog.c:632 msgid "Yes" msgstr "Ano" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Ne, prozatím je to vše" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3228,16 +3175,16 @@ msgstr "" "údaje jsou správné. Toto můžete kdykoli snadno změnit později, nebo tuto " "funkci vypnout v dialogu účtů." -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1150 msgid "Edit->Accounts" msgstr "Upravit -> Účty" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "_Ne, pro teď nechci tuto funkci povolit" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1146 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3249,85 +3196,93 @@ msgstr "" "využívat, musíte mít nainstalován telepathy-salut a povolit funkci „Lidé v " "okolí“ v dialogovém okně účtů." -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1152 msgid "telepathy-salut not installed" msgstr "telepathy-salut není nainstalován" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1198 msgid "Messaging and VoIP Accounts Assistant" msgstr "Průvodce Účty IM a VoIP" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1232 msgid "Welcome to Empathy" msgstr "Vítejte v Empathy" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1241 msgid "Import your existing accounts" msgstr "Importovat existující účty" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1259 msgid "Please enter personal details" msgstr "Vložte prosím informace o své osobě" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "V účtu %s máte neuložené změny." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Váš nový účet ještě není uložen." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:754 -#: ../src/empathy-call-window.c:1320 +#: ../src/empathy-accounts-dialog.c:352 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "Probíhá připojování…" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:393 #, c-format msgid "Offline — %s" msgstr "Odpojen — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:405 #, c-format msgid "Disconnected — %s" msgstr "Odpojen — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:416 msgid "Offline — No Network Connection" msgstr "Offline — Není k dispozici síť" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:423 msgid "Unknown Status" msgstr "Neznámý stav" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:435 msgid "Offline — Account Disabled" msgstr "Offline — Účet zakázán" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Chystáte se vytvořit nový účet, čímž zrušíte\n" -"provedené změny. Jste si jisti, že chcete pokračovat?" +#: ../src/empathy-accounts-dialog.c:538 +msgid "Edit Connection Parameters" +msgstr "Úprava parametrů připojení" + +#: ../src/empathy-accounts-dialog.c:701 +msgid "Failed to retrieve your personal information from the server." +msgstr "Selhalo získání vašich osobních informací ze serveru" + +#: ../src/empathy-accounts-dialog.c:707 +msgid "Go online to edit your personal information." +msgstr "Jít upravovat své osobní informace on-line" + +#: ../src/empathy-accounts-dialog.c:792 +msgid "_Edit Connection Parameters..." +msgstr "Upravit param_etry připojení…" -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:1293 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Opravdu chcete odstranit z vašeho počítače „%s“?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1297 msgid "This will not remove your account on the server." msgstr "Toto neodstraní váš účet na serveru." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1533 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3336,15 +3291,15 @@ msgstr "" "provedené změny. Jste si jisti, že chcete pokračovat?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1744 msgid "_Enable" msgstr "_Povolit" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1745 msgid "_Disable" msgstr "_Zakázat" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2255 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3380,13 +3335,13 @@ msgstr "" msgid "_Import…" msgstr "_Import…" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" -msgstr "– klient Empathy na ověření totožnosti" +msgstr "– klient Empathy pro ověření totožnosti" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" -msgstr "Klient Empathy na ověření totožnosti" +msgstr "Klient Empathy pro ověření totožnosti" #: ../src/empathy-auto-salut-account-helper.c:83 msgid "People nearby" @@ -3400,96 +3355,96 @@ msgstr "– audio/videoklient Empathy" msgid "Empathy Audio/Video Client" msgstr "Audio/videoklient Empathy" -#: ../src/empathy-streamed-media-window.c:431 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Kontrast" -#: ../src/empathy-streamed-media-window.c:434 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Jas" -#: ../src/empathy-streamed-media-window.c:437 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-streamed-media-window.c:542 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Hlasitost" -#: ../src/empathy-streamed-media-window.c:1110 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "Po_straní lišta" -#: ../src/empathy-streamed-media-window.c:1130 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Vstup zvuku" -#: ../src/empathy-streamed-media-window.c:1134 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Vstup videa" -#: ../src/empathy-streamed-media-window.c:1142 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Tlačítka vytáčení" -#: ../src/empathy-streamed-media-window.c:1153 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Podrobnosti" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1222 -#: ../src/empathy-call-window.c:1929 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format msgid "Call with %s" msgstr "Hovor s %s" -#: ../src/empathy-streamed-media-window.c:1455 -#: ../src/empathy-call-window.c:2173 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 msgid "The IP address as seen by the machine" msgstr "Adresa IP, jak ji vidí počítač" -#: ../src/empathy-streamed-media-window.c:1457 -#: ../src/empathy-call-window.c:2175 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 msgid "The IP address as seen by a server on the Internet" msgstr "Adresa IP, jak ji vidí server v Internetu" -#: ../src/empathy-streamed-media-window.c:1459 -#: ../src/empathy-call-window.c:2177 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 msgid "The IP address of the peer as seen by the other side" msgstr "Adresa IP vzájemného spojení, jak ji vidí druhá strana" -#: ../src/empathy-streamed-media-window.c:1461 -#: ../src/empathy-call-window.c:2179 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 msgid "The IP address of a relay server" msgstr "Adresa IP přenosového serveru" -#: ../src/empathy-streamed-media-window.c:1463 -#: ../src/empathy-call-window.c:2181 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 msgid "The IP address of the multicast group" msgstr "Adresa IP vysílací skupiny" -#: ../src/empathy-streamed-media-window.c:1845 -#: ../src/empathy-streamed-media-window.c:1848 -#: ../src/empathy-streamed-media-window.c:1851 -#: ../src/empathy-streamed-media-window.c:1854 +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 msgctxt "codec" msgid "Unknown" msgstr "Neznámý" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2146 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "Připojeno — %d:%02dm" -#: ../src/empathy-streamed-media-window.c:2207 -#: ../src/empathy-call-window.c:2984 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 msgid "Technical Details" msgstr "Technické podrobnosti" -#: ../src/empathy-streamed-media-window.c:2245 -#: ../src/empathy-call-window.c:3023 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3498,8 +3453,8 @@ msgstr "" "Software používaný kontaktem „%s“ nerozumí žádnému z formátů zvuku, který je " "podporován na vašem počítači" -#: ../src/empathy-streamed-media-window.c:2250 -#: ../src/empathy-call-window.c:3028 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3508,8 +3463,8 @@ msgstr "" "Software používaný kontaktem „%s“ nerozumí žádnému z formátů videa, který je " "podporován na vašem počítači" -#: ../src/empathy-streamed-media-window.c:2256 -#: ../src/empathy-call-window.c:3034 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3518,29 +3473,29 @@ msgstr "" "Nelze navázat spojení s %s. Někdo z vás není nejspíš v síti, která podporuje " "přímá spojení." -#: ../src/empathy-streamed-media-window.c:2262 -#: ../src/empathy-call-window.c:3040 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 msgid "There was a failure on the network" msgstr "Někde na síti došlo k selhání" -#: ../src/empathy-streamed-media-window.c:2266 -#: ../src/empathy-call-window.c:3044 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "Nemáte nainstalovánu podporu žádného z formátů zvuku potřebného pro tento " "hovor" -#: ../src/empathy-streamed-media-window.c:2269 -#: ../src/empathy-call-window.c:3047 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Nemáte nainstalovánu podporu žádného z formátů videa potřebného pro tento " "hovor" -#: ../src/empathy-streamed-media-window.c:2279 -#: ../src/empathy-call-window.c:3059 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please a přiložte chybové zprávy získané z odlaďovacího okna " "v nabídce „Nápověda“." -#: ../src/empathy-streamed-media-window.c:2287 -#: ../src/empathy-call-window.c:3068 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 msgid "There was a failure in the call engine" msgstr "Selhala funkce pro volání" -#: ../src/empathy-streamed-media-window.c:2290 -#: ../src/empathy-call-window.c:3071 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 msgid "The end of the stream was reached" msgstr "Byl dosažen konec proudu" -#: ../src/empathy-streamed-media-window.c:2330 -#: ../src/empathy-call-window.c:3111 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 msgid "Can't establish audio stream" msgstr "Nelze navázat spojení pro přenos zvuku" -#: ../src/empathy-streamed-media-window.c:2340 -#: ../src/empathy-call-window.c:3121 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 msgid "Can't establish video stream" msgstr "Nelze navázat spojení pro přenos obrazu" @@ -3658,8 +3613,8 @@ msgstr "Přepnout vysílání obrazu" #: ../src/empathy-call-window.ui.h:21 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2581 ../src/empathy-call-window.c:2582 -#: ../src/empathy-call-window.c:2583 ../src/empathy-call-window.c:2584 +#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 msgid "Unknown" msgstr "Neznámo" @@ -3829,96 +3784,96 @@ msgstr "Automaticky připojit" msgid "Manage Favorite Rooms" msgstr "Spravovat oblíbené místnosti" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Příchozí videohovor" -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1553 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "Příchozí hovor" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "Volá vám %s, chcete to zvednout?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "Volá vám %s, chcete to zvednout?" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1559 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "Příchozí hovor od %s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "O_dmítnout" -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_Zvednout" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "_Videohovor" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1559 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" msgstr "Příchozí videohovor od %s" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Pozvání do místnosti" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Pozvánka na připojení %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s vás zve do %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "O_dmítnout" -#: ../src/empathy-event-manager.c:858 +#: ../src/empathy-event-manager.c:860 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "Připo_jit" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s vás pozval do %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "Byli jste pozváni do %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Příchozí přenos souboru od %s" -#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375 msgid "Password required" msgstr "Požadováno heslo" -#: ../src/empathy-event-manager.c:1210 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s by chtěl oprávnění vidět, když jste dostupný" -#: ../src/empathy-event-manager.c:1214 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3928,105 +3883,105 @@ msgstr "" "Zpráva: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u:%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Neznámo" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s z %s při %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s z %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Stahování „%s“ od %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Odesílání „%s“ kontaktu %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Nastala chyba při stahování „%s“ od %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Chyba při přijímání souboru" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Chyba při odesílání „%s“ kontaktu %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Chyba při odesílání souboru" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "„%s“ obdrženo od kontaktu %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "„%s“ odeslán kontaktu %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Přenos souboru byl dokončen" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Čeká se na odpověď ostatních účastníků" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Ověřuje se neporušenost „%s“" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Vytváří se kontrolní součet „%s“" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Soubor" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Zbývá" @@ -4051,73 +4006,73 @@ msgid "Import Accounts" msgstr "Import účtů" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "Import" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Protokol" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Zdroj" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-main-window.c:392 msgid "Provide Password" msgstr "Poskytnout heslo" -#: ../src/empathy-main-window.c:401 +#: ../src/empathy-main-window.c:398 msgid "Disconnect" msgstr "Odpojit" -#: ../src/empathy-main-window.c:642 +#: ../src/empathy-main-window.c:635 msgid "No match found" msgstr "Nic nenalezeno" -#: ../src/empathy-main-window.c:750 +#: ../src/empathy-main-window.c:743 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" "Účet %s nemůže být bohužel použit, dokud nebude váš software %s aktualizován." -#: ../src/empathy-main-window.c:818 +#: ../src/empathy-main-window.c:811 msgid "Update software..." msgstr "Aktualizovat software…" -#: ../src/empathy-main-window.c:824 ../src/empathy-main-window.c:949 +#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938 msgid "Close" msgstr "Zavřít" -#: ../src/empathy-main-window.c:937 +#: ../src/empathy-main-window.c:926 msgid "Reconnect" msgstr "Znovu připojit" -#: ../src/empathy-main-window.c:943 +#: ../src/empathy-main-window.c:932 msgid "Edit Account" msgstr "Upravit účet" #. Translators: this string will be something like: #. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:1088 +#: ../src/empathy-main-window.c:1071 #, c-format msgid "Top up %s (%s)..." msgstr "Dobít kredit %s (%s)…" -#: ../src/empathy-main-window.c:1135 +#: ../src/empathy-main-window.c:1118 msgid "Top up account credit" msgstr "Dobít kredit účtu" #. top up button -#: ../src/empathy-main-window.c:1206 +#: ../src/empathy-main-window.c:1189 msgid "Top Up..." msgstr "Dobít kredit…" -#: ../src/empathy-main-window.c:1949 +#: ../src/empathy-main-window.c:1931 msgid "Contact" msgstr "Kontakt" -#: ../src/empathy-main-window.c:2324 +#: ../src/empathy-main-window.c:2306 msgid "Contact List" msgstr "Seznam kontaktů" @@ -4220,7 +4175,7 @@ msgstr "Členové" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:623 +#: ../src/empathy-new-chatroom-dialog.c:629 #, c-format msgid "" "%s\n" @@ -4233,16 +4188,16 @@ msgstr "" "Je vyžadováno heslo: %s\n" "Členové: %s" -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-new-chatroom-dialog.c:631 +#: ../src/empathy-new-chatroom-dialog.c:632 msgid "No" msgstr "Ne" -#: ../src/empathy-new-chatroom-dialog.c:654 +#: ../src/empathy-new-chatroom-dialog.c:660 msgid "Could not start room listing" msgstr "Nelze začít s výpisem místností" -#: ../src/empathy-new-chatroom-dialog.c:664 +#: ../src/empathy-new-chatroom-dialog.c:670 msgid "Could not stop room listing" msgstr "Nelze skončit s výpisem místností" @@ -4277,79 +4232,79 @@ msgstr "Seznam místností" msgid "_Room:" msgstr "_Místnost:" -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Zpráva přijata" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Zpráva odeslána" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Nová konverzace" -#: ../src/empathy-preferences.c:172 +#: ../src/empathy-preferences.c:169 msgid "Contact goes online" msgstr "Kontakt se připojil" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "Kontakt se odpojil" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Účet připojen" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Účet odpojen" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Jazyk" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:725 msgid "Juliet" msgstr "Julie" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:732 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:738 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Ach Romeo, Romeo! Proč jsi Romeo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "Své jméno zapři, odřekni se otce," #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "anebo, nechceš-li, zasvěť se mně," #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "a přestanu být Kapuletová." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "Mám ještě poslouchat? Či odpovím?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "Julie se odpojila" -#: ../src/empathy-preferences.c:1175 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "Nastavení" @@ -4410,35 +4365,27 @@ msgstr "Povolit kontrolu pravopisu pro jazyky:" msgid "General" msgstr "Všeobecné" -#: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "Úroveň vstupu:" - #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "Hlasitost vstupu:" - -#: ../src/empathy-preferences.ui.h:18 msgid "Location sources:" msgstr "Zdroje polohy:" -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:17 msgid "Log conversations" msgstr "Zaznamenávat konverzace" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:18 msgid "Notifications" msgstr "Upozornění" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:19 msgid "Play sound for events" msgstr "Přehrávat zvuky při událostech" -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:20 msgid "Privacy" msgstr "Soukromí" -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:21 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 " @@ -4447,75 +4394,75 @@ msgstr "" "Při omezené přesnosti polohy bude zobrazen pouze stát, kraj a město. " "Souřadnice GPS budou zaokrouhleny na 1 desetinné místo." -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:22 msgid "Show _smileys as images" msgstr "Zobrazovat _smajlíky jako obrázky" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:23 msgid "Show contact _list in rooms" msgstr "_Zobrazit seznam kontaktů v místnostech" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:24 msgid "Sounds" msgstr "Zvuky" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:25 msgid "Spell Checking" msgstr "Kontrola pravopisu" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:26 msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." msgstr "" "Seznam jazyků obsahuje pouze jazyky, pro které máte nainstalovány slovníky." -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:27 msgid "Themes" msgstr "Motivy" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:28 msgid "Use _echo cancellation to improve call quality" msgstr "Použít potlač_ení ozvěny ke zvýšení kvality volání" -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:29 msgid "Variant:" msgstr "Varianta:" -#: ../src/empathy-preferences.ui.h:32 +#: ../src/empathy-preferences.ui.h:30 msgid "_Automatically connect on startup" msgstr "Připojovat se _automaticky po spuštění " -#: ../src/empathy-preferences.ui.h:33 +#: ../src/empathy-preferences.ui.h:31 msgid "_Cellphone" msgstr "_Mobil" -#: ../src/empathy-preferences.ui.h:34 +#: ../src/empathy-preferences.ui.h:32 msgid "_Enable bubble notifications" msgstr "P_ovolit bublinová upozornění" -#: ../src/empathy-preferences.ui.h:35 +#: ../src/empathy-preferences.ui.h:33 msgid "_Enable sound notifications" msgstr "_Povolit zvuková upozornění" -#: ../src/empathy-preferences.ui.h:36 +#: ../src/empathy-preferences.ui.h:34 msgid "_GPS" msgstr "_GPS" -#: ../src/empathy-preferences.ui.h:37 +#: ../src/empathy-preferences.ui.h:35 msgid "_Network (IP, Wi-Fi)" msgstr "_Síť (IP, Wi-Fi)" -#: ../src/empathy-preferences.ui.h:38 +#: ../src/empathy-preferences.ui.h:36 msgid "_Open new chats in separate windows" msgstr "_Otevírat nové diskuze v oddělených oknech" -#: ../src/empathy-preferences.ui.h:39 +#: ../src/empathy-preferences.ui.h:37 msgid "_Publish location to my contacts" msgstr "Zveřejnit _kontaktům polohu" #. 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:41 +#: ../src/empathy-preferences.ui.h:39 msgid "_Reduce location accuracy" msgstr "O_mezit přesnost polohy" @@ -4575,7 +4522,7 @@ msgstr "Video povoleno" msgid "Video Preview" msgstr "Náhled videa" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Zobrazení kontaktů na mapě" @@ -4641,16 +4588,16 @@ msgid "" "extension." msgstr "Vybraný správce připojení nepodporuje rozšíření pro vzdálené ladění." -#: ../src/empathy-invite-participant-dialog.c:197 -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Přizvat účastníka" -#: ../src/empathy-invite-participant-dialog.c:198 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Zvolte kontakt, který chcete přizvat do konverzace: " -#: ../src/empathy-invite-participant-dialog.c:221 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Pozvat" @@ -4703,39 +4650,39 @@ msgstr "Ladění Empathy" msgid "- Empathy Chat Client" msgstr "– komunikační klient Empathy" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Odpovědět" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1563 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 msgid "Reject" msgstr "Odmítnout" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1564 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 msgid "Answer" msgstr "Zvednout" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Videohovor" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Odmítnout" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Přijmout" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Poskytnout" @@ -4746,41 +4693,45 @@ msgstr "%s vám právě zkouší volat, ale vy máte jiný hovor." #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196 +#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2880 +#: ../src/empathy-call-window.c:2929 msgid "On hold" msgstr "Čeká na lince" -#: ../src/empathy-call-window.c:2883 +#: ../src/empathy-call-window.c:2932 msgid "Mute" msgstr "Ztišit" -#: ../src/empathy-call-window.c:2885 +#: ../src/empathy-call-window.c:2934 msgid "Duration" msgstr "Doba" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2888 +#: ../src/empathy-call-window.c:2937 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:3158 +#: ../src/empathy-call-window.c:3207 #, c-format msgid "Your current balance is %s." msgstr "Váš aktuální zůstatek je %s." -#: ../src/empathy-call-window.c:3162 +#: ../src/empathy-call-window.c:3211 msgid "Sorry, you don’t have enough credit for that call." msgstr "Pro toto volání nemáte bohužel dostatečný kredit." -#: ../src/empathy-call-window.c:3164 +#: ../src/empathy-call-window.c:3213 msgid "Top Up" msgstr "Dobití kreditu" #: ../libempathy-gtk/empathy-search-bar.c:243 msgid "_Match case" -msgstr "Rozlišovat velikost _znaků" \ No newline at end of file +msgstr "Rozlišovat velikost _znaků" + +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Přidávání nového účtu" diff --git a/po/en_CA.po b/po/en_CA.po index cea232b1..2d3d810d 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -1,2380 +1,4720 @@ -# Canadian English translation of gossip. -# Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation -# This file is distributed under the same licence as the gossip package. +# Canadian English translations for Empathy package. +# Copyright (C) 2012 EMPATHY'S COPYRIGHT HOLDER +# This file is distributed under the same licence as the Empathy package. # Adam Weinberger , 2004, 2005. -# -# +# Tiffany Antopolski , 2012. +# msgid "" msgstr "" -"Project-Id-Version: gossip\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-15 23:46+0200\n" -"PO-Revision-Date: 2005-08-27 20:31-0500\n" -"Last-Translator: Adam Weinberger \n" -"Language-Team: Canadian English \n" +"Project-Id-Version: Empathy\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=empathy&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2012-02-08 15:44+0000\n" +"PO-Revision-Date: 2012-02-08 19:16-0500\n" +"Last-Translator: Tiffany Antopolski \n" +"Language-Team: Canadian English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: en_CA\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/empathy.desktop.in.h:1 -#, fuzzy -msgid "Empathy Instant Messenger" -msgstr "Instant Messenger" +#: ../data/empathy.desktop.in.in.h:1 +msgid "Empathy" +msgstr "Empathy" -#: ../data/empathy.desktop.in.h:2 -msgid "Instant Messenger" -msgstr "Instant Messenger" +#: ../data/empathy.desktop.in.in.h:2 +msgid "IM Client" +msgstr "IM Client" -#: ../data/empathy.schemas.in.h:1 -msgid "Always open a separate chat window for new chats." -msgstr "Always open a separate chat window for new chats." +#: ../data/empathy.desktop.in.in.h:3 +msgid "Empathy Internet Messaging" +msgstr "Empathy Internet Messaging" -#: ../data/empathy.schemas.in.h:2 -msgid "Chat window theme" -msgstr "Chat window theme" +#: ../data/empathy.desktop.in.in.h:4 +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "Chat on Google Talk, Facebook, MSN and many other chat services" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:1 +msgid "Connection managers should be used" +msgstr "Connection managers should be used" -#: ../data/empathy.schemas.in.h:3 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:2 msgid "" -"Comma separated list of spell checker languages to use (e.g. en, fr, nl)." +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." msgstr "" -"Comma-separated list of spell checker languages to use (e.g. en, fr, nl)." +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." -#: ../data/empathy.schemas.in.h:4 -#, fuzzy -msgid "Compact contact list" -msgstr "_Show Contact List" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 +msgid "Empathy should auto-connect on startup" +msgstr "Empathy should auto-connect on startup" -#: ../data/empathy.schemas.in.h:5 -msgid "Contact list sort criterium" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 +msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "" +"Whether Empathy should automatically log into your accounts on startup." -#: ../data/empathy.schemas.in.h:6 -msgid "Default directory to select an avatar image from" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +msgid "Empathy should auto-away when idle" +msgstr "Empathy should auto-away when idle" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +msgid "" +"Whether Empathy should go into away mode automatically if the user is idle." msgstr "" +"Whether Empathy should go into away mode automatically if the user is idle." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +msgid "Empathy default download folder" +msgstr "Empathy default download folder" -#: ../data/empathy.schemas.in.h:7 -msgid "Enable popup when contact is available" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 +msgid "The default folder to save file transfers in." +msgstr "The default folder to save file transfers in." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +msgid "Show offline contacts" +msgstr "Show offline contacts" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +msgid "Whether to show contacts that are offline in the contact list." +msgstr "Whether to show contacts that are offline in the contact list." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +msgid "Show avatars" +msgstr "Show avatars" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." msgstr "" +"Whether to show avatars for contacts in the contact list and chat windows." -#: ../data/empathy.schemas.in.h:8 -#, fuzzy -msgid "Enable sound when away" -msgstr "Disable sounds when _away" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +msgid "Show protocols" +msgstr "Show protocols" -#: ../data/empathy.schemas.in.h:9 -#, fuzzy -msgid "Enable sound when busy" -msgstr "Disable sounds when _busy" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +msgid "Whether to show protocols for contacts in the contact list." +msgstr "Whether to show protocols for contacts in the contact list." -#: ../data/empathy.schemas.in.h:10 -#, fuzzy -msgid "Enable spell checker" -msgstr "Enable spell checking" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +msgid "Show Balance in contact list" +msgstr "Show Balance in contact list" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +msgid "Whether to show account balances in the contact list." +msgstr "Whether to show account balances in the contact list." -#: ../data/empathy.schemas.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +msgid "Compact contact list" +msgstr "Compact contact list" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +msgid "Whether to show the contact list in compact mode." +msgstr "Whether to show the contact list in compact mode." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Hide main window" msgstr "Hide main window" -#: ../data/empathy.schemas.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Hide the main window." msgstr "Hide the main window." -#: ../data/empathy.schemas.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +msgid "Default directory to select an avatar image from" +msgstr "Default directory to select an avatar image from" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +msgid "The last directory that an avatar image was chosen from." +msgstr "The last directory that an avatar image was chosen from." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Open new chats in separate windows" msgstr "Open new chats in separate windows" -#: ../data/empathy.schemas.in.h:14 -#, fuzzy -msgid "Show avatars" -msgstr "_Show Contacts" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +msgid "Always open a separate chat window for new chats." +msgstr "Always open a separate chat window for new chats." -#: ../data/empathy.schemas.in.h:15 -#, fuzzy -msgid "Show hint about closing the main window" -msgstr "The height of the main window." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +msgid "Display incoming events in the status area" +msgstr "Display incoming events in the status area" -#: ../data/empathy.schemas.in.h:16 -msgid "Show offline contacts" -msgstr "Show offline contacts" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." +msgstr "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." -#: ../data/empathy.schemas.in.h:17 -msgid "Spell checking languages" -msgstr "Spell checking languages" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +msgid "The position for the chat window side pane" +msgstr "The position for the chat window side pane" -#: ../data/empathy.schemas.in.h:18 -msgid "The last directory that an avatar image was chosen from." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "The stored position (in pixels) of the chat window side pane." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +msgid "Contact list sort criterion" +msgstr "Contact list sort criterion" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." msgstr "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." -#: ../data/empathy.schemas.in.h:19 -msgid "The theme that is used to display the conversation in chat windows." -msgstr "The theme that is used to display the conversation in chat windows." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +msgid "Use notification sounds" +msgstr "Use notification sounds" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +msgid "Whether to play a sound to notify of events." +msgstr "Whether to play a sound to notify of events." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +msgid "Disable sounds when away" +msgstr "Disable sounds when away" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +msgid "Whether to play sound notifications when away or busy." +msgstr "Whether to play sound notifications when away or busy." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +msgid "Play a sound for incoming messages" +msgstr "Play a sound for incoming messages" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +msgid "Whether to play a sound to notify of incoming messages." +msgstr "Whether to play a sound to notify of incoming messages." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +msgid "Play a sound for outgoing messages" +msgstr "Play a sound for outgoing messages" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "Whether to play a sound to notify of outgoing messages." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +msgid "Play a sound for new conversations" +msgstr "Play a sound for new conversations" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +msgid "Whether to play a sound to notify of new conversations." +msgstr "Whether to play a sound to notify of new conversations." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +msgid "Play a sound when a contact logs in" +msgstr "Play a sound when a contact logs in" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "" +"Whether to play a sound to notify of contacts logging into the network." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +msgid "Play a sound when a contact logs out" +msgstr "Play a sound when a contact logs out" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "" +"Whether to play a sound to notify of contacts logging out of the network." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +msgid "Play a sound when we log in" +msgstr "Play a sound when we log in" -#: ../data/empathy.schemas.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +msgid "Whether to play a sound when logging into a network." +msgstr "Whether to play a sound when logging into a network." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +msgid "Play a sound when we log out" +msgstr "Play a sound when we log out" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +msgid "Whether to play a sound when logging out of a network." +msgstr "Whether to play a sound when logging out of a network." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +msgid "Enable popup notifications for new messages" +msgstr "Enable popup notifications for new messages" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +msgid "Whether to show a popup notification when receiving a new message." +msgstr "Whether to show a popup notification when receiving a new message." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +msgid "Disable popup notifications when away" +msgstr "Disable popup notifications when away" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +msgid "Whether to show popup notifications when away or busy." +msgstr "Whether to show popup notifications when away or busy." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +msgid "Pop up notifications if the chat isn't focused" +msgstr "Pop up notifications if the chat isn't focused" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +msgid "Pop up notifications when a contact logs in" +msgstr "Pop up notifications when a contact logs in" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +msgid "Whether to show a popup notification when a contact goes online." +msgstr "Whether to show a popup notification when a contact goes online." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +msgid "Pop up notifications when a contact logs out" +msgstr "Pop up notifications when a contact logs out" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "Whether to show a popup notification when a contact goes offline." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "Use graphical smileys" msgstr "Use graphical smileys" -#: ../data/empathy.schemas.in.h:21 -msgid "Use notification sounds" -msgstr "Use notification sounds" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "Whether to convert smileys into graphical images in conversations." -#: ../data/empathy.schemas.in.h:22 -#, fuzzy -msgid "Use theme for chat rooms" -msgstr "_Invite to Chat Room" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +msgid "Show contact list in rooms" +msgstr "Show contact list in rooms" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +msgid "Whether to show the contact list in chat rooms." +msgstr "Whether to show the contact list in chat rooms." -#: ../data/empathy.schemas.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +msgid "Chat window theme" +msgstr "Chat window theme" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +msgid "The theme that is used to display the conversation in chat windows." +msgstr "The theme that is used to display the conversation in chat windows." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +msgid "Chat window theme variant" +msgstr "Chat window theme variant" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "" -"Whether or not to check words typed against the languages you want to check " -"with." +"The theme variant that is used to display the conversation in chat windows." msgstr "" +"The theme variant that is used to display the conversation in chat windows." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +msgid "Path of the Adium theme to use" +msgstr "Path of the Adium theme to use" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "Path of the Adium theme to use if the theme used for chat is Adium." -#: ../data/empathy.schemas.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +msgid "Enable WebKit Developer Tools" +msgstr "Enable WebKit Developer Tools" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "" -"Whether or not to convert smileys into graphical images in conversations." +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" -"Whether or not to convert smileys into graphical images in conversations." +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." -#: ../data/empathy.schemas.in.h:25 -msgid "Whether or not to play a sound when messages arrive." -msgstr "Whether or not to play a sound when messages arrive." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +msgid "Use theme for chat rooms" +msgstr "Use theme for chat rooms" -#: ../data/empathy.schemas.in.h:26 -msgid "Whether or not to play sounds when away." -msgstr "Whether or not to play sounds when away." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +msgid "Whether to use the theme for chat rooms." +msgstr "Whether to use the theme for chat rooms." -#: ../data/empathy.schemas.in.h:27 -msgid "Whether or not to play sounds when busy." -msgstr "Whether or not to play sounds when busy." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +msgid "Spell checking languages" +msgstr "Spell checking languages" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +msgid "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +msgstr "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -#: ../data/empathy.schemas.in.h:28 -#, fuzzy -msgid "Whether or not to show a popup when a contact becomes available." -msgstr "Whether or not to play a sound when messages arrive." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +msgid "Enable spell checker" +msgstr "Enable spell checker" -#: ../data/empathy.schemas.in.h:29 -#, fuzzy +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "" -"Whether or not to show avatars for contacts in the contact list and chat " -"windows." -msgstr "Whether or not to show contacts that are offline in the contact list." +"Whether to check words typed against the languages you want to check with." +msgstr "" +"Whether to check words typed against the languages you want to check with." -#: ../data/empathy.schemas.in.h:30 -msgid "Whether or not to show contacts that are offline in the contact list." -msgstr "Whether or not to show contacts that are offline in the contact list." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +msgid "Nick completed character" +msgstr "Nick completed character" -#: ../data/empathy.schemas.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "" -"Whether or not to show the message dialog about closing the main window with " -"the 'x' button in the title bar." +"Character to add after nickname when using nick completion (tab) in group " +"chat." msgstr "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." -#: ../data/empathy.schemas.in.h:32 -#, fuzzy -msgid "Whether to show the contact list in compact mode or not." -msgstr "Whether or not to show contacts that are offline in the contact list." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "Empathy should use the avatar of the contact as the chat window icon" -#: ../data/empathy.schemas.in.h:33 -msgid "Whether to use the theme for chat rooms or not." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" +"Whether Empathy should use the avatar of the contact as the chat window icon." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +msgid "Last account selected in Join Room dialog" +msgstr "Last account selected in Join Room dialog" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +msgid "D-Bus object path of the last account selected to join a room." +msgstr "D-Bus object path of the last account selected to join a room." -#: ../data/empathy.schemas.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +msgid "Camera device" +msgstr "Camera device" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "Default camera device to use in video calls, e.g. /dev/video0." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +msgid "Camera position" +msgstr "Camera position" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +msgid "Position the camera preview should be during a call." +msgstr "Position the camera preview should be during a call." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +msgid "Echo cancellation support" +msgstr "Echo cancellllation support" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "Whether to enable Pulseaudio's echo cancellllation filter." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +msgid "Show hint about closing the main window" +msgstr "Show hint about closing the main window" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "" -"Which criterium to use when sorting the contact list. Default is to use sort " -"by the contact's name with the value \"name\". A value of \"state\" will " -"sort the contact list by state." +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." msgstr "" +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." -#: ../libempathy/gossip-contact.c:654 ../libempathy/gossip-presence.c:184 -#: ../libempathy/gossip-presence.c:283 -msgid "Offline" -msgstr "Offline" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +msgid "Empathy can publish the user's location" +msgstr "Empathy can publish the user's location" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "Whether Empathy can publish the user's location to their contacts." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +msgid "Empathy can use the network to guess the location" +msgstr "Empathy can use the network to guess the location" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +msgid "Whether Empathy can use the network to guess the location." +msgstr "Whether Empathy can use the network to guess the location." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy can use the cellular network to guess the location" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "Whether Empathy can use the cellular network to guess the location." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy can use the GPS to guess the location" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Whether Empathy can use the GPS to guess the location." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy should reduce the location's accuracy" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +msgid "" +"Whether Empathy should reduce the location's accuracy for privacy reasons." +msgstr "" +"Whether Empathy should reduce the location's accuracy for privacy reasons." -#: ../libempathy/gossip-presence.c:274 -#, fuzzy +#. Tweak the dialog +#: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2327 +msgid "Messaging and VoIP Accounts" +msgstr "Messaging and VoIP Accounts" + +#: ../data/empathy-accounts.desktop.in.in.h:2 +msgid "Manage Messaging and VoIP accounts" +msgstr "Manage Messaging and VoIP accounts" + +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "No reason was specified" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "The change in state was requested" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "You cancellled the file transfer" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "The other participant cancellled the file transfer" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Error while trying to transfer the file" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "The other participant is unable to transfer the file" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "Unknown reason" + +#: ../libempathy/empathy-ft-handler.c:917 +msgid "File transfer completed, but the file was corrupted" +msgstr "File transfer completed, but the file was corrupted" + +#: ../libempathy/empathy-ft-handler.c:1203 +msgid "File transfer not supported by remote contact" +msgstr "File transfer not supported by remote contact" + +#: ../libempathy/empathy-ft-handler.c:1259 +msgid "The selected file is not a regular file" +msgstr "The selected file is not a regular file" + +#: ../libempathy/empathy-ft-handler.c:1268 +msgid "The selected file is empty" +msgstr "The selected file is empty" + +#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131 +#, c-format +msgid "Missed call from %s" +msgstr "Missed call from %s" + +#. Translators: this is an outgoing call, e.g. 'Called Alice' +#: ../libempathy/empathy-message.c:419 +#, c-format +msgid "Called %s" +msgstr "Called %s" + +#: ../libempathy/empathy-message.c:422 +#, c-format +msgid "Call from %s" +msgstr "Call from %s" + +#: ../libempathy/empathy-utils.c:233 msgid "Available" -msgstr "Available..." +msgstr "Available" -#: ../libempathy/gossip-presence.c:276 -#, fuzzy +#: ../libempathy/empathy-utils.c:235 msgid "Busy" -msgstr "Busy..." +msgstr "Busy" -#: ../libempathy/gossip-presence.c:279 -#, fuzzy +#: ../libempathy/empathy-utils.c:238 msgid "Away" -msgstr "Away..." +msgstr "Away" -#: ../libempathy-gtk/empathy-main-window.c:254 -#, fuzzy -msgid "Show and edit accounts" -msgstr "_Show Contacts" +#: ../libempathy/empathy-utils.c:240 +msgid "Invisible" +msgstr "Invisible" -#: ../libempathy-gtk/empathy-main-window.c:456 -msgid "Group" -msgstr "Group" - -#: ../libempathy-gtk/empathy-main-window.c:477 -#, fuzzy -msgid "Contact" -msgstr "_Add Contact..." +#: ../libempathy/empathy-utils.c:242 +msgid "Offline" +msgstr "Offline" -#: ../libempathy-gtk/empathy-main-window.glade.h:1 -#, fuzzy -msgid "Contact List - Empathy" -msgstr "_Hide Contact List" +#. translators: presence type is unknown +#: ../libempathy/empathy-utils.c:245 +msgctxt "presence" +msgid "Unknown" +msgstr "Unknown" -#: ../libempathy-gtk/empathy-main-window.glade.h:2 -#, fuzzy -msgid "Context" -msgstr "_Contents" +#: ../libempathy/empathy-utils.c:285 +msgid "No reason specified" +msgstr "No reason specified" -#: ../libempathy-gtk/empathy-main-window.glade.h:3 -#, fuzzy -msgid "Join _Favorites" -msgstr "_Add to Favourites" +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 +msgid "Status is set to offline" +msgstr "Status is set to offline" -#: ../libempathy-gtk/empathy-main-window.glade.h:4 -#: ../libempathy-gtk/gossip-chat.glade.h:10 -msgid "Join _New..." -msgstr "" +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 +#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 +msgid "Network error" +msgstr "Network error" -#: ../libempathy-gtk/empathy-main-window.glade.h:5 -#, fuzzy -msgid "Manage Favorites..." -msgstr "_Add to Favourites" +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 +msgid "Authentication failed" +msgstr "Authentication failed" -#: ../libempathy-gtk/empathy-main-window.glade.h:6 -msgid "Show _Offline Contacts" -msgstr "Show _Offline Contacts" +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 +msgid "Encryption error" +msgstr "Encryption error" -#: ../libempathy-gtk/empathy-main-window.glade.h:7 -#, fuzzy -msgid "_About" -msgstr "_Accounts" +#: ../libempathy/empathy-utils.c:295 +msgid "Name in use" +msgstr "Name in use" -#: ../libempathy-gtk/empathy-main-window.glade.h:8 -msgid "_Accounts" -msgstr "_Accounts" +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 +msgid "Certificate not provided" +msgstr "Certificate not provided" -#: ../libempathy-gtk/empathy-main-window.glade.h:9 -#: ../libempathy-gtk/gossip-chat.glade.h:15 -msgid "_Add Contact..." -msgstr "_Add Contact..." +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 +msgid "Certificate untrusted" +msgstr "Certificate untrusted" -#: ../libempathy-gtk/empathy-main-window.glade.h:10 -#: ../libempathy-gtk/gossip-contact-list.c:298 -msgid "_Chat" -msgstr "_Chat" +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 +msgid "Certificate expired" +msgstr "Certificate expired" -#: ../libempathy-gtk/empathy-main-window.glade.h:11 -msgid "_Contents" -msgstr "_Contents" +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 +msgid "Certificate not activated" +msgstr "Certificate not activated" -#: ../libempathy-gtk/empathy-main-window.glade.h:12 -#: ../libempathy-gtk/gossip-chat.glade.h:21 -#: ../libempathy-gtk/gossip-contact-list.c:310 -#, fuzzy -msgid "_Edit" -msgstr "Edit" +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 +msgid "Certificate hostname mismatch" +msgstr "Certificate hostname mismatch" -#: ../libempathy-gtk/empathy-main-window.glade.h:13 -msgid "_Help" -msgstr "" +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 +msgid "Certificate fingerprint mismatch" +msgstr "Certificate fingerprint mismatch" -#: ../libempathy-gtk/empathy-main-window.glade.h:14 -#: ../libempathy-gtk/empathy-status-icon.glade.h:2 -msgid "_New Message..." -msgstr "_New Message..." +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 +msgid "Certificate self-signed" +msgstr "Certificate self-signed" -#: ../libempathy-gtk/empathy-main-window.glade.h:15 -msgid "_Personal Information" -msgstr "_Personal Information" +#: ../libempathy/empathy-utils.c:311 +msgid "Certificate error" +msgstr "Certificate error" -#: ../libempathy-gtk/empathy-main-window.glade.h:16 -msgid "_Preferences" -msgstr "_Preferences" +#: ../libempathy/empathy-utils.c:345 +msgid "Encryption is not available" +msgstr "Encryption is not available" -#: ../libempathy-gtk/empathy-main-window.glade.h:17 -#: ../libempathy-gtk/empathy-status-icon.glade.h:3 -msgid "_Quit" -msgstr "" +#: ../libempathy/empathy-utils.c:347 +msgid "Certificate is invalid" +msgstr "Certificate is invalid" -#: ../libempathy-gtk/empathy-main-window.glade.h:18 -#: ../libempathy-gtk/gossip-chat.glade.h:25 -#, fuzzy -msgid "_Room" -msgstr "_Room:" +#: ../libempathy/empathy-utils.c:349 +msgid "Connection has been refused" +msgstr "Connection has been refused" -#: ../libempathy-gtk/empathy-main-window.glade.h:19 -#: ../libempathy-gtk/gossip-chat.glade.h:28 -#: ../libempathy-gtk/gossip-contact-list.c:326 -#, fuzzy -msgid "_View Previous Conversations" -msgstr "_Conversation" +#: ../libempathy/empathy-utils.c:351 +msgid "Connection can't be established" +msgstr "Connection can't be established" -#: ../libempathy-gtk/empathy-status-icon.glade.h:1 -msgid "Status" -msgstr "Status" +#: ../libempathy/empathy-utils.c:353 +msgid "Connection has been lost" +msgstr "Connection has been lost" -#: ../libempathy-gtk/empathy-status-icon.glade.h:4 -msgid "_Show Contact List" -msgstr "_Show Contact List" +#: ../libempathy/empathy-utils.c:355 +msgid "This account is already connected to the server" +msgstr "This account is already connected to the server" -#: ../libempathy-gtk/gossip-about-dialog.c:63 +#: ../libempathy/empathy-utils.c:357 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." +"Connection has been replaced by a new connection using the same resource" msgstr "" +"Connection has been replaced by a new connection using the same resource" + +#: ../libempathy/empathy-utils.c:360 +msgid "The account already exists on the server" +msgstr "The account already exists on the server" -#: ../libempathy-gtk/gossip-about-dialog.c:67 +#: ../libempathy/empathy-utils.c:362 +msgid "Server is currently too busy to handle the connection" +msgstr "Server is currently too busy to handle the connection" + +#: ../libempathy/empathy-utils.c:364 +msgid "Certificate has been revoked" +msgstr "Certificate has been revoked" + +#: ../libempathy/empathy-utils.c:366 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." +"Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" +"Certificate uses an insecure cipher algorithm or is cryptographically weak" -#: ../libempathy-gtk/gossip-about-dialog.c:71 +#: ../libempathy/empathy-utils.c:369 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" +"The length of the server certificate, or the depth of the server certificate " +"chain, exceed the limits imposed by the cryptography library" msgstr "" +"The length of the server certificate, or the depth of the server certificate " +"chain, exceed the limits imposed by the cryptography library" -#: ../libempathy-gtk/gossip-about-dialog.c:99 -#, fuzzy -msgid "An Instant Messaging client for GNOME" -msgstr "Gossip, Instant Messaging Client" +#: ../libempathy/empathy-utils.c:373 +msgid "Your software is too old" +msgstr "Your software is too old" -#: ../libempathy-gtk/gossip-about-dialog.c:105 -#, fuzzy -msgid "translator-credits" -msgstr "Adam Weinberger" +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "Internal error" -#: ../libempathy-gtk/gossip-accounts-dialog.c:224 -#, fuzzy -msgid "Disable" -msgstr "Available..." +#: ../libempathy/empathy-utils.c:534 +msgid "People Nearby" +msgstr "People Nearby" -#: ../libempathy-gtk/gossip-accounts-dialog.c:227 -msgid "Enable" -msgstr "" +#: ../libempathy/empathy-utils.c:539 +msgid "Yahoo! Japan" +msgstr "Yahoo! Japan" -#: ../libempathy-gtk/gossip-accounts-dialog.c:261 -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:3 -#, fuzzy -msgid "No Account Selected" -msgstr "About" +#: ../libempathy/empathy-utils.c:568 +msgid "Google Talk" +msgstr "Google Talk" -#: ../libempathy-gtk/gossip-accounts-dialog.c:263 -msgid "" -"To add a new account, you can click on the 'Add' button and a new entry will " -"be created for you to start configuring.\n" -"\n" -"If you do not want to add an account, simply click on the account you want " -"to configure in the list on the left." -msgstr "" +#: ../libempathy/empathy-utils.c:569 +msgid "Facebook Chat" +msgstr "Facebook Chat" -#: ../libempathy-gtk/gossip-accounts-dialog.c:272 -#, fuzzy -msgid "No Accounts Configured" -msgstr "About" +#: ../libempathy/empathy-time.c:90 +#, c-format +msgid "%d second ago" +msgid_plural "%d seconds ago" +msgstr[0] "%d second ago" +msgstr[1] "%d seconds ago" -#: ../libempathy-gtk/gossip-accounts-dialog.c:274 -msgid "" -"To add a new account, you can click on the 'Add' button and a new entry will " -"be created for you to start configuring." -msgstr "" +#: ../libempathy/empathy-time.c:96 +#, c-format +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "%d minute ago" +msgstr[1] "%d minutes ago" -#: ../libempathy-gtk/gossip-accounts-dialog.c:362 -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:6 -msgid "Accounts" -msgstr "Accounts" +#: ../libempathy/empathy-time.c:102 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "%d hour ago" +msgstr[1] "%d hours ago" -#: ../libempathy-gtk/gossip-accounts-dialog.c:857 +#: ../libempathy/empathy-time.c:108 #, c-format -msgid "" -"You are about to remove your %s account!\n" -"Are you sure you want to proceed?" -msgstr "" +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d day ago" +msgstr[1] "%d days ago" + +#: ../libempathy/empathy-time.c:114 +#, c-format +msgid "%d week ago" +msgid_plural "%d weeks ago" +msgstr[0] "%d week ago" +msgstr[1] "%d weeks ago" + +#: ../libempathy/empathy-time.c:120 +#, c-format +msgid "%d month ago" +msgid_plural "%d months ago" +msgstr[0] "%d month ago" +msgstr[1] "%d months ago" + +#: ../libempathy/empathy-time.c:142 +msgid "in the future" +msgstr "in the future" + +#: ../libempathy-gtk/empathy-account-chooser.c:692 +msgid "All accounts" +msgstr "All accounts" + +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 +msgid "Account" +msgstr "Account" + +#: ../libempathy-gtk/empathy-account-widget.c:683 +msgid "Password" +msgstr "Password" + +#: ../libempathy-gtk/empathy-account-widget.c:684 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:507 +msgid "Server" +msgstr "Server" + +#: ../libempathy-gtk/empathy-account-widget.c:685 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:522 +msgid "Port" +msgstr "Port" + +#: ../libempathy-gtk/empathy-account-widget.c:765 +#: ../libempathy-gtk/empathy-account-widget.c:817 +#, c-format +msgid "%s:" +msgstr "%s:" + +#: ../libempathy-gtk/empathy-account-widget.c:1398 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 +msgid "Username:" +msgstr "Username:" + +#: ../libempathy-gtk/empathy-account-widget.c:1710 +msgid "A_pply" +msgstr "A_pply" + +#: ../libempathy-gtk/empathy-account-widget.c:1739 +msgid "L_og in" +msgstr "L_og in" + +#: ../libempathy-gtk/empathy-account-widget.c:1812 +msgid "This account already exists on the server" +msgstr "This account already exists on the server" + +#: ../libempathy-gtk/empathy-account-widget.c:1816 +msgid "Create a new account on the server" +msgstr "Create a new account on the server" + +#. To translators: The first parameter is the login id and the +#. * second one is the network. The resulting string will be something +#. * like: "MyUserName on freenode". +#. * You should reverse the order of these arguments if the +#. * server should come before the login id in your locale. +#: ../libempathy-gtk/empathy-account-widget.c:2241 +#, c-format +msgid "%1$s on %2$s" +msgstr "%1$s on %2$s" -#: ../libempathy-gtk/gossip-accounts-dialog.c:863 +#. To translators: The parameter is the protocol name. The resulting +#. * string will be something like: "Jabber Account" +#: ../libempathy-gtk/empathy-account-widget.c:2267 +#, c-format +msgid "%s Account" +msgstr "%s Account" + +#: ../libempathy-gtk/empathy-account-widget.c:2271 +msgid "New account" +msgstr "New account" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Pass_word:" +msgstr "Pass_word:" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 +msgid "Screen _Name:" +msgstr "Screen _Name:" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +msgid "Example: MyScreenName" +msgstr "Example: MyScreenName" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "Remember password" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Port:" +msgstr "_Port:" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "_Server:" +msgstr "_Server:" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Advanced" +msgstr "Advanced" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 +msgid "What is your AIM screen name?" +msgstr "What is your AIM screen name?" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 +msgid "What is your AIM password?" +msgstr "What is your AIM password?" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "Remember Password" +msgstr "Remember Password" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 +msgid "Login I_D:" +msgstr "Login I_D:" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Example: username" +msgstr "Example: username" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +msgid "What is your GroupWise User ID?" +msgstr "What is your GroupWise User ID?" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 +msgid "What is your GroupWise password?" +msgstr "What is your GroupWise password?" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "ICQ _UIN:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 +msgid "Example: 123456789" +msgstr "Example: 123456789" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +msgid "Ch_aracter set:" +msgstr "Ch_aracter set:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +msgid "What is your ICQ UIN?" +msgstr "What is your ICQ UIN?" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 +msgid "What is your ICQ password?" +msgstr "What is your ICQ password?" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:206 +#: ../libempathy-gtk/empathy-account-widget-sip.c:239 +msgid "Auto" +msgstr "Auto" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:209 +msgid "UDP" +msgstr "UDP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:212 +msgid "TCP" +msgstr "TCP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:215 +msgid "TLS" +msgstr "TLS" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 +msgid "Register" +msgstr "Register" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:249 +msgid "Options" +msgstr "Options" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:252 +msgid "None" +msgstr "None" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Network" +msgstr "Network" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +msgid "Network:" +msgstr "Network:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +msgid "Character set:" +msgstr "Character set:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +msgid "Servers" +msgstr "Servers" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "" -"Any associated conversations and chat rooms will NOT be removed if you " -"decide to proceed.\n" -"\n" -"Should you decide to add the account back at a later time, they will still " -"be available." +"Most IRC servers don't need a password, so if you're not sure, don't enter a " +"password." msgstr "" +"Most IRC servers don't need a password, so if you're not sure, don't enter a " +"password." -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:1 -#, fuzzy -msgid "Account" -msgstr "About" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 +msgid "Nickname:" +msgstr "Nickname:" -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:2 -#, fuzzy -msgid "New Account" -msgstr "About" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 +msgid "Password:" +msgstr "Password:" -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:4 -#, fuzzy -msgid "Settings" -msgstr "Status" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +msgid "Quit message:" +msgstr "Quit message:" -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:5 -msgid "A unique name for this account to identify it personally to you." -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +msgid "Real name:" +msgstr "Real name:" -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:7 -#, fuzzy -msgid "Cr_eate" -msgstr "Chat" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 +msgid "Which IRC network?" +msgstr "Which IRC network?" -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:8 -msgid "Imendio " -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "What is your IRC nickname?" +msgstr "What is your IRC nickname?" -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:9 -msgid "Jabber" -msgstr "Jabber" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "What is your Facebook username?" +msgstr "What is your Facebook username?" -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:10 +#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 msgid "" -"To add a new account, you can click on the 'Add' button and a new entry will " -"be created for you to started configuring.\n" -"\n" -"If you do not want to add an account, simply click on the account you want " -"to configure in the list on the left." +"This is your username, not your normal Facebook login.\n" +"If you are facebook.com/badger, enter badger.\n" +"Use this page to choose a " +"Facebook username if you don't have one." msgstr "" +"This is your username, not your normal Facebook login.\n" +"If you are facebook.com/badger, enter badger.\n" +"Use this page to choose a " +"Facebook username if you don't have one." -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:13 -msgid "_Name:" -msgstr "_Name:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 +msgid "What is your Facebook password?" +msgstr "What is your Facebook password?" -#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:14 -#, fuzzy -msgid "_Type:" -msgstr "_Topic:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +msgid "What is your Google ID?" +msgstr "What is your Google ID?" -#: ../libempathy-gtk/gossip-account-widget-generic.c:144 -#: ../libempathy-gtk/gossip-account-widget-generic.c:186 -#, c-format -msgid "%s:" -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Example: user@gmail.com" +msgstr "Example: user@gmail.com" -#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:1 -#, fuzzy -msgid "" -"Example: user@jabber.org" -msgstr "Example: user@jabber.org" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +msgid "What is your Google password?" +msgstr "What is your Google password?" -#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:2 -msgid "Forget password and clear the entry." -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +msgid "Example: user@jabber.org" +msgstr "Example: user@jabber.org" -#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:3 -msgid "Login I_D:" -msgstr "Login I_D:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "I_gnore SSL certificate errors" +msgstr "I_gnore SSL certificate errors" -#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:4 -#, fuzzy -msgid "Pass_word:" -msgstr "_Password:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +msgid "Priori_ty:" +msgstr "Priori_ty:" -#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:5 -#, fuzzy +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 msgid "Reso_urce:" -msgstr "R_esource:" +msgstr "Reso_urce:" -#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:6 -#, fuzzy -msgid "Use encryption (SS_L)" -msgstr "Use _encryption (SSL)" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "Encr_yption required (TLS/SSL)" +msgstr "Encr_yption required (TLS/SSL)" -#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:7 -#, fuzzy -msgid "_Port:" -msgstr "Por_t:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "Use old SS_L" +msgstr "Use old SS_L" -#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:8 -msgid "_Server:" -msgstr "_Server:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "Override server settings" +msgstr "Override server settings" -#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:9 -msgid "jabber account settings" -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +msgid "What is your Jabber ID?" +msgstr "What is your Jabber ID?" -#: ../libempathy-gtk/gossip-chat.c:314 -msgid "Disconnected" -msgstr "Disconnected" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +msgid "What is your desired Jabber ID?" +msgstr "What is your desired Jabber ID?" -#: ../libempathy-gtk/gossip-chat.c:858 -msgid "Insert Smiley" -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +msgid "What is your Jabber password?" +msgstr "What is your Jabber password?" -#: ../libempathy-gtk/gossip-chat.c:906 -msgid "_Check Word Spelling..." -msgstr "_Check Word Spelling..." +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +msgid "What is your desired Jabber password?" +msgstr "What is your desired Jabber password?" -#: ../libempathy-gtk/gossip-chat.c:1244 -msgid "Connected" -msgstr "Connected" +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +msgid "Example: user@hotmail.com" +msgstr "Example: user@hotmail.com" -#: ../libempathy-gtk/gossip-chat.glade.h:1 -msgid "C_lear" -msgstr "C_lear" +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +msgid "What is your Windows Live ID?" +msgstr "What is your Windows Live ID?" -#: ../libempathy-gtk/gossip-chat.glade.h:2 -msgid "Change _Topic..." -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 +msgid "What is your Windows Live password?" +msgstr "What is your Windows Live password?" -#: ../libempathy-gtk/gossip-chat.glade.h:3 -msgid "Chat" -msgstr "Chat" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 +msgid "Nic_kname:" +msgstr "Nic_kname:" -#: ../libempathy-gtk/gossip-chat.glade.h:4 -#, fuzzy -msgid "Contact Infor_mation" -msgstr "Contact _Information" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "_Last Name:" +msgstr "_Last Name:" -#: ../libempathy-gtk/gossip-chat.glade.h:5 -#, fuzzy -msgid "Cu_t" -msgstr "Ch_at" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +msgid "_First Name:" +msgstr "_First Name:" -#: ../libempathy-gtk/gossip-chat.glade.h:6 -msgid "In_vite..." -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +msgid "_Published Name:" +msgstr "_Published Name:" -#: ../libempathy-gtk/gossip-chat.glade.h:7 -msgid "Insert _Smiley" -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 +msgid "_Jabber ID:" +msgstr "_Jabber ID:" -#: ../libempathy-gtk/gossip-chat.glade.h:8 -#, fuzzy -msgid "Invitation _message:" -msgstr "Enter status message:" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 +msgid "E-_mail address:" +msgstr "E-_mail address:" -#: ../libempathy-gtk/gossip-chat.glade.h:9 -msgid "Invite" -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "_Username:" +msgstr "_Username:" -#: ../libempathy-gtk/gossip-chat.glade.h:11 -msgid "Move Tab _Left" -msgstr "Move Tab _Left" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 +msgid "Example: user@my.sip.server" +msgstr "Example: user@my.sip.server" -#: ../libempathy-gtk/gossip-chat.glade.h:12 -msgid "Move Tab _Right" -msgstr "Move Tab _Right" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 +msgid "Use this account to call _landlines and mobile phones" +msgstr "Use this account to call _landlines and mobile phones" -#: ../libempathy-gtk/gossip-chat.glade.h:13 -msgid "Select who would you like to invite:" -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 +msgid "NAT Traversal Options" +msgstr "NAT Traversal Options" -#: ../libempathy-gtk/gossip-chat.glade.h:14 -msgid "You have been invited to join a chat conference." -msgstr "You have been invited to join a chat conference." +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 +msgid "Proxy Options" +msgstr "Proxy Options" -#: ../libempathy-gtk/gossip-chat.glade.h:16 -#, fuzzy -msgid "_Add To Favorites" -msgstr "_Add to Favourites" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +msgid "Miscellaneous Options" +msgstr "Miscellaneous Options" -#: ../libempathy-gtk/gossip-chat.glade.h:17 -msgid "_Close" -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 +msgid "STUN Server:" +msgstr "STUN Server:" -#: ../libempathy-gtk/gossip-chat.glade.h:18 -msgid "_Conversation" -msgstr "_Conversation" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +msgid "Discover the STUN server automatically" +msgstr "Discover the STUN server automatically" -#: ../libempathy-gtk/gossip-chat.glade.h:19 -msgid "_Copy" -msgstr "" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 +msgid "Discover Binding" +msgstr "Discover Binding" -#: ../libempathy-gtk/gossip-chat.glade.h:20 -msgid "_Detach Tab" -msgstr "_Detach Tab" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "Server:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Keep-Alive Options" +msgstr "Keep-Alive Options" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 +msgid "Mechanism:" +msgstr "Mechanism:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 +msgid "Interval (seconds)" +msgstr "Interval (seconds)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Authentication username:" +msgstr "Authentication username:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Transport:" +msgstr "Transport:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 +msgid "Loose Routing" +msgstr "Loose Routing" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +msgid "Ignore TLS Errors" +msgstr "Ignore TLS Errors" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 +msgid "Port:" +msgstr "Port:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +msgid "What is your SIP login ID?" +msgstr "What is your SIP login ID?" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP account password?" +msgstr "What is your SIP account password?" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Yahoo! I_D:" +msgstr "Yahoo! I_D:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 +msgid "I_gnore conference and chat room invitations" +msgstr "I_gnore conference and chat room invitations" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Room List locale:" +msgstr "_Room List locale:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 +msgid "What is your Yahoo! ID?" +msgstr "What is your Yahoo! ID?" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 +msgid "What is your Yahoo! password?" +msgstr "What is your Yahoo! password?" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:471 +#: ../libempathy-gtk/empathy-avatar-chooser.c:556 +msgid "Couldn't convert image" +msgstr "Couldn't convert image" -#: ../libempathy-gtk/gossip-chat.glade.h:22 -msgid "_Next Tab" -msgstr "_Next Tab" +#: ../libempathy-gtk/empathy-avatar-chooser.c:472 +msgid "None of the accepted image formats are supported on your system" +msgstr "None of the accepted image formats are supported on your system" -#: ../libempathy-gtk/gossip-chat.glade.h:23 -msgid "_Paste" -msgstr "" +#: ../libempathy-gtk/empathy-avatar-chooser.c:819 +msgid "Couldn't save picture to file" +msgstr "Couldn't save picture to file" -#: ../libempathy-gtk/gossip-chat.glade.h:24 -msgid "_Previous Tab" -msgstr "_Previous Tab" +#: ../libempathy-gtk/empathy-avatar-chooser.c:939 +msgid "Select Your Avatar Image" +msgstr "Select Your Avatar Image" -#: ../libempathy-gtk/gossip-chat.glade.h:26 -msgid "_Show Contacts" -msgstr "_Show Contacts" +#: ../libempathy-gtk/empathy-avatar-chooser.c:947 +msgid "Take a picture..." +msgstr "Take a picture..." -#: ../libempathy-gtk/gossip-chat.glade.h:27 -msgid "_Tabs" -msgstr "_Tabs" +#: ../libempathy-gtk/empathy-avatar-chooser.c:960 +msgid "No Image" +msgstr "No Image" -#: ../libempathy-gtk/gossip-chat-view.c:544 -msgid "_Copy Link Address" -msgstr "_Copy Link Address" +#: ../libempathy-gtk/empathy-avatar-chooser.c:1017 +msgid "Images" +msgstr "Images" -#: ../libempathy-gtk/gossip-chat-view.c:552 -msgid "_Open Link" -msgstr "_Open Link" +#: ../libempathy-gtk/empathy-avatar-chooser.c:1021 +msgid "All Files" +msgstr "All Files" -#: ../libempathy-gtk/gossip-chat-view.c:889 -msgid "%A %d %B %Y" -msgstr "%A %d %B %Y" +#: ../libempathy-gtk/empathy-avatar-image.c:322 +msgid "Click to enlarge" +msgstr "Click to enlarge" -#: ../libempathy-gtk/gossip-chat-window.c:685 -#: ../libempathy-gtk/gossip-chat-window.c:715 -#, fuzzy -msgid "New Message" -msgid_plural "New Messages" -msgstr[0] "_New Message..." -msgstr[1] "_New Message..." +#: ../libempathy-gtk/empathy-call-utils.c:44 +#: ../libempathy-gtk/empathy-call-utils.c:62 +msgid "There was an error starting the call" +msgstr "There was an error starting the call" -#: ../libempathy-gtk/gossip-chat-window.c:691 -#, fuzzy -msgid "Chat Room" -msgstr "Chat Room:" +#: ../libempathy-gtk/empathy-call-utils.c:51 +msgid "The specified contact doesn't support calls" +msgstr "The specified contact doesn't support calls" -#: ../libempathy-gtk/gossip-chat-window.c:696 -#: ../libempathy-gtk/gossip-chat-window.c:719 -#, fuzzy, c-format -msgid "Conversation" -msgid_plural "Conversations (%d)" -msgstr[0] "_Conversation" -msgstr[1] "_Conversation" +#: ../libempathy-gtk/empathy-call-utils.c:53 +msgid "The specified contact is offline" +msgstr "The specified contact is offline" -#: ../libempathy-gtk/gossip-chat-window.c:1295 -msgid "Typing a message." -msgstr "Typing a message." +#: ../libempathy-gtk/empathy-call-utils.c:55 +msgid "The specified contact is not valid" +msgstr "The specified contact is not valid" -#: ../libempathy-gtk/gossip-contact-list.c:290 -#, fuzzy -msgid "_Contact" -msgstr "_Add Contact..." +#: ../libempathy-gtk/empathy-call-utils.c:57 +msgid "Emergency calls are not supported on this protocol" +msgstr "Emergency calls are not supported on this protocol" -#: ../libempathy-gtk/gossip-contact-list.c:294 -#, fuzzy -msgid "_Group" -msgstr "Group" +#: ../libempathy-gtk/empathy-call-utils.c:59 +msgid "You don't have enough credit in order to place this call" +msgstr "You don't have enough credit in order to place this call" -#: ../libempathy-gtk/gossip-contact-list.c:298 -#, fuzzy -msgid "Chat with contact" -msgstr "Add a contact" +#: ../libempathy-gtk/empathy-chat.c:710 +msgid "Failed to open private chat" +msgstr "Failed to open private chat" -#: ../libempathy-gtk/gossip-contact-list.c:302 -#, fuzzy -msgid "Infor_mation" -msgstr "Contact _Information" - -#: ../libempathy-gtk/gossip-contact-list.c:302 -#, fuzzy -msgid "View contact information" -msgstr "Contact information" - -#: ../libempathy-gtk/gossip-contact-list.c:306 -#, fuzzy -msgid "Re_name" -msgstr "/Re_name group" - -#: ../libempathy-gtk/gossip-contact-list.c:306 -#, fuzzy -msgid "Rename" -msgstr "File name:" - -#: ../libempathy-gtk/gossip-contact-list.c:310 -#, fuzzy -msgid "Edit the groups and name for this contact" -msgstr "" -"Please enter a new nickname for the contact\n" -"%s" +#: ../libempathy-gtk/empathy-chat.c:768 +msgid "Topic not supported on this conversation" +msgstr "Topic not supported on this conversation" -#: ../libempathy-gtk/gossip-contact-list.c:314 -#, fuzzy -msgid "_Remove" -msgstr "/_Remove Contact" +#: ../libempathy-gtk/empathy-chat.c:774 +msgid "You are not allowed to change the topic" +msgstr "You are not allowed to change the topic" -#: ../libempathy-gtk/gossip-contact-list.c:314 -#, fuzzy -msgid "Remove contact" -msgstr "/_Remove Contact" +#: ../libempathy-gtk/empathy-chat.c:973 +#, c-format +msgid "“%s” is not a valid contact ID" +msgstr "“%s” is not a valid contact ID" -#: ../libempathy-gtk/gossip-contact-list.c:318 -#, fuzzy -msgid "_Invite to Chat Room" -msgstr "_Invite to Chat Room" +#: ../libempathy-gtk/empathy-chat.c:1068 +msgid "/clear: clear all messages from the current conversation" +msgstr "/clear: clear all messages from the current conversation" + +#: ../libempathy-gtk/empathy-chat.c:1071 +msgid "/topic : set the topic of the current conversation" +msgstr "/topic : set the topic of the current conversation" + +#: ../libempathy-gtk/empathy-chat.c:1074 +msgid "/join : join a new chat room" +msgstr "/join : join a new chat room" -#: ../libempathy-gtk/gossip-contact-list.c:318 -msgid "Invite to a currently open chat room" +#: ../libempathy-gtk/empathy-chat.c:1077 +msgid "/j : join a new chat room" +msgstr "/j : join a new chat room" + +#: ../libempathy-gtk/empathy-chat.c:1081 +msgid "" +"/part [] []: leave the chat room, by default the " +"current one" msgstr "" +"/part [] []: leave the chat room, by default the " +"current one" -#: ../libempathy-gtk/gossip-contact-list.c:322 -#, fuzzy -msgid "_Send File..." -msgstr "/_Send File..." +#: ../libempathy-gtk/empathy-chat.c:1085 +msgid "/query []: open a private chat" +msgstr "/query []: open a private chat" -#: ../libempathy-gtk/gossip-contact-list.c:322 -#, fuzzy -msgid "Send a file" -msgstr "Select a file" +#: ../libempathy-gtk/empathy-chat.c:1088 +msgid "/msg : open a private chat" +msgstr "/msg : open a private chat" -#: ../libempathy-gtk/gossip-contact-list.c:326 -#, fuzzy -msgid "View previous conversations with this contact" -msgstr "_Conversation" +#: ../libempathy-gtk/empathy-chat.c:1091 +msgid "/nick : change your nickname on the current server" +msgstr "/nick : change your nickname on the current server" -#: ../libempathy-gtk/gossip-preferences.c:250 -msgid "Language" -msgstr "Language" +#: ../libempathy-gtk/empathy-chat.c:1094 +msgid "/me : send an ACTION message to the current conversation" +msgstr "/me : send an ACTION message to the current conversation" -#: ../libempathy-gtk/gossip-preferences.glade.h:1 -#, fuzzy -msgid "Appearance" -msgstr "Appearance and Behaviour" - -#: ../libempathy-gtk/gossip-preferences.glade.h:2 -#, fuzzy -msgid "Audio" -msgstr "About" - -#: ../libempathy-gtk/gossip-preferences.glade.h:3 -#, fuzzy -msgid "Behaviour" -msgstr "Appearance and Behaviour" - -#: ../libempathy-gtk/gossip-preferences.glade.h:4 -#, fuzzy -msgid "Contact List" -msgstr "Status" - -#: ../libempathy-gtk/gossip-preferences.glade.h:5 -msgid "Languages" -msgstr "Languages" - -#: ../libempathy-gtk/gossip-preferences.glade.h:6 -#, fuzzy -msgid "Options" -msgstr "Connection" - -#: ../libempathy-gtk/gossip-preferences.glade.h:7 -#, fuzzy -msgid "Visual" -msgstr "Options" - -#: ../libempathy-gtk/gossip-preferences.glade.h:8 -#, fuzzy +#: ../libempathy-gtk/empathy-chat.c:1097 msgid "" -"The list of languages reflects only the languages for which you have " -"a dictionary installed." +"/say : send 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 "" -"The list of languages here reflects only the languages for which you have a " -"dictionary installed." +"/say : send 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\"" -#: ../libempathy-gtk/gossip-preferences.glade.h:9 -msgid "Avatars are user chosen images shown in the contact list" +#: ../libempathy-gtk/empathy-chat.c:1102 +msgid "/whois : display information about a contact" +msgstr "/whois : display information about a contact" + +#: ../libempathy-gtk/empathy-chat.c:1105 +msgid "" +"/help []: show all supported commands. If is defined, " +"show its usage." msgstr "" +"/help []: show all supported commands. If is defined, " +"show its usage." -#: ../libempathy-gtk/gossip-preferences.glade.h:10 -#, fuzzy -msgid "Chat Th_eme:" -msgstr "Chat window theme" +#: ../libempathy-gtk/empathy-chat.c:1124 +#, c-format +msgid "Usage: %s" +msgstr "Usage: %s" -#: ../libempathy-gtk/gossip-preferences.glade.h:11 -msgid "Display notifications when contacts come _online" -msgstr "" +#: ../libempathy-gtk/empathy-chat.c:1169 +msgid "Unknown command" +msgstr "Unknown command" -#: ../libempathy-gtk/gossip-preferences.glade.h:12 -#, fuzzy -msgid "Enable sounds when _away" -msgstr "Disable sounds when _away" +#: ../libempathy-gtk/empathy-chat.c:1295 +msgid "Unknown command; see /help for the available commands" +msgstr "Unknown command; see /help for the available commands" -#: ../libempathy-gtk/gossip-preferences.glade.h:13 -#, fuzzy -msgid "Enable sounds when _busy" -msgstr "Disable sounds when _busy" +#: ../libempathy-gtk/empathy-chat.c:1541 +msgid "insufficient balance to send message" +msgstr "insufficient balance to send message" -#: ../libempathy-gtk/gossip-preferences.glade.h:14 -msgid "General" -msgstr "General" +#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559 +#: ../libempathy-gtk/empathy-chat.c:1622 +#, c-format +msgid "Error sending message '%s': %s" +msgstr "Error sending message '%s': %s" -#: ../libempathy-gtk/gossip-preferences.glade.h:15 -#, fuzzy -msgid "Notifications" -msgstr "Use notification sounds" +#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564 +#: ../libempathy-gtk/empathy-chat.c:1626 +#, c-format +msgid "Error sending message: %s" +msgstr "Error sending message: %s" -#: ../libempathy-gtk/gossip-preferences.glade.h:16 -#, fuzzy -msgid "Preferences" -msgstr "_Preferences" +#. translators: error used when user doesn't have enough credit on his +#. * account to send the message. +#: ../libempathy-gtk/empathy-chat.c:1553 +#, c-format +msgid "insufficient balance to send message. Top up." +msgstr "insufficient balance to send message. Top up." -#: ../libempathy-gtk/gossip-preferences.glade.h:17 -msgid "Show _avatars" -msgstr "" +#: ../libempathy-gtk/empathy-chat.c:1593 +msgid "not capable" +msgstr "not capable" -#: ../libempathy-gtk/gossip-preferences.glade.h:18 -#, fuzzy -msgid "Show _smileys as images" -msgstr "Convert _smileys to graphical images" +#: ../libempathy-gtk/empathy-chat.c:1600 +msgid "offline" +msgstr "offline" -#: ../libempathy-gtk/gossip-preferences.glade.h:19 -#, fuzzy -msgid "Show co_mpact contact list" -msgstr "_Show Contact List" +#: ../libempathy-gtk/empathy-chat.c:1603 +msgid "invalid contact" +msgstr "invalid contact" -#: ../libempathy-gtk/gossip-preferences.glade.h:20 -msgid "Sort by _name" -msgstr "" +#: ../libempathy-gtk/empathy-chat.c:1606 +msgid "permission denied" +msgstr "permission denied" -#: ../libempathy-gtk/gossip-preferences.glade.h:21 -msgid "Sort by s_tate" -msgstr "" +#: ../libempathy-gtk/empathy-chat.c:1609 +msgid "too long message" +msgstr "too long message" -#: ../libempathy-gtk/gossip-preferences.glade.h:22 -msgid "Spell Checking" -msgstr "Spell Checking" +#: ../libempathy-gtk/empathy-chat.c:1612 +msgid "not implemented" +msgstr "not implemented" -#: ../libempathy-gtk/gossip-preferences.glade.h:23 -msgid "Themes" -msgstr "" +#: ../libempathy-gtk/empathy-chat.c:1616 +msgid "unknown" +msgstr "unknown" -#: ../libempathy-gtk/gossip-preferences.glade.h:24 -#, fuzzy -msgid "_Enable spell checking" -msgstr "Enable spell checking" +#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916 +msgid "Topic:" +msgstr "Topic:" -#: ../libempathy-gtk/gossip-preferences.glade.h:25 -msgid "_Open new chats in separate windows" -msgstr "_Open new chats in separate windows" +#: ../libempathy-gtk/empathy-chat.c:1698 +#, c-format +msgid "Topic set to: %s" +msgstr "Topic set to: %s" -#: ../libempathy-gtk/gossip-preferences.glade.h:26 -msgid "_Play sound when messages arrive" -msgstr "_Play sound when messages arrive" +#: ../libempathy-gtk/empathy-chat.c:1700 +#, c-format +msgid "Topic set by %s to: %s" +msgstr "Topic set by %s to: %s" -#: ../libempathy-gtk/gossip-preferences.glade.h:27 -#, fuzzy -msgid "_Use for chat rooms" -msgstr "_Invite to Chat Room" +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1705 +msgid "No topic defined" +msgstr "No topic defined" -#: ../libempathy-gtk/gossip-presence-chooser.c:702 -#, fuzzy -msgid "Custom message..." -msgstr "_New Message..." +#: ../libempathy-gtk/empathy-chat.c:2221 +msgid "(No Suggestions)" +msgstr "(No Suggestions)" -#. Clear list -#: ../libempathy-gtk/gossip-presence-chooser.c:724 -#, fuzzy -msgid "Clear List..." -msgstr "Clear List" +#. translators: %s is the selected word +#: ../libempathy-gtk/empathy-chat.c:2289 +#, c-format +msgid "Add '%s' to Dictionary" +msgstr "Add '%s' to Dictionary" -#: ../libempathy-gtk/gossip-presence-chooser.c:803 -#, fuzzy -msgid "Are you sure you want to clear the list?" -msgstr "Do you want to accept this file?" +#. translators: first %s is the selected word, +#. * second %s is the language name of the target dictionary +#: ../libempathy-gtk/empathy-chat.c:2326 +#, c-format +msgid "Add '%s' to %s Dictionary" +msgstr "Add '%s' to %s Dictionary" -#: ../libempathy-gtk/gossip-presence-chooser.c:807 -msgid "" -"This will remove any custom messages you have added to the list of preset " -"status messages." -msgstr "" +#: ../libempathy-gtk/empathy-chat.c:2396 +msgid "Insert Smiley" +msgstr "Insert Smiley" -#: ../libempathy-gtk/gossip-presence-chooser.c:812 -msgid "Clear List" -msgstr "Clear List" +#. send button +#: ../libempathy-gtk/empathy-chat.c:2414 +#: ../libempathy-gtk/empathy-ui-utils.c:1867 +msgid "_Send" +msgstr "_Send" -#: ../libempathy-gtk/gossip-presence-chooser.glade.h:1 -msgid "Enter status message:" -msgstr "Enter status message:" +#. Spelling suggestions +#: ../libempathy-gtk/empathy-chat.c:2471 +msgid "_Spelling Suggestions" +msgstr "_Spelling Suggestions" -#: ../libempathy-gtk/gossip-presence-chooser.glade.h:2 -#, fuzzy -msgid "Status Message Presets" -msgstr "Add to status message list" +#: ../libempathy-gtk/empathy-chat.c:2560 +msgid "Failed to retrieve recent logs" +msgstr "Failed to retrieve recent logs" -#: ../libempathy-gtk/gossip-presence-chooser.glade.h:3 -#, fuzzy -msgid "_Add to status message list" -msgstr "Add to status message list" +#: ../libempathy-gtk/empathy-chat.c:2699 +#, c-format +msgid "%s has disconnected" +msgstr "%s has disconnected" -#: ../libempathy-gtk/gossip-private-chat.c:198 +#. translators: reverse the order of these arguments +#. * if the kicked should come before the kicker in your locale. +#. +#: ../libempathy-gtk/empathy-chat.c:2706 #, c-format -msgid "%s went offline" -msgstr "%s went offline" +msgid "%1$s was kicked by %2$s" +msgstr "%1$s was kicked by %2$s" -#: ../libempathy-gtk/gossip-private-chat.c:212 -#, fuzzy, c-format -msgid "%s has come online" -msgstr "%s comes online" +#: ../libempathy-gtk/empathy-chat.c:2709 +#, c-format +msgid "%s was kicked" +msgstr "%s was kicked" -#: ../libempathy-gtk/gossip-theme-manager.c:87 -msgid "Classic" -msgstr "" +#. translators: reverse the order of these arguments +#. * if the banned should come before the banner in your locale. +#. +#: ../libempathy-gtk/empathy-chat.c:2717 +#, c-format +msgid "%1$s was banned by %2$s" +msgstr "%1$s was banned by %2$s" + +#: ../libempathy-gtk/empathy-chat.c:2720 +#, c-format +msgid "%s was banned" +msgstr "%s was banned" + +#: ../libempathy-gtk/empathy-chat.c:2724 +#, c-format +msgid "%s has left the room" +msgstr "%s has left the room" + +#. Note to translators: this string is appended to +#. * notifications like "foo has left the room", with the message +#. * given by the user living the room. If this poses a problem, +#. * please let us know. :-) +#. +#: ../libempathy-gtk/empathy-chat.c:2733 +#, c-format +msgid " (%s)" +msgstr " (%s)" -#: ../libempathy-gtk/gossip-theme-manager.c:88 -#, fuzzy -msgid "Simple" -msgstr "Example: %s" +#: ../libempathy-gtk/empathy-chat.c:2758 +#, c-format +msgid "%s has joined the room" +msgstr "%s has joined the room" -#: ../libempathy-gtk/gossip-theme-manager.c:89 -#, fuzzy -msgid "Clean" -msgstr "C_lear" +#: ../libempathy-gtk/empathy-chat.c:2783 +#, c-format +msgid "%s is now known as %s" +msgstr "%s is now known as %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:2970 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 +msgid "Disconnected" +msgstr "Disconnected" -#: ../libempathy-gtk/gossip-theme-manager.c:90 -#, fuzzy -msgid "Blue" -msgstr "Basque" +#. Add message +#: ../libempathy-gtk/empathy-chat.c:3634 +msgid "Would you like to store this password?" +msgstr "Would you like to store this password?" -#: ../src/empathy-main.c:145 -msgid "Don't connect on startup" -msgstr "Don't connect on startup" +#: ../libempathy-gtk/empathy-chat.c:3640 +msgid "Remember" +msgstr "Remember" -#: ../src/empathy-main.c:155 -#, fuzzy -msgid "- Empathy Instant Messenger" -msgstr "Gossip Instant Messenger" +#: ../libempathy-gtk/empathy-chat.c:3650 +msgid "Not now" +msgstr "Not now" -#~ msgid "Gossip Instant Messenger" -#~ msgstr "Gossip Instant Messenger" +#: ../libempathy-gtk/empathy-chat.c:3694 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 +msgid "Retry" +msgstr "Retry" -#, fuzzy -#~ msgid "Joining" -#~ msgstr "_Join" +#: ../libempathy-gtk/empathy-chat.c:3698 +msgid "Wrong password; please try again:" +msgstr "Wrong password; please try again:" -#, fuzzy -#~ msgid "Active" -#~ msgstr "Actions" +#. Add message +#: ../libempathy-gtk/empathy-chat.c:3828 +msgid "This room is protected by a password:" +msgstr "This room is protected by a password:" -#~ msgid "Unknown" -#~ msgstr "Unknown" +#: ../libempathy-gtk/empathy-chat.c:3855 +msgid "Join" +msgstr "Join" -#, fuzzy -#~ msgid "Error" -#~ msgstr "Last Error" +#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301 +msgid "Connected" +msgstr "Connected" -#, fuzzy -#~ msgid "Participant" -#~ msgid_plural "Participants" -#~ msgstr[0] "Galician" -#~ msgstr[1] "Galician" +#: ../libempathy-gtk/empathy-chat.c:4102 +msgid "Conversation" +msgstr "Conversation" -#, fuzzy -#~ msgid "No affiliation" -#~ msgstr "Use notification sounds" +#. Translators: this string is a something like +#. * "Escher Cat (SMS)" +#: ../libempathy-gtk/empathy-chat.c:4107 +#, c-format +msgid "%s (SMS)" +msgstr "%s (SMS)" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +msgid "Unknown or invalid identifier" +msgstr "Unknown or invalid identifier" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +msgid "Contact blocking temporarily unavailable" +msgstr "Contact blocking temporarily unavailable" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +msgid "Contact blocking unavailable" +msgstr "Contact blocking unavailable" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 +msgid "Permission Denied" +msgstr "Permission Denied" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 +msgid "Could not block contact" +msgstr "Could not block contact" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 +msgid "Edit Blocked Contacts" +msgstr "Edit Blocked Contacts" + +#. Account and Identifier +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 +msgid "Account:" +msgstr "Account:" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2 +msgid "Blocked Contacts" +msgstr "Blocked Contacts" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 +#: ../src/empathy-accounts-dialog.ui.h:2 +#: ../src/empathy-chatrooms-window.ui.h:3 +msgid "Remove" +msgstr "Remove" + +#. Copy Link Address menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:322 +#: ../libempathy-gtk/empathy-webkit-utils.c:277 +msgid "_Copy Link Address" +msgstr "_Copy Link Address" -#~ msgid "The nickname you have chosen is already in use." -#~ msgstr "The nickname you have chosen is already in use." +#. Open Link menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:329 +#: ../libempathy-gtk/empathy-webkit-utils.c:284 +msgid "_Open Link" +msgstr "_Open Link" -#~ msgid "The chat room you tried to join requires a password." -#~ msgstr "The chat room you tried to join requires a password." +#. Translators: timestamp displayed between conversations in +#. * chat windows (strftime format string) +#: ../libempathy-gtk/empathy-chat-text-view.c:417 +msgid "%A %B %d %Y" +msgstr "%A %B %e %Y" -#~ msgid "The remote conference server did not respond in a sensible time." -#~ msgstr "The remote conference server did not respond in a sensible time." +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +msgid "New Contact" +msgstr "New Contact" -#~ msgid "The conference server you tried to join could not be found." -#~ msgstr "The conference server you tried to join could not be found." +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 +#, c-format +msgid "Block %s?" +msgstr "Block %s?" -#, fuzzy -#~ msgid "An unknown error occurred, check your details are correct." -#~ msgstr "Ensure that your details are correct." +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#, c-format +msgid "Are you sure you want to block '%s' from contacting you again?" +msgstr "Are you sure you want to block '%s' from contacting you again?" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +msgid "_Block" +msgstr "_Block" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +msgid "_Report this contact as abusive" +msgid_plural "_Report these contacts as abusive" +msgstr[0] "_Report this contact as abusive" +msgstr[1] "_Report these contacts as abusive" + +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 +msgid "Subscription Request" +msgstr "Subscription Request" + +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 +msgid "_Block User" +msgstr "_Block User" + +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "Decide _Later" +msgstr "Decide _Later" + +#. Title +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 +msgid "Search contacts" +msgstr "Search contacts" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 +msgid "Search: " +msgstr "Search: " + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 +msgid "_Add Contact" +msgstr "_Add Contact" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 +msgid "No contacts found" +msgstr "No contacts found" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 +msgid "Your message introducing yourself:" +msgstr "Your message introducing yourself:" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 +msgid "Please let me see when you're online. Thanks!" +msgstr "Please let me see when you're online. Thanks!" + +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 +msgid "Channels:" +msgstr "Channels:" + +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 +msgid "Country ISO Code:" +msgstr "Country ISO Code:" + +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 +msgid "Country:" +msgstr "Country:" + +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 +msgid "State:" +msgstr "State:" + +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 +msgid "City:" +msgstr "City:" + +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 +msgid "Area:" +msgstr "Area:" + +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 +msgid "Postal Code:" +msgstr "Postal Code:" + +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 +msgid "Street:" +msgstr "Street:" + +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 +msgid "Building:" +msgstr "Building:" + +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 +msgid "Floor:" +msgstr "Floor:" + +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 +msgid "Room:" +msgstr "Room:" + +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 +msgid "Text:" +msgstr "Text:" + +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 +msgid "Description:" +msgstr "Description:" + +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 +msgid "URI:" +msgstr "URI:" + +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 +msgid "Accuracy Level:" +msgstr "Accuracy Level:" + +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 +msgid "Error:" +msgstr "Error:" + +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 +msgid "Vertical Error (meters):" +msgstr "Vertical Error (metres):" + +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 +msgid "Horizontal Error (meters):" +msgstr "Horizontal Error (metres):" + +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 +msgid "Speed:" +msgstr "Speed:" + +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 +msgid "Bearing:" +msgstr "Bearing:" + +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 +msgid "Climb Speed:" +msgstr "Climb Speed:" + +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 +msgid "Last Updated on:" +msgstr "Last Updated on:" + +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 +msgid "Longitude:" +msgstr "Longitude:" + +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 +msgid "Latitude:" +msgstr "Latitude:" + +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 +msgid "Altitude:" +msgstr "Altitude:" + +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:35 +msgid "Location" +msgstr "Location" + +#. translators: format is "Location, $date" +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 +#, c-format +msgid "%s, %s" +msgstr "%s, %s" + +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 +msgid "%B %e, %Y at %R UTC" +msgstr "%B %e, %Y at %I:%M %p UTC" + +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 +msgid "Save Avatar" +msgstr "Save Avatar" + +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 +msgid "Unable to save avatar" +msgstr "Unable to save avatar" + +#: ../libempathy-gtk/empathy-contact-widget.c:1446 +msgid "Personal Details" +msgstr "Personal Details" + +#: ../libempathy-gtk/empathy-contact-widget.c:1449 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +msgid "Contact Details" +msgstr "Contact Details" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +msgid "Full name" +msgstr "Full name" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "Phone number" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "E-mail address" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +msgid "Website" +msgstr "Website" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +msgid "Birthday" +msgstr "Birthday" + +#. 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:113 +msgid "Last seen:" +msgstr "Last seen:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +msgid "Connected from:" +msgstr "Connected from:" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +msgid "Away message:" +msgstr "Away message:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +msgid "work" +msgstr "work" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +msgid "home" +msgstr "home" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +msgid "mobile" +msgstr "mobile" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +msgid "voice" +msgstr "voice" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +msgid "preferred" +msgstr "preferred" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "postal" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +msgid "parcel" +msgstr "parcel" + +#. Identifier to connect to Instant Messaging network +#. Translators: Identifier to connect to Instant Messaging network +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 +msgid "Identifier:" +msgstr "Identifier:" + +#. Alias +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 +msgid "Alias:" +msgstr "Alias:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Location at (date)\t" +msgstr "Location at (date)\t" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +msgid "Information requested…" +msgstr "Information requested…" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Client Information" +msgstr "Client Information" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 +msgid "OS:" +msgstr "OS:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +msgid "Version:" +msgstr "Version:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Client:" +msgstr "Client:" + +#: ../libempathy-gtk/empathy-groups-widget.c:331 +msgid "Groups" +msgstr "Groups" + +#: ../libempathy-gtk/empathy-groups-widget.c:343 +msgid "" +"Select the groups you want this contact to appear in. Note that you can " +"select more than one group or no groups." +msgstr "" +"Select the groups you want this contact to appear in. Note that you can " +"select more than one group or no groups." -#, fuzzy -#~ msgid "Unavailable" -#~ msgstr "Service Unavailable" +#: ../libempathy-gtk/empathy-groups-widget.c:362 +msgid "_Add Group" +msgstr "_Add Group" -#, fuzzy -#~ msgid "An unknown error occurred." -#~ msgstr "An unknown error occurred." +#: ../libempathy-gtk/empathy-groups-widget.c:397 +msgctxt "verb in a column header displaying group names" +msgid "Select" +msgstr "Select" -#~ msgid "Connection refused." -#~ msgstr "Connection refused." +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1951 +msgid "Group" +msgstr "Group" -#~ msgid "Server address could not be resolved." -#~ msgstr "Server address could not be resolved." +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 +msgid "The following identity will be blocked:" +msgid_plural "The following identities will be blocked:" +msgstr[0] "The following identity will be blocked:" +msgstr[1] "The following identities will be blocked:" + +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 +msgid "The following identity can not be blocked:" +msgid_plural "The following identities can not be blocked:" +msgstr[0] "The following identity can not be blocked:" +msgstr[1] "The following identities can not be blocked:" + +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Edit Contact Information" + +#. 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:172 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../libempathy-gtk/empathy-individual-menu.c:344 +msgid "Select account to use to place the call" +msgstr "Select account to use to place the call" + +#. translators: Call is a noun. This string is used in the window +#. * title +#: ../libempathy-gtk/empathy-individual-menu.c:348 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:18 +msgid "Call" +msgstr "Call" + +#: ../libempathy-gtk/empathy-individual-menu.c:413 +msgid "Mobile" +msgstr "Mobile" + +#: ../libempathy-gtk/empathy-individual-menu.c:415 +msgid "Work" +msgstr "Work" + +#: ../libempathy-gtk/empathy-individual-menu.c:417 +msgid "HOME" +msgstr "HOME" + +#: ../libempathy-gtk/empathy-individual-menu.c:658 +msgid "_Block Contact" +msgstr "_Block Contact" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1017 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:1 +msgid "_Chat" +msgstr "_Chat" -#~ msgid "Connection timed out." -#~ msgstr "Connection timed out." +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:1052 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 +msgid "_SMS" +msgstr "_SMS" + +#: ../libempathy-gtk/empathy-individual-menu.c:1085 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Audio Call" + +#: ../libempathy-gtk/empathy-individual-menu.c:1118 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Video Call" + +#: ../libempathy-gtk/empathy-individual-menu.c:1159 +#: ../src/empathy-roster-window-menubar.ui.h:4 +msgid "_Previous Conversations" +msgstr "_Previous Conversations" + +#: ../libempathy-gtk/empathy-individual-menu.c:1188 +msgid "Send File" +msgstr "Send File" + +#: ../libempathy-gtk/empathy-individual-menu.c:1218 +msgid "Share My Desktop" +msgstr "Share My Desktop" + +#: ../libempathy-gtk/empathy-individual-menu.c:1244 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Favourite" + +#: ../libempathy-gtk/empathy-individual-menu.c:1263 +msgid "gnome-contacts not installed" +msgstr "gnome-contacts not installed" + +#: ../libempathy-gtk/empathy-individual-menu.c:1266 +msgid "Please install gnome-contacts to access contacts details." +msgstr "Please install gnome-contacts to access contacts details." + +#: ../libempathy-gtk/empathy-individual-menu.c:1377 +msgid "Infor_mation" +msgstr "Infor_mation" -#~ msgid "Authentication failed." -#~ msgstr "Authentication failed." +#: ../libempathy-gtk/empathy-individual-menu.c:1426 +msgctxt "Edit individual (contextual menu)" +msgid "_Edit" +msgstr "_Edit" -#, fuzzy -#~ msgid "The username you are trying already exists." -#~ msgstr "The nickname you have chosen is already in use." +#: ../libempathy-gtk/empathy-individual-menu.c:1543 +#: ../src/empathy-chat-window.c:1166 +msgid "Inviting you to this room" +msgstr "Inviting you to this room" -#, fuzzy -#~ msgid "The username you are trying is not valid." -#~ msgstr "The nickname you have chosen is already in use." +#: ../libempathy-gtk/empathy-individual-menu.c:1589 +msgid "_Invite to Chat Room" +msgstr "_Invite to Chat Room" -#, fuzzy -#~ msgid "This feature is unavailable." -#~ msgstr "No accounts available." +#: ../libempathy-gtk/empathy-individual-menu.c:1785 +#: ../src/empathy-roster-window-menubar.ui.h:5 +msgid "_Add Contact…" +msgstr "_Add Contact…" -#, fuzzy -#~ msgid "new account" -#~ msgstr "Account" +#: ../libempathy-gtk/empathy-individual-view.c:2306 +msgid "Delete and _Block" +msgstr "Delete and _Block" -#~ msgid "Home" -#~ msgstr "Home" +#: ../libempathy-gtk/empathy-individual-view.c:2341 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Do you really want to remove the group '%s'?" -#~ msgid "Couldn't send message!" -#~ msgstr "Could not send message." +#: ../libempathy-gtk/empathy-individual-view.c:2344 +msgid "Removing group" +msgstr "Removing group" -#~ msgid "Connection could not be opened" -#~ msgstr "Connection could not be opened" +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2399 +#: ../libempathy-gtk/empathy-individual-view.c:2603 +msgid "_Remove" +msgstr "_Remove" -#, fuzzy -#~ msgid "This service is unavailable or not found" -#~ msgstr "No accounts available." +#: ../libempathy-gtk/empathy-individual-view.c:2476 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Do you really want to remove the contact '%s'?" -#, fuzzy -#~ msgid "Registration is required" -#~ msgstr "Registration Required" +#: ../libempathy-gtk/empathy-individual-view.c:2485 +#, 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 "" +"Do you really want to remove the linked contact '%s'? Note that this will " +"remove all the contacts which make up this linked contact." -#, fuzzy -#~ msgid "There was an internal service error" -#~ msgstr "Internal Server Error" +#: ../libempathy-gtk/empathy-individual-view.c:2497 +msgid "Removing contact" +msgstr "Removing contact" -#, fuzzy -#~ msgid "This feature is not implemented" -#~ msgstr "No accounts available." +#: ../libempathy-gtk/empathy-individual-widget.c:1641 +#, c-format +msgid "Linked contact containing %u contact" +msgid_plural "Linked contacts containing %u contacts" +msgstr[0] "Linked contact containing %u contact" +msgstr[1] "Linked contacts containing %u contacts" -#, fuzzy -#~ msgid "The remote service timed out" -#~ msgstr "Remote Server Timeout" +#: ../libempathy-gtk/empathy-individual-widget.ui.h:1 +msgid "Location at (date)" +msgstr "Location at (date)" -#~ msgid "Disconnect" -#~ msgstr "Disconnect" +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 +msgid "Online from a phone or mobile device" +msgstr "Online from a phone or mobile device" -#~ msgid "Connect" -#~ msgstr "Connect" +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 +msgid "New Network" +msgstr "New Network" -#, fuzzy -#~ msgid "Successfully registered your new account settings." -#~ msgstr "Successfully registered the account" +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 +msgid "Choose an IRC network" +msgstr "Choose an IRC network" -#, fuzzy -#~ msgid "Failed to register your new account settings." -#~ msgstr "Failed registering the account" +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 +msgid "Reset _Networks List" +msgstr "Reset _Networks List" -#, fuzzy -#~ msgid "Successfully changed your account password." -#~ msgstr "Please enter your password:" +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 +msgctxt "verb displayed on a button to select an IRC network" +msgid "Select" +msgstr "Select" -#, fuzzy -#~ msgid "Failed to change your account password." -#~ msgstr "Please enter your password:" +#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +msgid "new server" +msgstr "new server" -#, fuzzy -#~ msgid "" -#~ "Please enter a new password for this account:\n" -#~ "%s" -#~ msgstr "" -#~ "Please enter a new name for the group:\n" -#~ "%s" +#: ../libempathy-gtk/empathy-irc-network-dialog.c:535 +msgid "SSL" +msgstr "SSL" -#~ msgid "No information is available for this contact." -#~ msgstr "No information is available for this contact." +#: ../libempathy-gtk/empathy-log-window.c:622 +msgid "History" +msgstr "History" -#~ msgid "Information requested, please wait..." -#~ msgstr "Information requested, please wait..." +#: ../libempathy-gtk/empathy-log-window.c:677 +msgid "Show" +msgstr "Show" -#~ msgid "I would like to add you to my contact list." -#~ msgstr "I would like to add you to my contact list." +#: ../libempathy-gtk/empathy-log-window.c:699 +msgid "Search" +msgstr "Search" -#~ msgid "To summarize:" -#~ msgstr "To summarize:" +#: ../libempathy-gtk/empathy-log-window.c:1150 +#, c-format +msgid "Chat in %s" +msgstr "Chat in %s" -#, fuzzy -#~ msgid "%d new message" -#~ msgid_plural "%d new messages" -#~ msgstr[0] "_New Message..." -#~ msgstr[1] "_New Message..." +#: ../libempathy-gtk/empathy-log-window.c:1152 +#, c-format +msgid "Chat with %s" +msgstr "Chat with %s" -#, fuzzy -#~ msgid "%d subscription request" -#~ msgid_plural "%d subscription requests" -#~ msgstr[0] "Gossip - Subscription Request" -#~ msgstr[1] "Gossip - Subscription Request" +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 +msgctxt "A date with the time" +msgid "%A, %e %B %Y %X" +msgstr "%A, %e %B %Y %X" -#, fuzzy -#~ msgid "%d file transfer request" -#~ msgid_plural "%d file transfer requests" -#~ msgstr[0] "Gossip - File Transfer Request" -#~ msgstr[1] "Gossip - File Transfer Request" +#. Translators: this is an emote: '* Danielle waves' +#: ../libempathy-gtk/empathy-log-window.c:1291 +#, c-format +msgid "* %s %s" +msgstr "* %s %s" -#, fuzzy -#~ msgid "%d server message" -#~ msgid_plural "%d server messages" -#~ msgstr[0] "Could not send message." -#~ msgstr[1] "Could not send message." +#. Translators: this is a message: 'Danielle: hello' +#. * The string in bold is the sender's name +#: ../libempathy-gtk/empathy-log-window.c:1297 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" -#, fuzzy -#~ msgid "%d error" -#~ msgid_plural "%d errors" -#~ msgstr[0] "Last Error" -#~ msgstr[1] "Last Error" +#: ../libempathy-gtk/empathy-log-window.c:1373 +#, c-format +msgid "%s second" +msgid_plural "%s seconds" +msgstr[0] "%s second" +msgstr[1] "%s seconds" -#, fuzzy -#~ msgid "If you quit, you will lose all unread information." -#~ msgstr "If you quit, you will loose all unread information." +#: ../libempathy-gtk/empathy-log-window.c:1380 +#, c-format +msgid "%s minute" +msgid_plural "%s minutes" +msgstr[0] "%s minute" +msgstr[1] "%s minutes" -#, fuzzy -#~ msgid "Edit Account _Details" -#~ msgstr "Edit your chat room details:" +#: ../libempathy-gtk/empathy-log-window.c:1388 +#, c-format +msgid "Call took %s, ended at %s" +msgstr "Call took %s, ended at %s" + +#: ../libempathy-gtk/empathy-log-window.c:1722 +msgid "Today" +msgstr "Today" + +#: ../libempathy-gtk/empathy-log-window.c:1726 +msgid "Yesterday" +msgstr "Yesterday" + +#. Translators: A date such as '23 May 2010' (strftime format) +#: ../libempathy-gtk/empathy-log-window.c:1741 +msgid "%e %B %Y" +msgstr "%e %B %Y" + +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 +msgid "Anytime" +msgstr "Anytime" + +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 +msgid "Anyone" +msgstr "Anyone" + +#: ../libempathy-gtk/empathy-log-window.c:2715 +msgid "Who" +msgstr "Who" + +#: ../libempathy-gtk/empathy-log-window.c:2924 +msgid "When" +msgstr "When" + +#: ../libempathy-gtk/empathy-log-window.c:3040 +msgid "Anything" +msgstr "Anything" + +#: ../libempathy-gtk/empathy-log-window.c:3042 +msgid "Text chats" +msgstr "Text chats" + +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:25 +msgid "Calls" +msgstr "Calls" + +#: ../libempathy-gtk/empathy-log-window.c:3049 +msgid "Incoming calls" +msgstr "Incoming calls" + +#: ../libempathy-gtk/empathy-log-window.c:3050 +msgid "Outgoing calls" +msgstr "Outgoing calls" + +#: ../libempathy-gtk/empathy-log-window.c:3051 +msgid "Missed calls" +msgstr "Missed calls" + +#: ../libempathy-gtk/empathy-log-window.c:3073 +msgid "What" +msgstr "What" + +#: ../libempathy-gtk/empathy-log-window.c:3782 +msgid "Are you sure you want to delete all logs of previous conversations?" +msgstr "Are you sure you want to delete all logs of previous conversations?" + +#: ../libempathy-gtk/empathy-log-window.c:3786 +msgid "Clear All" +msgstr "Clear All" + +#: ../libempathy-gtk/empathy-log-window.c:3793 +msgid "Delete from:" +msgstr "Delete from:" + +#: ../libempathy-gtk/empathy-log-window.ui.h:1 +msgid "_File" +msgstr "_File" + +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:12 +msgid "_Edit" +msgstr "_Edit" -#~ msgid "Word" -#~ msgstr "Word" +#: ../libempathy-gtk/empathy-log-window.ui.h:3 +msgid "Delete All History..." +msgstr "Delete All History..." -#~ msgid "New message from %s" -#~ msgstr "New message from %s" +#: ../libempathy-gtk/empathy-log-window.ui.h:4 +msgid "Profile" +msgstr "Profile" -#, fuzzy -#~ msgid "Your invitation has been declined" -#~ msgstr "Your file transfer offer was declined." +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:19 +msgid "Chat" +msgstr "Chat" -#~ msgid "Accept" -#~ msgstr "Accept" +#: ../libempathy-gtk/empathy-log-window.ui.h:7 +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "Video" +msgstr "Video" + +#: ../libempathy-gtk/empathy-log-window.ui.h:8 +msgid "page 2" +msgstr "page 2" + +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "Loading..." +msgstr "Loading..." + +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 +msgid "The contact is offline" +msgstr "The contact is offline" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 +msgid "The specified contact is either invalid or unknown" +msgstr "The specified contact is either invalid or unknown" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 +msgid "The contact does not support this kind of conversation" +msgstr "The contact does not support this kind of conversation" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 +msgid "The requested functionality is not implemented for this protocol" +msgstr "The requested functionality is not implemented for this protocol" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 +msgid "Could not start a conversation with the given contact" +msgstr "Could not start a conversation with the given contact" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 +msgid "You are banned from this channel" +msgstr "You are banned from this channel" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 +msgid "This channel is full" +msgstr "This channel is full" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 +msgid "You must be invited to join this channel" +msgstr "You must be invited to join this channel" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 +msgid "Can't proceed while disconnected" +msgstr "Can't proceed while disconnected" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 +msgid "Permission denied" +msgstr "Permission denied" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 +msgid "There was an error starting the conversation" +msgstr "There was an error starting the conversation" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 +msgid "Enter a contact identifier or phone number:" +msgstr "Enter a contact identifier or phone number:" + +#. Tweak the dialog +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 +msgid "New Conversation" +msgstr "New Conversation" + +#. add video button +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +msgid "_Video Call" +msgstr "_Video Call" + +#. add audio button +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 +msgid "_Audio Call" +msgstr "_Audio Call" + +#. Tweak the dialog +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 +msgid "New Call" +msgstr "New Call" + +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Authentification failed for account %s" -#, fuzzy -#~ msgid "Name" -#~ msgstr "Name:" +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 +#, c-format +msgid "" +"Enter your password for account\n" +"%s" +msgstr "" +"Enter your password for account\n" +"%s" + +#. COL_STATUS_TEXT +#. COL_STATE_ICON_NAME +#. COL_STATE +#. COL_DISPLAY_MARKUP +#. COL_STATUS_CUSTOMISABLE +#. COL_TYPE +#: ../libempathy-gtk/empathy-presence-chooser.c:167 +#: ../libempathy-gtk/empathy-presence-chooser.c:203 +msgid "Custom Message…" +msgstr "Custom Message…" + +#: ../libempathy-gtk/empathy-presence-chooser.c:220 +#: ../libempathy-gtk/empathy-presence-chooser.c:222 +msgid "Edit Custom Messages…" +msgstr "Edit Custom Messages…" + +#: ../libempathy-gtk/empathy-presence-chooser.c:345 +msgid "Click to remove this status as a favorite" +msgstr "Click to remove this status as a favourite" + +#: ../libempathy-gtk/empathy-presence-chooser.c:354 +msgid "Click to make this status a favorite" +msgstr "Click to make this status a favourite" + +#: ../libempathy-gtk/empathy-presence-chooser.c:388 +msgid "Set status" +msgstr "Set status" + +#. Custom messages +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 +msgid "Custom messages…" +msgstr "Custom messages…" + +#. Create account +#. To translator: %s is the name of the protocol, such as "Google Talk" or +#. * "Yahoo!" +#. +#: ../libempathy-gtk/empathy-protocol-chooser.c:584 +#, c-format +msgid "New %s account" +msgstr "New %s account" -#, fuzzy -#~ msgid "Room" -#~ msgstr "_Room:" +#: ../libempathy-gtk/empathy-search-bar.ui.h:1 +msgid "Find:" +msgstr "Find:" -#, fuzzy -#~ msgid "Auto Connect" -#~ msgstr "Stop Connecting" +#: ../libempathy-gtk/empathy-search-bar.ui.h:2 +msgid "_Previous" +msgstr "_Previous" -#, fuzzy -#~ msgid "Information requested..." -#~ msgstr "Information requested, please wait..." +#: ../libempathy-gtk/empathy-search-bar.ui.h:3 +msgid "_Next" +msgstr "_Next" -#, fuzzy -#~ msgid "Do you want to remove this contact from your roster?" -#~ msgstr "" -#~ "Do you want to remove the contact\n" -#~ "%s\n" -#~ "from your contact list?" +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "Mat_ch case" +msgstr "Mat_ch case" -#~ msgid "" -#~ "Please enter a new name for the group:\n" -#~ "%s" -#~ msgstr "" -#~ "Please enter a new name for the group:\n" -#~ "%s" +#: ../libempathy-gtk/empathy-search-bar.ui.h:5 +msgid "Phrase not found" +msgstr "Phrase not found" -#~ msgid "Select" -#~ msgstr "Select" +#: ../libempathy-gtk/empathy-sound-manager.c:51 +msgid "Received an instant message" +msgstr "Received an instant message" -#~ msgid "Unsorted" -#~ msgstr "Unsorted" +#: ../libempathy-gtk/empathy-sound-manager.c:53 +msgid "Sent an instant message" +msgstr "Sent an instant message" -#~ msgid "New file transfer request from %s" -#~ msgstr "New file transfer request from %s" +#: ../libempathy-gtk/empathy-sound-manager.c:55 +msgid "Incoming chat request" +msgstr "Incoming chat request" -#~ msgid "File transfer is not supported by both parties." -#~ msgstr "File transfer is not supported by both parties." +#: ../libempathy-gtk/empathy-sound-manager.c:57 +msgid "Contact connected" +msgstr "Contact connected" -#~ msgid "Your file transfer offer declined." -#~ msgstr "Your file transfer offer was declined." +#: ../libempathy-gtk/empathy-sound-manager.c:59 +msgid "Contact disconnected" +msgstr "Contact disconnected" -#~ msgid "The other user decided not to continue." -#~ msgstr "The other user decided not to continue." +#: ../libempathy-gtk/empathy-sound-manager.c:61 +msgid "Connected to server" +msgstr "Connected to server" -#, fuzzy -#~ msgid "Unknown error occurred during file transfer." -#~ msgstr "Unknown error occured during file transfer." +#: ../libempathy-gtk/empathy-sound-manager.c:63 +msgid "Disconnected from server" +msgstr "Disconnected from server" -#~ msgid "%s would like to send you a file." -#~ msgstr "%s would like to send you a file." +#: ../libempathy-gtk/empathy-sound-manager.c:65 +msgid "Incoming voice call" +msgstr "Incoming voice call" -#~ msgid "Someone would like to send you a file." -#~ msgstr "Someone would like to send you a file." +#: ../libempathy-gtk/empathy-sound-manager.c:67 +msgid "Outgoing voice call" +msgstr "Outgoing voice call" -#~ msgid "Select a file" -#~ msgstr "Select a file" +#: ../libempathy-gtk/empathy-sound-manager.c:69 +msgid "Voice call ended" +msgstr "Voice call ended" -#, fuzzy -#~ msgid "Connecting..." -#~ msgstr "Connecting" +#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +msgid "Edit Custom Messages" +msgstr "Edit Custom Messages" -#, fuzzy -#~ msgid "Retry connection" -#~ msgstr "Stop Connecting" +#: ../libempathy-gtk/empathy-theme-adium.c:1051 +#, c-format +msgid "Message edited at %s" +msgstr "Message edited at %s" -#~ msgid "Invited %s to join this chat conference." -#~ msgstr "Invited %s to join this chat conference." +#: ../libempathy-gtk/empathy-theme-adium.c:1757 +msgid "Normal" +msgstr "Normal" -#, fuzzy -#~ msgid "Enter the new topic you want to set for this room:" -#~ msgstr "What nickname do you want to use for this contact?" +#: ../libempathy-gtk/empathy-theme-manager.c:70 +msgid "Classic" +msgstr "Classic" -#, fuzzy -#~ msgid "Topic: %s" -#~ msgstr "_Topic:" +#: ../libempathy-gtk/empathy-theme-manager.c:71 +msgid "Simple" +msgstr "Simple" -#~ msgid "Account" -#~ msgstr "Account" +#: ../libempathy-gtk/empathy-theme-manager.c:72 +msgid "Clean" +msgstr "Clean" -#, fuzzy -#~ msgid "Conversation With" -#~ msgstr "_Conversation" +#: ../libempathy-gtk/empathy-theme-manager.c:73 +msgid "Blue" +msgstr "Blue" -#~ msgid "List the available accounts" -#~ msgstr "List the available accounts" +#: ../libempathy-gtk/empathy-tls-dialog.c:150 +msgid "The identity provided by the chat server cannot be verified." +msgstr "The identity provided by the chat server cannot be verified." -#~ msgid "Which account to connect to on startup" -#~ msgstr "Which account to connect to on startup" +#: ../libempathy-gtk/empathy-tls-dialog.c:157 +msgid "The certificate is not signed by a Certification Authority." +msgstr "The certificate is not signed by a Certification Authority." -#~ msgid "ACCOUNT-NAME" -#~ msgstr "ACCOUNT-NAME" +#: ../libempathy-gtk/empathy-tls-dialog.c:161 +msgid "The certificate has expired." +msgstr "The certificate has expired." -#~ msgid "No accounts available." -#~ msgstr "No accounts available." +#: ../libempathy-gtk/empathy-tls-dialog.c:164 +msgid "The certificate hasn't yet been activated." +msgstr "The certificate hasn't yet been activated." -#~ msgid "Available accounts:" -#~ msgstr "Available accounts:" +#: ../libempathy-gtk/empathy-tls-dialog.c:167 +msgid "The certificate does not have the expected fingerprint." +msgstr "The certificate does not have the expected fingerprint." -#~ msgid "[default]" -#~ msgstr "[default]" +#: ../libempathy-gtk/empathy-tls-dialog.c:170 +msgid "The hostname verified by the certificate doesn't match the server name." +msgstr "" +"The hostname verified by the certificate doesn't match the server name." -#~ msgid "There is no account with the name '%s'." -#~ msgstr "There is no account with the name '%s'." +#: ../libempathy-gtk/empathy-tls-dialog.c:174 +msgid "The certificate is self-signed." +msgstr "The certificate is self-signed." -#, fuzzy -#~ msgid "Join" -#~ msgstr "_Join" +#: ../libempathy-gtk/empathy-tls-dialog.c:177 +msgid "" +"The certificate has been revoked by the issuing Certification Authority." +msgstr "" +"The certificate has been revoked by the issuing Certification Authority." -#, fuzzy -#~ msgid "Create" -#~ msgstr "Chat" +#: ../libempathy-gtk/empathy-tls-dialog.c:181 +msgid "The certificate is cryptographically weak." +msgstr "The certificate is cryptographically weak." -#, fuzzy -#~ msgid "Chat Rooms" -#~ msgstr "Chat Room:" +#: ../libempathy-gtk/empathy-tls-dialog.c:184 +msgid "The certificate length exceeds verifiable limits." +msgstr "The certificate length exceeds verifiable limits." -#, fuzzy -#~ msgid "Browsing for conference rooms, please wait..." -#~ msgstr "Trying to join chat room, please wait..." +#: ../libempathy-gtk/empathy-tls-dialog.c:188 +msgid "The certificate is malformed." +msgstr "The certificate is malformed." -#, fuzzy -#~ msgid "Default" -#~ msgstr "[default]" +#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#, c-format +msgid "Expected hostname: %s" +msgstr "Expected hostname: %s" -#, fuzzy -#~ msgid "Chat!" -#~ msgstr "Chat" +#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#, c-format +msgid "Certificate hostname: %s" +msgstr "Certificate hostname: %s" -#~ msgid "%s wants to be added to your contact list." -#~ msgstr "%s wants to be added to your contact list." +#: ../libempathy-gtk/empathy-tls-dialog.c:281 +msgid "Continue" +msgstr "Continue" -#~ msgid "Someone wants to be added to your contact list." -#~ msgstr "Someone wants to be added to your contact list." +#: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "Untrusted connection" -#, fuzzy -#~ msgid "Subscription request" -#~ msgstr "Gossip - Subscription Request" +#: ../libempathy-gtk/empathy-tls-dialog.c:288 +msgid "This connection is untrusted. Would you like to continue anyway?" +msgstr "This connection is untrusted. Would you like to continue anyway?" -#, fuzzy -#~ msgid "Contact Information" -#~ msgstr "Contact _Information" +#: ../libempathy-gtk/empathy-tls-dialog.c:298 +msgid "Remember this choice for future connections" +msgstr "Remember this choice for future connections" -#~ msgid "Suggestions for the word" -#~ msgstr "Suggestions for the word" +#: ../libempathy-gtk/empathy-tls-dialog.c:304 +msgid "Certificate Details" +msgstr "Certificate Details" -#~ msgid "New subscription request from %s" -#~ msgstr "New subscription request from %s" +#: ../libempathy-gtk/empathy-ui-utils.c:1741 +msgid "Unable to open URI" +msgstr "Unable to open URI" -#~ msgid "Do you want to add this person to your contact list?" -#~ msgstr "Do you want to add this person to your contact list?" +#: ../libempathy-gtk/empathy-ui-utils.c:1859 +msgid "Select a file" +msgstr "Select a file" -#~ msgid "Do you want to add %s to your contact list?" -#~ msgstr "Do you want to add %s to your contact list?" +#: ../libempathy-gtk/empathy-ui-utils.c:1934 +msgid "Insufficient free space to save file" +msgstr "Insufficient free space to save file" -#, fuzzy -#~ msgid "Please enter your %s account password" -#~ msgstr "Please enter your password:" +#: ../libempathy-gtk/empathy-ui-utils.c:1942 +#, c-format +msgid "" +"%s of free space are required to save this file, but only %s is available. " +"Please choose another location." +msgstr "" +"%s of free space are required to save this file, but only %s is available. " +"Please choose another location." -#~ msgid "Remember Password?" -#~ msgstr "Remember Password?" +#: ../libempathy-gtk/empathy-ui-utils.c:1986 +#, c-format +msgid "Incoming file from %s" +msgstr "Incoming file from %s" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +msgid "Current Locale" +msgstr "Current Locale" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:161 +#: ../libempathy-gtk/totem-subtitle-encoding.c:163 +#: ../libempathy-gtk/totem-subtitle-encoding.c:165 +#: ../libempathy-gtk/totem-subtitle-encoding.c:167 +msgid "Arabic" +msgstr "Arabic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +msgid "Armenian" +msgstr "Armenian" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:173 +#: ../libempathy-gtk/totem-subtitle-encoding.c:175 +#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +msgid "Baltic" +msgstr "Baltic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +msgid "Celtic" +msgstr "Celtic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:183 +#: ../libempathy-gtk/totem-subtitle-encoding.c:185 +#: ../libempathy-gtk/totem-subtitle-encoding.c:187 +#: ../libempathy-gtk/totem-subtitle-encoding.c:189 +msgid "Central European" +msgstr "Central European" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:192 +#: ../libempathy-gtk/totem-subtitle-encoding.c:194 +#: ../libempathy-gtk/totem-subtitle-encoding.c:196 +#: ../libempathy-gtk/totem-subtitle-encoding.c:198 +msgid "Chinese Simplified" +msgstr "Chinese Simplified" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:201 +#: ../libempathy-gtk/totem-subtitle-encoding.c:203 +#: ../libempathy-gtk/totem-subtitle-encoding.c:205 +msgid "Chinese Traditional" +msgstr "Chinese Traditional" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +msgid "Croatian" +msgstr "Croatian" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:211 +#: ../libempathy-gtk/totem-subtitle-encoding.c:213 +#: ../libempathy-gtk/totem-subtitle-encoding.c:215 +#: ../libempathy-gtk/totem-subtitle-encoding.c:217 +#: ../libempathy-gtk/totem-subtitle-encoding.c:219 +#: ../libempathy-gtk/totem-subtitle-encoding.c:221 +msgid "Cyrillic" +msgstr "Cyrillic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +msgid "Cyrillic/Russian" +msgstr "Cyrillic/Russian" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:227 +#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +msgid "Cyrillic/Ukrainian" +msgstr "Cyrillic/Ukrainian" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +msgid "Georgian" +msgstr "Georgian" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:235 +#: ../libempathy-gtk/totem-subtitle-encoding.c:237 +#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +msgid "Greek" +msgstr "Greek" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +msgid "Gujarati" +msgstr "Gujarati" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +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 +msgid "Hebrew" +msgstr "Hebrew" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +msgid "Hebrew Visual" +msgstr "Hebrew Visual" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +msgid "Hindi" +msgstr "Hindi" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +msgid "Icelandic" +msgstr "Icelandic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:266 +#: ../libempathy-gtk/totem-subtitle-encoding.c:268 +#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +msgid "Japanese" +msgstr "Japanese" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:273 +#: ../libempathy-gtk/totem-subtitle-encoding.c:275 +#: ../libempathy-gtk/totem-subtitle-encoding.c:277 +#: ../libempathy-gtk/totem-subtitle-encoding.c:279 +msgid "Korean" +msgstr "Korean" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +msgid "Nordic" +msgstr "Nordic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +msgid "Persian" +msgstr "Persian" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:288 +#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +msgid "Romanian" +msgstr "Romanian" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +msgid "South European" +msgstr "South European" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +msgid "Thai" +msgstr "Thai" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:299 +#: ../libempathy-gtk/totem-subtitle-encoding.c:301 +#: ../libempathy-gtk/totem-subtitle-encoding.c:303 +#: ../libempathy-gtk/totem-subtitle-encoding.c:305 +msgid "Turkish" +msgstr "Turkish" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:308 +#: ../libempathy-gtk/totem-subtitle-encoding.c:310 +#: ../libempathy-gtk/totem-subtitle-encoding.c:312 +#: ../libempathy-gtk/totem-subtitle-encoding.c:314 +#: ../libempathy-gtk/totem-subtitle-encoding.c:316 +msgid "Unicode" +msgstr "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 +msgid "Western" +msgstr "Western" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:330 +#: ../libempathy-gtk/totem-subtitle-encoding.c:332 +#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +msgid "Vietnamese" +msgstr "Vietnamese" + +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 +msgid "No error message" +msgstr "No error message" + +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 +msgid "Instant Message (Empathy)" +msgstr "Instant Message (Empathy)" + +#: ../src/empathy.c:437 +msgid "Don't connect on startup" +msgstr "Don't connect on startup" -#~ msgid "Could not display the help contents." -#~ msgstr "Could not display the help contents." +#: ../src/empathy.c:441 +msgid "Don't display the contact list or any other dialogs on startup" +msgstr "Don't display the contact list or any other dialogs on startup" -#, fuzzy -#~ msgid "Select Your Avatar Image" -#~ msgstr "Select another and try again" +#: ../src/empathy.c:456 +msgid "- Empathy IM Client" +msgstr "- Empathy IM Client" -#~ msgid "The server does not seem to be responding." -#~ msgstr "The server does not seem to be responding." +#: ../src/empathy.c:643 +msgid "Error contacting the Account Manager" +msgstr "Error contacting the Account Manager" -#~ msgid "Try again later." -#~ msgstr "Try again later." +#: ../src/empathy.c:645 +#, c-format +msgid "" +"There was an error while trying to connect to the Telepathy Account Manager. " +"The error was:\n" +"\n" +"%s" +msgstr "" +"There was an error while trying to connect to the Telepathy Account Manager. " +"The error was:\n" +"\n" +"%s" -#, fuzzy -#~ msgid "Change" -#~ msgstr "Chat" +#: ../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 is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public Licence as published by the Free Software " +"Foundation; either version 2 of the Licence, or (at your option) any later " +"version." -#~ msgid "Contact goes offline" -#~ msgstr "Contact goes offline" +#: ../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 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 Licence for more " +"details." -#~ msgid "Contact goes online" -#~ msgstr "Contact goes online" +#: ../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 "" +"You should have received a copy of the GNU General Public Licence along with " +"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " +"Street, Fifth Floor, Boston, MA 02110-130159 USA" -#~ msgid "Contact ID:" -#~ msgstr "Contact ID:" +#: ../src/empathy-about-dialog.c:109 +msgid "An Instant Messaging client for GNOME" +msgstr "An Instant Messaging client for GNOME" -#~ msgid "Do you want to accept this file?" -#~ msgstr "Do you want to accept this file?" +#: ../src/empathy-about-dialog.c:115 +msgid "translator-credits" +msgstr "" +"Adam Weinberger\n" +"Tiffany Antopolski" -#, fuzzy -#~ msgid "File Transfer Request" -#~ msgstr "Gossip - File Transfer Request" +#: ../src/empathy-account-assistant.c:167 +msgid "There was an error while importing the accounts." +msgstr "There was an error while importing the accounts." -#~ msgid "File name:" -#~ msgstr "File name:" +#: ../src/empathy-account-assistant.c:170 +msgid "There was an error while parsing the account details." +msgstr "There was an error while parsing the account details." -#~ msgid "File size:" -#~ msgstr "File size:" +#: ../src/empathy-account-assistant.c:173 +msgid "There was an error while creating the account." +msgstr "There was an error while creating the account." -#, fuzzy -#~ msgid "Not supported yet" -#~ msgstr "Not supported yet." +#: ../src/empathy-account-assistant.c:175 +msgid "There was an error." +msgstr "There was an error." -#~ msgid "This person wishes to send you this file:" -#~ msgstr "This person wishes to send you this file:" +#: ../src/empathy-account-assistant.c:179 +#, c-format +msgid "The error message was: %s" +msgstr "The error message was: %s" -#~ msgid "Web site:" -#~ msgstr "Web site:" +#: ../src/empathy-account-assistant.c:183 +msgid "" +"You can either go back and try to enter your accounts' details again or quit " +"this assistant and add accounts later from the Edit menu." +msgstr "" +"You can either go back and try to enter your accounts' details again or quit " +"this assistant and add accounts later from the Edit menu." -#~ msgid "_Accept" -#~ msgstr "_Accept" +#: ../src/empathy-account-assistant.c:220 +#: ../src/empathy-account-assistant.c:1276 +msgid "An error occurred" +msgstr "An error occurred" -#~ msgid "_Deny" -#~ msgstr "_Deny" +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 +msgid "What kind of chat account do you have?" +msgstr "What kind of chat account do you have?" -#, fuzzy -#~ msgid "Topic:" -#~ msgstr "About" +#: ../src/empathy-account-assistant.c:475 +msgid "Do you have any other chat accounts you want to set up?" +msgstr "Do you have any other chat accounts you want to set up?" -#~ msgid "Account:" -#~ msgstr "Account:" +#: ../src/empathy-account-assistant.c:481 +msgid "Enter your account details" +msgstr "Enter your account details" -#, fuzzy -#~ msgid "Browse:" -#~ msgstr "Faroese" +#: ../src/empathy-account-assistant.c:486 +msgid "What kind of chat account do you want to create?" +msgstr "What kind of chat account do you want to create?" -#, fuzzy -#~ msgid "Edit Favorite Room" -#~ msgstr "Gossip - Edit Chat Room" +#: ../src/empathy-account-assistant.c:492 +msgid "Do you want to create other chat accounts?" +msgstr "Do you want to create other chat accounts?" -#, fuzzy -#~ msgid "Group Chat" -#~ msgstr "Gossip - Chat" +#: ../src/empathy-account-assistant.c:499 +msgid "Enter the details for the new account" +msgstr "Enter the details for the new account" -#, fuzzy -#~ msgid "Join New" -#~ msgstr "_Join" +#: ../src/empathy-account-assistant.c:614 +msgid "" +"With Empathy you can chat with people online nearby and with friends and " +"colleagues who use Google Talk, AIM, Windows Live and many other chat " +"programs. With a microphone or a webcam you can also have audio or video " +"calls." +msgstr "" +"With Empathy you can chat with people online nearby and with friends and " +"colleagues who use Google Talk, AIM, Windows Live and many other chat " +"programs. With a microphone or a webcam you can also have audio or video " +"calls." + +#: ../src/empathy-account-assistant.c:631 +msgid "Do you have an account you've been using with another chat program?" +msgstr "Do you have an account you've been using with another chat program?" + +#: ../src/empathy-account-assistant.c:655 +msgid "Yes, import my account details from " +msgstr "Yes, import my account details from " + +#: ../src/empathy-account-assistant.c:676 +msgid "Yes, I'll enter my account details now" +msgstr "Yes, I'll enter my account details now" + +#: ../src/empathy-account-assistant.c:698 +msgid "No, I want a new account" +msgstr "No, I want a new account" + +#: ../src/empathy-account-assistant.c:708 +msgid "No, I just want to see people online nearby for now" +msgstr "No, I just want to see people online nearby for now" + +#: ../src/empathy-account-assistant.c:729 +msgid "Select the accounts you want to import:" +msgstr "Select the accounts you want to import:" + +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 +msgid "Yes" +msgstr "Yes" + +#: ../src/empathy-account-assistant.c:823 +msgid "No, that's all for now" +msgstr "No, that's all for now" + +#: ../src/empathy-account-assistant.c:1088 +msgid "" +"Empathy can automatically discover and chat with the people connected on the " +"same network as you. If you want to use this feature, please check that the " +"details below are correct. You can easily change these details later or " +"disable this feature by using the 'Accounts' dialog" +msgstr "" +"Empathy can automatically discover and chat with the people connected on the " +"same network as you. If you want to use this feature, please check that the " +"details below are correct. You can easily change these details later or " +"disable this feature by using the 'Accounts' dialog" -#, fuzzy -#~ msgid "Join room on start_up" -#~ msgstr "Join Room on Start_up" +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 +msgid "Edit->Accounts" +msgstr "Edit->Accounts" -#~ msgid "N_ame:" -#~ msgstr "N_ame:" +#: ../src/empathy-account-assistant.c:1110 +msgid "I do _not want to enable this feature for now" +msgstr "I do _not want to enable this feature for now" -#~ msgid "S_erver:" -#~ msgstr "S_erver:" +#: ../src/empathy-account-assistant.c:1148 +msgid "" +"You won't be able to chat with people connected to your local network, as " +"telepathy-salut is not installed. If you want to enable this feature, please " +"install the telepathy-salut package and create a People Nearby account from " +"the Accounts dialog" +msgstr "" +"You won't be able to chat with people connected to your local network, as " +"telepathy-salut is not installed. If you want to enable this feature, please " +"install the telepathy-salut package and create a People Nearby account from " +"the Accounts dialog" + +#: ../src/empathy-account-assistant.c:1154 +msgid "telepathy-salut not installed" +msgstr "telepathy-salut not installed" + +#: ../src/empathy-account-assistant.c:1200 +msgid "Messaging and VoIP Accounts Assistant" +msgstr "Messaging and VoIP Accounts Assistant" + +#: ../src/empathy-account-assistant.c:1234 +msgid "Welcome to Empathy" +msgstr "Welcome to Empathy" + +#: ../src/empathy-account-assistant.c:1243 +msgid "Import your existing accounts" +msgstr "Import your existing accounts" + +#: ../src/empathy-account-assistant.c:1261 +msgid "Please enter personal details" +msgstr "Please enter personal details" + +#. The primary text of the dialog shown to the user when he is about to lose +#. * unsaved changes +#: ../src/empathy-accounts-dialog.c:69 +#, c-format +msgid "There are unsaved modifications to your %s account." +msgstr "There are unsaved modifications to your %s account." + +#. 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:73 +msgid "Your new account has not been saved yet." +msgstr "Your new account has not been saved yet." + +#: ../src/empathy-accounts-dialog.c:344 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 +msgid "Connecting…" +msgstr "Connecting…" + +#: ../src/empathy-accounts-dialog.c:385 +#, c-format +msgid "Offline — %s" +msgstr "Offline — %s" -#~ msgid "_Nickname:" -#~ msgstr "_Nickname:" +#: ../src/empathy-accounts-dialog.c:397 +#, c-format +msgid "Disconnected — %s" +msgstr "Disconnected — %s" -#~ msgid "_Room:" -#~ msgstr "_Room:" +#: ../src/empathy-accounts-dialog.c:408 +msgid "Offline — No Network Connection" +msgstr "Offline — No Network Connection" -#~ msgid "-" -#~ msgstr "-" +#: ../src/empathy-accounts-dialog.c:415 +msgid "Unknown Status" +msgstr "Unknown Status" -#~ msgid "About" -#~ msgstr "About" +#: ../src/empathy-accounts-dialog.c:427 +msgid "Offline — Account Disabled" +msgstr "Offline — Account Disabled" -#~ msgid "Client Information" -#~ msgstr "Client Information" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "Edit Connection Parametres" -#, fuzzy -#~ msgid "Groups" -#~ msgstr "About" +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "Failed to retrieve your personal information from the server." -#, fuzzy -#~ msgid "Name" -#~ msgstr "Languages" +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "Go online to edit your personal information." -#~ msgid "Personal Details" -#~ msgstr "Personal Details" +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "_Edit Connection Parametres..." -#, fuzzy -#~ msgid "Subscription" -#~ msgstr "Connection" +#: ../src/empathy-accounts-dialog.c:1289 +#, c-format +msgid "Do you want to remove %s from your computer?" +msgstr "Do you want to remove %s from your computer?" -#~ msgid "Example: Mikael or user@server.org" -#~ msgstr "Example: Mikael or user@server.org" +#: ../src/empathy-accounts-dialog.c:1293 +msgid "This will not remove your account on the server." +msgstr "This will not remove your account on the server." -#, fuzzy -#~ msgid "Accou_nt:" -#~ msgstr "Account:" +#: ../src/empathy-accounts-dialog.c:1529 +msgid "" +"You are about to select another account, which will discard\n" +"your changes. Are you sure you want to proceed?" +msgstr "" +"You are about to select another account, which will discard\n" +"your changes. Are you sure you want to proceed?" -#, fuzzy -#~ msgid "Add Contact" -#~ msgstr "_Add Contact..." +#. Menu items: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1705 +msgid "_Enable" +msgstr "_Enable" -#, fuzzy -#~ msgid "Alia_s:" -#~ msgstr "Alias:" +#: ../src/empathy-accounts-dialog.c:1706 +msgid "_Disable" +msgstr "_Disable" -#~ msgid "Ch_at" -#~ msgstr "Ch_at" +#: ../src/empathy-accounts-dialog.c:2176 +msgid "" +"You are about to close the window, which will discard\n" +"your changes. Are you sure you want to proceed?" +msgstr "" +"You are about to close the window, which will discard\n" +"your changes. Are you sure you want to proceed?" -#~ msgid "Client:" -#~ msgstr "Client:" +#: ../src/empathy-accounts-dialog.ui.h:1 +msgid "Add…" +msgstr "Add…" -#, fuzzy -#~ msgid "Con_tact:" -#~ msgstr "_Add Contact..." +#: ../src/empathy-accounts-dialog.ui.h:3 +msgid "_Import…" +msgstr "_Import…" -#, fuzzy -#~ msgid "Connect on S_tartup" -#~ msgstr "Connect on Start_up" +#: ../src/empathy-accounts-dialog.ui.h:4 +msgid "Protocol:" +msgstr "Protocol:" -#, fuzzy -#~ msgid "Contacts" -#~ msgstr "_Add Contact..." +#: ../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 "" +"To add a new account, you first have to install a backend for each protocol " +"you want to use." -#~ msgid "Country:" -#~ msgstr "Country:" +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "No protocol installed" -#~ msgid "Decide _Later" -#~ msgstr "Decide _Later" +#: ../src/empathy-accounts-dialog.ui.h:7 +msgid "Loading account information" +msgstr "Loading account information" -#, fuzzy -#~ msgid "Edit Contact" -#~ msgstr "_Add Contact..." +#: ../src/empathy-auth-client.c:286 +msgid " - Empathy authentication client" +msgstr " - Empathy authentication client" -#, fuzzy -#~ msgid "Edit Groups" -#~ msgstr "/_Edit Groups" +#: ../src/empathy-auth-client.c:302 +msgid "Empathy authentication client" +msgstr "Empathy authentication client" -#~ msgid "Email:" -#~ msgstr "Email:" +#: ../src/empathy-auto-salut-account-helper.c:83 +msgid "People nearby" +msgstr "People nearby" -#~ msgid "ID:" -#~ msgstr "ID:" +#: ../src/empathy-av.c:118 ../src/empathy-call.c:193 +msgid "- Empathy Audio/Video Client" +msgstr "- Empathy Audio/Video Client" -#~ msgid "" -#~ "If you chose to decide later you will be asked the next time you log on." -#~ msgstr "" -#~ "If you chose to decide later you will be asked the next time you log on." +#: ../src/empathy-av.c:134 ../src/empathy-call.c:218 +msgid "Empathy Audio/Video Client" +msgstr "Empathy Audio/Video Client" -#~ msgid "Name:" -#~ msgstr "Name:" +#: ../src/empathy-streamed-media-window.c:433 +msgid "Contrast" +msgstr "Contrast" -#~ msgid "OS:" -#~ msgstr "OS:" +#: ../src/empathy-streamed-media-window.c:436 +msgid "Brightness" +msgstr "Brightness" -#, fuzzy -#~ msgid "Personal Details" -#~ msgstr "Personal Details Saved!" +#: ../src/empathy-streamed-media-window.c:439 +msgid "Gamma" +msgstr "Gamma" -#, fuzzy -#~ msgid "R_egister" -#~ msgstr "Registration Required" +#: ../src/empathy-streamed-media-window.c:545 +msgid "Volume" +msgstr "Volume" -#, fuzzy -#~ msgid "Search" -#~ msgstr "_Search..." +#: ../src/empathy-streamed-media-window.c:1097 +msgid "_Sidebar" +msgstr "_Sidebar" -#, fuzzy -#~ msgid "Spell Checker" -#~ msgstr "Spell Checking" +#: ../src/empathy-streamed-media-window.c:1117 +msgid "Audio input" +msgstr "Audio input" -#, fuzzy -#~ msgid "Subscription Request" -#~ msgstr "Gossip - Subscription Request" +#: ../src/empathy-streamed-media-window.c:1121 +msgid "Video input" +msgstr "Video input" -#~ msgid "Suggestions for the word:" -#~ msgstr "Suggestions for the word:" +#: ../src/empathy-streamed-media-window.c:1129 +msgid "Dialpad" +msgstr "Dialpad" -#, fuzzy -#~ msgid "" -#~ "This acts as a filter to the contact list below. You can use segments of " -#~ "contact's name or ID, for example, \"jabber.org\" will list everyone " -#~ "using that server" -#~ msgstr "" -#~ "This acts as a filter of the contact list below. You can use segments of " -#~ "contact's name or ID; for example, \"jabber.org\" will list everyone " -#~ "using that server. " +#: ../src/empathy-streamed-media-window.c:1140 +msgid "Details" +msgstr "Details" -#, fuzzy -#~ msgid "This is the name that will be used on your roster for this contact" -#~ msgstr "This is the name that will be used on your roster for this contact." +#. translators: Call is a noun and %s is the contact name. This string +#. * is used in the window title +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 +#, c-format +msgid "Call with %s" +msgstr "Call with %s" + +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 +msgid "The IP address as seen by the machine" +msgstr "The IP address as seen by the machine" + +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 +msgid "The IP address as seen by a server on the Internet" +msgstr "The IP address as seen by a server on the Internet" + +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 +msgid "The IP address of the peer as seen by the other side" +msgstr "The IP address of the peer as seen by the other side" + +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 +msgid "The IP address of a relay server" +msgstr "The IP address of a relay server" + +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 +msgid "The IP address of the multicast group" +msgstr "The IP address of the multicast group" + +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 +msgctxt "codec" +msgid "Unknown" +msgstr "Unknown" + +#. Translators: number of minutes:seconds the caller has been connected +#: ../src/empathy-streamed-media-window.c:2139 +#, c-format +msgid "Connected — %d:%02dm" +msgstr "Connected — %d:%02dm" -#, fuzzy -#~ msgid "This name will be used to identify you in chat windows" -#~ msgstr "This name will be used to identify you in chat windows." +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 +msgid "Technical Details" +msgstr "Technical Details" -#, fuzzy -#~ msgid "" -#~ "This name will be used to identify you when new contacts lookup your " -#~ "details" -#~ msgstr "This name will be used to identify you in chat windows." +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 +#, c-format +msgid "" +"%s's software does not understand any of the audio formats supported by your " +"computer" +msgstr "" +"%s's software does not understand any of the audio formats supported by your " +"computer" -#~ msgid "Use system pro_xy" -#~ msgstr "Use system pro_xy" +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 +#, c-format +msgid "" +"%s's software does not understand any of the video formats supported by your " +"computer" +msgstr "" +"%s's software does not understand any of the video formats supported by your " +"computer" -#~ msgid "Version:" -#~ msgstr "Version:" +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 +#, 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 "" +"Can't establish a connection to %s. One of you might be on a network that " +"does not allow direct connections." -#, fuzzy -#~ msgid "View Previous Conversations" -#~ msgstr "_Conversation" +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 +msgid "There was a failure on the network" +msgstr "There was a failure on the network" -#, fuzzy -#~ msgid "Which account do you want to use?" -#~ msgstr "Which username do you want to use?" +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 +msgid "" +"The audio formats necessary for this call are not installed on your computer" +msgstr "" +"The audio formats necessary for this call are not installed on your computer" -#~ msgid "You are not subscribed to this contact." -#~ msgstr "You are not subscribed to this contact." +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 +msgid "" +"The video formats necessary for this call are not installed on your computer" +msgstr "" +"The video formats necessary for this call are not installed on your computer" -#~ msgid "_Connect" -#~ msgstr "_Connect" +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 +#, c-format +msgid "" +"Something unexpected happened in a Telepathy component. Please report this bug and attach logs gathered from the 'Debug' window in " +"the Help menu." +msgstr "" +"Something unexpected happened in a Telepathy component. Please report this bug and attach logs gathered from the 'Debug' window in " +"the Help menu." + +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 +msgid "There was a failure in the call engine" +msgstr "There was a failure in the call engine" + +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 +msgid "The end of the stream was reached" +msgstr "The end of the stream was reached" + +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 +msgid "Can't establish audio stream" +msgstr "Can't establish audio stream" + +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 +msgid "Can't establish video stream" +msgstr "Can't establish video stream" + +#: ../src/empathy-call-window.ui.h:1 +#: ../src/empathy-streamed-media-window.ui.h:1 +msgid "_Call" +msgstr "_Call" + +#: ../src/empathy-call-window.ui.h:3 +msgid "_Microphone" +msgstr "_Microphone" + +#: ../src/empathy-call-window.ui.h:4 +msgid "_Camera" +msgstr "_Camera" + +#: ../src/empathy-call-window.ui.h:5 +msgid "_Settings" +msgstr "_Settings" + +#: ../src/empathy-call-window.ui.h:6 +#: ../src/empathy-roster-window-menubar.ui.h:17 +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "_View" +msgstr "_View" + +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:27 +msgid "_Help" +msgstr "_Help" -#, fuzzy -#~ msgid "_Description:" -#~ msgstr "Description:" +#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:28 +msgid "_Contents" +msgstr "_Contents" -#~ msgid "_Disconnect" -#~ msgstr "_Disconnect" +#: ../src/empathy-call-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:29 +msgid "_Debug" +msgstr "_Debug" + +#: ../src/empathy-call-window.ui.h:10 +msgid "Swap camera" +msgstr "Swap camera" + +#: ../src/empathy-call-window.ui.h:11 +msgid "Minimise me" +msgstr "Minimise me" + +#: ../src/empathy-call-window.ui.h:12 +msgid "Maximise me" +msgstr "Maximise me" + +#: ../src/empathy-call-window.ui.h:13 +msgid "Disable camera" +msgstr "Disable camera" + +#: ../src/empathy-call-window.ui.h:14 +#: ../src/empathy-streamed-media-window.ui.h:2 +msgid "Hang up" +msgstr "Hang up" + +#: ../src/empathy-call-window.ui.h:15 +#: ../src/empathy-streamed-media-window.ui.h:9 +msgid "Hang up current call" +msgstr "Hang up current call" + +#: ../src/empathy-call-window.ui.h:16 +msgid "Video call" +msgstr "Video call" + +#: ../src/empathy-call-window.ui.h:17 +msgid "Start a video call" +msgstr "Start a video call" + +#: ../src/empathy-call-window.ui.h:19 +msgid "Start an audio call" +msgstr "Start an audio call" + +#: ../src/empathy-call-window.ui.h:20 +msgid "Show dialpad" +msgstr "Show dialpad" + +#: ../src/empathy-call-window.ui.h:21 +msgid "Display the dialpad" +msgstr "Display the dialpad" + +#: ../src/empathy-call-window.ui.h:22 +msgid "Send Video" +msgstr "Send Video" + +#: ../src/empathy-call-window.ui.h:23 +msgid "Toggle video transmission" +msgstr "Toggle video transmission" + +#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Send Audio" +msgstr "Send Audio" + +#: ../src/empathy-call-window.ui.h:25 +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Toggle audio transmission" +msgstr "Toggle audio transmission" + +#: ../src/empathy-call-window.ui.h:27 +#: ../src/empathy-streamed-media-window.ui.h:20 +msgid "Encoding Codec:" +msgstr "Encoding Codec:" + +#: ../src/empathy-call-window.ui.h:28 +#: ../src/empathy-streamed-media-window.ui.h:21 +#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 +msgid "Unknown" +msgstr "Unknown" + +#: ../src/empathy-call-window.ui.h:29 +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Decoding Codec:" +msgstr "Decoding Codec:" + +#: ../src/empathy-call-window.ui.h:30 +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Remote Candidate:" +msgstr "Remote Candidate:" + +#: ../src/empathy-call-window.ui.h:31 +#: ../src/empathy-streamed-media-window.ui.h:24 +msgid "Local Candidate:" +msgstr "Local Candidate:" + +#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:25 +msgid "Audio" +msgstr "Audio" + +#: ../src/empathy-chat-window.c:285 +msgid "Close this window?" +msgstr "Close this window?" + +#: ../src/empathy-chat-window.c:290 +#, c-format +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." -#, fuzzy -#~ msgid "_Email:" -#~ msgstr "Email:" +#: ../src/empathy-chat-window.c:301 +#, 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] "" +"Closing this window will leave a chat room. You will not receive any further " +"messages until you rejoin it." +msgstr[1] "" +"Closing this window will leave %u chat rooms. You will not receive any " +"further messages until you rejoin them." + +#: ../src/empathy-chat-window.c:310 +#, c-format +msgid "Leave %s?" +msgstr "Leave %s?" -#, fuzzy -#~ msgid "" -#~ "_Enter the name or contact ID of the person you want to chat to below:" -#~ msgstr "" -#~ "Enter the name or contact ID of the person you want to chat with below:" +#: ../src/empathy-chat-window.c:311 +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "" +"You will not receive any further messages from this chat room until you " +"rejoin it." -#, fuzzy -#~ msgid "_For:" -#~ msgstr "Por_t:" +#: ../src/empathy-chat-window.c:330 +msgid "Close window" +msgstr "Close window" -#, fuzzy -#~ msgid "_Full Name:" -#~ msgstr "_Name:" +#: ../src/empathy-chat-window.c:330 +msgid "Leave room" +msgstr "Leave room" -#, fuzzy -#~ msgid "_Group:" -#~ msgstr "Group:" +#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656 +#, c-format +msgid "%s (%d unread)" +msgid_plural "%s (%d unread)" +msgstr[0] "%s (%d unread)" +msgstr[1] "%s (%d unread)" -#, fuzzy -#~ msgid "_Nick Name:" -#~ msgstr "_Nickname:" +#: ../src/empathy-chat-window.c:648 +#, c-format +msgid "%s (and %u other)" +msgid_plural "%s (and %u others)" +msgstr[0] "%s (and %u other)" +msgstr[1] "%s (and %u others)" -#, fuzzy -#~ msgid "_Password:" -#~ msgstr "_Password:" +#: ../src/empathy-chat-window.c:664 +#, c-format +msgid "%s (%d unread from others)" +msgid_plural "%s (%d unread from others)" +msgstr[0] "%s (%d unread from others)" +msgstr[1] "%s (%d unread from others)" -#, fuzzy -#~ msgid "_Quit Message:" -#~ msgstr "_New Message..." +#: ../src/empathy-chat-window.c:673 +#, c-format +msgid "%s (%d unread from all)" +msgid_plural "%s (%d unread from all)" +msgstr[0] "%s (%d unread from all)" +msgstr[1] "%s (%d unread from all)" -#~ msgid "_Subscribe" -#~ msgstr "_Subscribe" +#: ../src/empathy-chat-window.c:888 +msgid "SMS:" +msgstr "SMS:" -#, fuzzy -#~ msgid "_Web site:" -#~ msgstr "Web site:" +#: ../src/empathy-chat-window.c:898 +#, c-format +msgid "Sending %d message" +msgid_plural "Sending %d messages" +msgstr[0] "Sending %d message" +msgstr[1] "Sending %d messages" -#~ msgid "Preset status messages" -#~ msgstr "Preset status messages" +#: ../src/empathy-chat-window.c:920 +msgid "Typing a message." +msgstr "Typing a message." -#~ msgid "Preset status messages." -#~ msgstr "Preset status messages." +#: ../src/empathy-chat-window.ui.h:1 +msgid "_Conversation" +msgstr "_Conversation" -#~ msgid "Connecting" -#~ msgstr "Connecting" +#: ../src/empathy-chat-window.ui.h:2 +msgid "C_lear" +msgstr "C_lear" -#~ msgid "Perhaps you are trying to connect to the wrong port?" -#~ msgstr "Perhaps you are trying to connect to the wrong port?" +#: ../src/empathy-chat-window.ui.h:3 +msgid "Insert _Smiley" +msgstr "Insert _Smiley" -#~ msgid "Perhaps the service is not currently running?" -#~ msgstr "Perhaps the service is not currently running?" +#: ../src/empathy-chat-window.ui.h:4 +msgid "_Favorite Chat Room" +msgstr "_Favourite Chat Room" -#~ msgid "Check your connection details." -#~ msgstr "Check your connection details." +#: ../src/empathy-chat-window.ui.h:5 +msgid "Notify for All Messages" +msgstr "Notify for All Messages" -#~ msgid "Perhaps the server is not running this service." -#~ msgstr "Perhaps the server is not running this service." +#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1 +msgid "_Show Contact List" +msgstr "_Show Contact List" -#~ msgid "Check your username and password are correct." -#~ msgstr "Ensure that your username and password are correct." +#: ../src/empathy-chat-window.ui.h:7 +msgid "Invite _Participant…" +msgstr "Invite _Participant…" -#~ msgid "%s will be added to your contact list." -#~ msgstr "%s will be added to your contact list." +#: ../src/empathy-chat-window.ui.h:8 +msgid "C_ontact" +msgstr "C_ontact" -#~ msgid "%s ID of new contact:" -#~ msgstr "%s ID of new contact:" +#: ../src/empathy-chat-window.ui.h:10 +msgid "_Tabs" +msgstr "_Tabs" -#~ msgid "Example: %s" -#~ msgstr "Example: %s" +#: ../src/empathy-chat-window.ui.h:11 +msgid "_Previous Tab" +msgstr "_Previous Tab" -#~ msgid "You have no Instant Messaging accounts configured!" -#~ msgstr "You have no Instant Messaging accounts configured!" +#: ../src/empathy-chat-window.ui.h:12 +msgid "_Next Tab" +msgstr "_Next Tab" -#~ msgid "" -#~ "Next you will be presented with the Account Information dialog to set " -#~ "your details up." -#~ msgstr "" -#~ "Next you will be presented with the Account Information dialogue to set " -#~ "up your details." +#: ../src/empathy-chat-window.ui.h:13 +msgid "_Undo Close Tab" +msgstr "_Undo Close Tab" -#~ msgid "" -#~ "Please enter your invitation message to:\n" -#~ "%s" -#~ msgstr "" -#~ "Please enter your invitation message to:\n" -#~ "%s" +#: ../src/empathy-chat-window.ui.h:14 +msgid "Move Tab _Left" +msgstr "Move Tab _Left" -#, fuzzy -#~ msgid "Favourite" -#~ msgstr "_Add to Favourites" +#: ../src/empathy-chat-window.ui.h:15 +msgid "Move Tab _Right" +msgstr "Move Tab _Right" -#~ msgid "Contact Information for %s" -#~ msgstr "Contact Information for %s" +#: ../src/empathy-chat-window.ui.h:16 +msgid "_Detach Tab" +msgstr "_Detach Tab" -#, fuzzy -#~ msgid "/Contact Infor_mation" -#~ msgstr "/Contact _Information" +#: ../src/empathy-chatrooms-window.c:251 +msgid "Name" +msgstr "Name" -#~ msgid "/Re_name Contact" -#~ msgstr "/Re_name Contact" +#: ../src/empathy-chatrooms-window.c:269 +msgid "Room" +msgstr "Room" -#~ msgid "/_Edit Groups" -#~ msgstr "/_Edit Groups" +#: ../src/empathy-chatrooms-window.c:277 +msgid "Auto-Connect" +msgstr "Auto-Connect" -#, fuzzy -#~ msgid "/_View Previous Conversations" -#~ msgstr "_Conversation" +#: ../src/empathy-chatrooms-window.ui.h:1 +msgid "Manage Favorite Rooms" +msgstr "Manage Favourite Rooms" -#~ msgid "" -#~ "Please enter a new nickname for the contact\n" -#~ "%s" -#~ msgstr "" -#~ "Please enter a new nickname for the contact\n" -#~ "%s" - -#~ msgid "Edit groups for %s" -#~ msgstr "Edit groups for %s" - -#~ msgid "Conversation Log" -#~ msgstr "Conversation Log" - -#~ msgid "Registering account" -#~ msgstr "Registering account" - -#, fuzzy -#~ msgid "Respond" -#~ msgstr "Reason:" - -#, fuzzy -#~ msgid "Add to _favourites" -#~ msgstr "_Add to Favourites" - -#, fuzzy -#~ msgid "" -#~ "Customize your own nickname, the server and chatroom which you wish to " -#~ "join." -#~ msgstr "" -#~ "Pick a saved chat room or customize your own nickname, server and chat " -#~ "room to join." - -#, fuzzy -#~ msgid "Na_me:" -#~ msgstr "Name:" - -#, fuzzy -#~ msgid "New Chat Room" -#~ msgstr "Chat Room:" - -#, fuzzy -#~ msgid "" -#~ "Pick a saved chat room from the presets available below and click Join to " -#~ "start chatting." -#~ msgstr "" -#~ "Pick a saved chat room or customize your own nickname, server and chat " -#~ "room to join." - -#~ msgid " " -#~ msgstr " " - -#~ msgid "Information requested, please wait..." -#~ msgstr "Information requested, please wait..." - -#, fuzzy -#~ msgid "Example:" -#~ msgstr "Example: user@jabber.org" - -#~ msgid "Account Name" -#~ msgstr "Account Name" - -#, fuzzy -#~ msgid "Chat Rooms..." -#~ msgstr "Chat Room:" - -#, fuzzy -#~ msgid "Connection Details" -#~ msgstr "Connection" - -#~ msgid "Do you already have an account set up on a server?" -#~ msgstr "Do you already have an account set up on a server?" - -#, fuzzy -#~ msgid "Enter the port used in the connection for this account" -#~ msgstr "" -#~ "Please enter a new nickname for the contact\n" -#~ "%s" - -#, fuzzy -#~ msgid "Enter the server used in the connection for this account" -#~ msgstr "" -#~ "Please enter a new nickname for the contact\n" -#~ "%s" - -#~ msgid "Enter the user's contact ID:" -#~ msgstr "Enter the user's contact ID:" - -#~ msgid "Finished" -#~ msgstr "Finished" - -#~ msgid "Gossip" -#~ msgstr "Gossip" - -#~ msgid "" -#~ "Gossip is a modern client for the Jabber Instant Messaging system.\n" -#~ "\n" -#~ "This assistant will help you configure Gossip and connect you to your " -#~ "favorite Jabber server.\n" -#~ "\n" -#~ "To get started, just click \"Forward\"." -#~ msgstr "" -#~ "Gossip is a modern client for the Jabber Instant Messaging system.\n" -#~ "\n" -#~ "This assistant will help you configure Gossip and connect you to your " -#~ "favourite Jabber server.\n" -#~ "\n" -#~ "To get started, just click \"Forward\"." - -#~ msgid "" -#~ "In order to subscribe to presence notifications from the user, a request " -#~ "will be sent. Until this request is approved, the user will always be " -#~ "shown as \"Offline\" in your contact list." -#~ msgstr "" -#~ "In order to subscribe to presence notifications from the user, a request " -#~ "will be sent. Until this request is approved, the user will always be " -#~ "shown as \"Offline\" in your contact list." - -#~ msgid "In which group do you want to place this contact?" -#~ msgstr "In which group do you want to place this contact?" +#: ../src/empathy-event-manager.c:523 +msgid "Incoming video call" +msgstr "Incoming video call" -#~ msgid "Jabber ID:" -#~ msgstr "Jabber ID:" +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 +msgid "Incoming call" +msgstr "Incoming call" -#~ msgid "Nickname:" -#~ msgstr "Nickname:" +#: ../src/empathy-event-manager.c:527 +#, c-format +msgid "%s is video calling you. Do you want to answer?" +msgstr "%s is video calling you. Do you want to answer?" -#, fuzzy -#~ msgid "Port:" -#~ msgstr "Por_t:" +#: ../src/empathy-event-manager.c:528 +#, c-format +msgid "%s is calling you. Do you want to answer?" +msgstr "%s is calling you. Do you want to answer?" -#, fuzzy -#~ msgid "Press Subscribe to request to receive their status" -#~ msgstr "Press Subscribe to request to receive their status." +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 +#, c-format +msgid "Incoming call from %s" +msgstr "Incoming call from %s" -#, fuzzy -#~ msgid "Registering Account" -#~ msgstr "Registering account" +#: ../src/empathy-event-manager.c:556 +msgid "_Reject" +msgstr "_Reject" -#, fuzzy -#~ msgid "Resource:" -#~ msgstr "R_esource:" +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 +msgid "_Answer" +msgstr "_Answer" -#~ msgid "Sending request" -#~ msgstr "Sending request" +#: ../src/empathy-event-manager.c:572 +msgid "_Answer with video" +msgstr "_Answer with video" -#, fuzzy -#~ msgid "Server:" -#~ msgstr "_Server:" +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 +#, c-format +msgid "Incoming video call from %s" +msgstr "Incoming video call from %s" -#~ msgid "Web Site:" -#~ msgstr "Web Site:" +#: ../src/empathy-event-manager.c:838 +msgid "Room invitation" +msgstr "Room invitation" -#~ msgid "Welcome to Gossip" -#~ msgstr "Welcome to Gossip" +#: ../src/empathy-event-manager.c:840 +#, c-format +msgid "Invitation to join %s" +msgstr "Invitation to join %s" -#~ msgid "What instant messaging system does the contact use?" -#~ msgstr "Which instant messaging system does the contact use?" +#: ../src/empathy-event-manager.c:847 +#, c-format +msgid "%s is inviting you to join %s" +msgstr "%s is inviting you to join %s" -#~ msgid "What is your name?" -#~ msgstr "What is your name?" +#: ../src/empathy-event-manager.c:855 +msgid "_Decline" +msgstr "_Decline" -#, fuzzy -#~ msgid "What password do you want to use?" -#~ msgstr "What server do you want to use?" +#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-new-chatroom-dialog.ui.h:2 +msgid "_Join" +msgstr "_Join" -#~ msgid "What username do you use?" -#~ msgstr "What username do you use?" +#: ../src/empathy-event-manager.c:887 +#, c-format +msgid "%s invited you to join %s" +msgstr "%s invited you to join %s" -#~ msgid "What username do you want to use?" -#~ msgstr "Which username do you want to use?" +#: ../src/empathy-event-manager.c:893 +#, c-format +msgid "You have been invited to join %s" +msgstr "You have been invited to join %s" -#~ msgid "Which account do you want to add this contact to?" -#~ msgstr "To which account do you want to add this contact?" +#: ../src/empathy-event-manager.c:944 +#, c-format +msgid "Incoming file transfer from %s" +msgstr "Incoming file transfer from %s" -#~ msgid "" -#~ "You can change your account settings later by selecting the Edit-" -#~ ">Accounts menu item." -#~ msgstr "" -#~ "You can change your account settings later by selecting the Edit-" -#~ ">Accounts menu item." +#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372 +msgid "Password required" +msgstr "Password required" -#~ msgid "Your Account" -#~ msgstr "Your Account" +#: ../src/empathy-event-manager.c:1217 +#, c-format +msgid "%s would like permission to see when you are online" +msgstr "%s would like permission to see when you are online" -#~ msgid "Your Identity" -#~ msgstr "Your Identity" +#: ../src/empathy-event-manager.c:1223 +#, c-format +msgid "" +"\n" +"Message: %s" +msgstr "" +"\n" +"Message: %s" -#~ msgid "Your new account has now been set up." -#~ msgstr "Your new account has now been set up." +#. Translators: time left, when it is more than one hour +#: ../src/empathy-ft-manager.c:99 +#, c-format +msgid "%u:%02u.%02u" +msgstr "%u:%02u.%02u" -#, fuzzy -#~ msgid "_Group Chat" -#~ msgstr "Gossip - Chat" +#. Translators: time left, when is is less than one hour +#: ../src/empathy-ft-manager.c:102 +#, c-format +msgid "%02u.%02u" +msgstr "%02u.%02u" -#~ msgid "_No" -#~ msgstr "_No" +#: ../src/empathy-ft-manager.c:178 +msgctxt "file transfer percent" +msgid "Unknown" +msgstr "Unknown" -#~ msgid "_Search..." -#~ msgstr "_Search..." +#: ../src/empathy-ft-manager.c:273 +#, c-format +msgid "%s of %s at %s/s" +msgstr "%s of %s at %s/s" -#~ msgid "_Yes" -#~ msgstr "_Yes" +#: ../src/empathy-ft-manager.c:274 +#, c-format +msgid "%s of %s" +msgstr "%s of %s" -#~ msgid "Be silent when away" -#~ msgstr "Be silent when away" +#. translators: first %s is filename, second %s is the contact name +#: ../src/empathy-ft-manager.c:305 +#, c-format +msgid "Receiving \"%s\" from %s" +msgstr "Receiving \"%s\" from %s" -#~ msgid "Be silent when busy" -#~ msgstr "Be silent when busy" +#. translators: first %s is filename, second %s is the contact name +#: ../src/empathy-ft-manager.c:308 +#, c-format +msgid "Sending \"%s\" to %s" +msgstr "Sending \"%s\" to %s" -#~ msgid "Height of main window" -#~ msgstr "Height of main window" +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:338 +#, c-format +msgid "Error receiving \"%s\" from %s" +msgstr "Error receiving \"%s\" from %s" -#~ msgid "The X position of the main window." -#~ msgstr "The X position of the main window." +#: ../src/empathy-ft-manager.c:341 +msgid "Error receiving a file" +msgstr "Error receiving a file" -#~ msgid "The Y position of the main window." -#~ msgstr "The Y position of the main window." +#: ../src/empathy-ft-manager.c:346 +#, c-format +msgid "Error sending \"%s\" to %s" +msgstr "Error sending \"%s\" to %s" -#~ msgid "The width of the main window." -#~ msgstr "The width of the main window." +#: ../src/empathy-ft-manager.c:349 +msgid "Error sending a file" +msgstr "Error sending a file" -#~ msgid "Whether spell checking should be turned on." -#~ msgstr "Whether spell checking should be enabled." +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:488 +#, c-format +msgid "\"%s\" received from %s" +msgstr "\"%s\" received from %s" -#~ msgid "Width of the main window" -#~ msgstr "Width of the main window" +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:493 +#, c-format +msgid "\"%s\" sent to %s" +msgstr "\"%s\" sent to %s" -#~ msgid "X position of main window" -#~ msgstr "X position of main window" +#: ../src/empathy-ft-manager.c:496 +msgid "File transfer completed" +msgstr "File transfer completed" -#~ msgid "Y position of main window" -#~ msgstr "Y position of main window" +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 +msgid "Waiting for the other participant's response" +msgstr "Waiting for the other participant's response" -#~ msgid "Gossip, Instant Messaging Client" -#~ msgstr "Gossip, Instant Messaging Client" +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 +#, c-format +msgid "Checking integrity of \"%s\"" +msgstr "Checking integrity of \"%s\"" -#, fuzzy -#~ msgid "Close this chat window" -#~ msgstr "_Invite to Chat Room" +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 +#, c-format +msgid "Hashing \"%s\"" +msgstr "Hashing \"%s\"" -#~ msgid "Requested Information" -#~ msgstr "Requested Information" +#: ../src/empathy-ft-manager.c:1025 +msgid "%" +msgstr "%" -#~ msgid "/_Invite to Chat Conference" -#~ msgstr "/_Invite to Chat Conference" +#: ../src/empathy-ft-manager.c:1037 +msgid "File" +msgstr "File" -#, fuzzy -#~ msgid "Send Message" -#~ msgstr "_New Message..." +#: ../src/empathy-ft-manager.c:1059 +msgid "Remaining" +msgstr "Remaining" -#, fuzzy -#~ msgid "%s has gone offline" -#~ msgstr "%s went offline" +#: ../src/empathy-ft-manager.ui.h:1 +msgid "File Transfers" +msgstr "File Transfers" -#~ msgid "Contact _Information" -#~ msgstr "Contact _Information" +#: ../src/empathy-ft-manager.ui.h:2 +msgid "Remove completed, canceled and failed file transfers from the list" +msgstr "Remove completed, cancellled and failed file transfers from the list" -#~ msgid "Sound" -#~ msgstr "Sound" +#: ../src/empathy-import-dialog.c:84 +msgid "" +"No accounts to import could be found. Empathy currently only supports " +"importing accounts from Pidgin." +msgstr "" +"No accounts to import could be found. Empathy currently only supports " +"importing accounts from Pidgin." -#~ msgid "Check spelling while I _type" -#~ msgstr "Check spelling while I _type" +#: ../src/empathy-import-dialog.c:199 +msgid "Import Accounts" +msgstr "Import Accounts" -#~ msgid "Gossip - Accounts" -#~ msgstr "Gossip - Accounts" +#. Translators: this is the header of a treeview column +#: ../src/empathy-import-widget.c:315 +msgid "Import" +msgstr "Import" -#, fuzzy -#~ msgid "Join _Group Chat..." -#~ msgstr "_Join Group Chat..." +#: ../src/empathy-import-widget.c:324 +msgid "Protocol" +msgstr "Protocol" -#~ msgid "Por_t:" -#~ msgstr "Por_t:" +#: ../src/empathy-import-widget.c:348 +msgid "Source" +msgstr "Source" -#~ msgid "Requested information." -#~ msgstr "Requested information." +#: ../src/empathy-roster-window.c:389 +msgid "Provide Password" +msgstr "Provide Password" -#~ msgid "Requesting contact information, please wait..." -#~ msgstr "Requesting contact information, please wait..." +#: ../src/empathy-roster-window.c:395 +msgid "Disconnect" +msgstr "Disconnect" -#~ msgid "Could not open connection" -#~ msgstr "Could not open connection" +#: ../src/empathy-roster-window.c:644 +msgid "You need to setup an account to see contacts here." +msgstr "You need to setup an account to see contacts here." -#~ msgid "Could not find the server you wanted to use" -#~ msgstr "Could not find the server you wanted to use" +#: ../src/empathy-roster-window.c:660 +msgid "No match found" +msgstr "No match found" -#~ msgid "Connection to the server failed." -#~ msgstr "Connection to the server failed." +#: ../src/empathy-roster-window.c:765 +#, c-format +msgid "Sorry, %s accounts can’t be used until your %s software is updated." +msgstr "Sorry, %s accounts can’t be used until your %s software is updated." -#~ msgid "Authentication failed" -#~ msgstr "Authentication failed" +#: ../src/empathy-roster-window.c:831 +msgid "Update software..." +msgstr "Update software..." -#~ msgid "Written by:" -#~ msgstr "Written by:" +#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954 +msgid "Close" +msgstr "Close" -#~ msgid "Artwork by:" -#~ msgstr "Artwork by:" +#: ../src/empathy-roster-window.c:942 +msgid "Reconnect" +msgstr "Reconnect" -#~ msgid "Translated by:" -#~ msgstr "Translated by:" +#: ../src/empathy-roster-window.c:948 +msgid "Edit Account" +msgstr "Edit Account" -#~ msgid "Account ID" -#~ msgstr "Account ID" +#. Translators: this string will be something like: +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1092 +#, c-format +msgid "Top up %s (%s)..." +msgstr "Top up %s (%s)..." -#~ msgid "Last Error" -#~ msgstr "Last Error" +#: ../src/empathy-roster-window.c:1138 +msgid "Top up account credit" +msgstr "Top up account credit" -#~ msgid "%sChat - %s" -#~ msgstr "%sChat - %s" +#. top up button +#: ../src/empathy-roster-window.c:1210 +msgid "Top Up..." +msgstr "Top Up..." -#~ msgid "/Show _Log" -#~ msgstr "/Show _Log" +#: ../src/empathy-roster-window.c:1933 +msgid "Contact" +msgstr "Contact" -#~ msgid "Afrikaans" -#~ msgstr "Afrikaans" +#: ../src/empathy-roster-window.c:2131 +msgid "You need to enable one of your accounts to see contacts here." +msgstr "You need to enable one of your accounts to see contacts here." -#~ msgid "Amharic" -#~ msgstr "Amharic" +#. translators: argument is an account name +#: ../src/empathy-roster-window.c:2139 +#, c-format +msgid "You need to enable %s to see contacts here." +msgstr "You need to enable %s to see contacts here." -#~ msgid "Arabic" -#~ msgstr "Arabic" +#: ../src/empathy-roster-window.c:2419 +msgid "Contact List" +msgstr "Contact List" -#~ msgid "Azerbaijani" -#~ msgstr "Azerbaijani" +#: ../src/empathy-roster-window.ui.h:1 +msgid "Account settings" +msgstr "Account settings" -#~ msgid "Belarusian" -#~ msgstr "Belarusian" +#: ../src/empathy-roster-window-menubar.ui.h:2 +#: ../src/empathy-status-icon.ui.h:2 +msgid "_New Conversation…" +msgstr "_New Conversation…" -#~ msgid "Bulgarian" -#~ msgstr "Bulgarian" +#: ../src/empathy-roster-window-menubar.ui.h:3 +#: ../src/empathy-status-icon.ui.h:3 +msgid "New _Call…" +msgstr "New _Call…" -#~ msgid "Bengali" -#~ msgstr "Bengali" +#: ../src/empathy-roster-window-menubar.ui.h:6 +msgid "_Search for Contacts…" +msgstr "_Search for Contacts…" -#~ msgid "Breton" -#~ msgstr "Breton" +#: ../src/empathy-roster-window-menubar.ui.h:7 +msgid "_File Transfers" +msgstr "_File Transfers" -#~ msgid "Bosnian" -#~ msgstr "Bosnian" +#: ../src/empathy-roster-window-menubar.ui.h:8 +msgid "_Offline Contacts" +msgstr "_Offline Contacts" -#~ msgid "Catalan" -#~ msgstr "Catalan" +#: ../src/empathy-roster-window-menubar.ui.h:9 +msgid "Show P_rotocols" +msgstr "Show P_rotocols" -#~ msgid "Czech" -#~ msgstr "Czech" +#: ../src/empathy-roster-window-menubar.ui.h:10 +msgid "Credit Balance" +msgstr "Credit Balance" -#~ msgid "Welsh" -#~ msgstr "Welsh" +#: ../src/empathy-roster-window-menubar.ui.h:11 +msgid "Contacts on a _Map" +msgstr "Contacts on a _Map" -#~ msgid "Danish" -#~ msgstr "Danish" +#: ../src/empathy-roster-window-menubar.ui.h:13 +msgid "_Accounts" +msgstr "_Accounts" -#~ msgid "German" -#~ msgstr "German" +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Blocked Contacts" +msgstr "_Blocked Contacts" -#~ msgid "German (Austria)" -#~ msgstr "German (Austria)" +#: ../src/empathy-roster-window-menubar.ui.h:15 +msgid "P_references" +msgstr "P_references" -#~ msgid "German (Germany)" -#~ msgstr "German (Germany)" +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "Find in Contact _List" +msgstr "Find in Contact _List" -#~ msgid "German (Swiss)" -#~ msgstr "German (Swiss)" +#: ../src/empathy-roster-window-menubar.ui.h:18 +msgid "Sort by _Name" +msgstr "Sort by _Name" -#~ msgid "Greek" -#~ msgstr "Greek" +#: ../src/empathy-roster-window-menubar.ui.h:19 +msgid "Sort by _Status" +msgstr "Sort by _Status" -#~ msgid "English" -#~ msgstr "English" +#: ../src/empathy-roster-window-menubar.ui.h:20 +msgid "Normal Size With _Avatars" +msgstr "Normal Size With _Avatars" -#~ msgid "English (Canadian)" -#~ msgstr "English (Canadian)" +#: ../src/empathy-roster-window-menubar.ui.h:21 +msgid "N_ormal Size" +msgstr "N_ormal Size" -#~ msgid "English (British)" -#~ msgstr "English (British)" +#: ../src/empathy-roster-window-menubar.ui.h:22 +msgid "_Compact Size" +msgstr "_Compact Size" -#~ msgid "English (American)" -#~ msgstr "English (American)" +#: ../src/empathy-roster-window-menubar.ui.h:23 +msgid "_Room" +msgstr "_Room" -#~ msgid "Esperanto" -#~ msgstr "Esperanto" +#: ../src/empathy-roster-window-menubar.ui.h:24 +msgid "_Join…" +msgstr "_Join…" -#~ msgid "Spanish" -#~ msgstr "Spanish" +#: ../src/empathy-roster-window-menubar.ui.h:25 +msgid "Join _Favorites" +msgstr "Join _Favourites" -#~ msgid "Estonian" -#~ msgstr "Estonian" +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "Manage Favorites" +msgstr "Manage Favourites" -#~ msgid "Persian" -#~ msgstr "Persian" +#: ../src/empathy-new-chatroom-dialog.c:369 +msgid "Chat Room" +msgstr "Chat Room" -#~ msgid "Finnish" -#~ msgstr "Finnish" +#: ../src/empathy-new-chatroom-dialog.c:385 +msgid "Members" +msgstr "Members" -#~ msgid "French" -#~ msgstr "French" +#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, +#. yes/no, yes/no and a number. +#: ../src/empathy-new-chatroom-dialog.c:637 +#, c-format +msgid "" +"%s\n" +"Invite required: %s\n" +"Password required: %s\n" +"Members: %s" +msgstr "" +"%s\n" +"Invite required: %s\n" +"Password required: %s\n" +"Members: %s" -#~ msgid "French (France)" -#~ msgstr "French (France)" +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 +msgid "No" +msgstr "No" -#~ msgid "French (Swiss)" -#~ msgstr "French (Swiss)" +#: ../src/empathy-new-chatroom-dialog.c:668 +msgid "Could not start room listing" +msgstr "Could not start room listing" -#~ msgid "Irish Gaelic" -#~ msgstr "Irish Gaelic" +#: ../src/empathy-new-chatroom-dialog.c:678 +msgid "Could not stop room listing" +msgstr "Could not stop room listing" -#~ msgid "Scots Gaelic" -#~ msgstr "Scots Gaelic" +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Join Room" +msgstr "Join Room" -#~ msgid "Gujarati" -#~ msgstr "Gujarati" +#: ../src/empathy-new-chatroom-dialog.ui.h:3 +msgid "" +"Enter the room name to join here or click on one or more rooms in the list." +msgstr "" +"Enter the room name to join here or click on one or more rooms in the list." -#~ msgid "Manx Gaelic" -#~ msgstr "Manx Gaelic" +#: ../src/empathy-new-chatroom-dialog.ui.h:4 +msgid "_Room:" +msgstr "_Room:" -#~ msgid "Hebrew" -#~ msgstr "Hebrew" +#: ../src/empathy-new-chatroom-dialog.ui.h:5 +msgid "" +"Enter the server which hosts the room, or leave it empty if the room is on " +"the current account's server" +msgstr "" +"Enter the server which hosts the room, or leave it empty if the room is on " +"the current account's server" -#~ msgid "Hindi" -#~ msgstr "Hindi" +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "Couldn't load room list" +msgstr "Couldn't load room list" -#~ msgid "Croatian" -#~ msgstr "Croatian" +#: ../src/empathy-new-chatroom-dialog.ui.h:9 +msgid "Room List" +msgstr "Room List" -#~ msgid "Hungarian" -#~ msgstr "Hungarian" +#: ../src/empathy-preferences.c:166 +msgid "Message received" +msgstr "Message received" -#~ msgid "Indonesian" -#~ msgstr "Indonesian" +#: ../src/empathy-preferences.c:167 +msgid "Message sent" +msgstr "Message sent" -#~ msgid "Icelandic" -#~ msgstr "Icelandic" +#: ../src/empathy-preferences.c:168 +msgid "New conversation" +msgstr "New conversation" -#~ msgid "Italian" -#~ msgstr "Italian" +#: ../src/empathy-preferences.c:169 +msgid "Contact comes online" +msgstr "Contact comes online" -#~ msgid "Japanese" -#~ msgstr "Japanese" +#: ../src/empathy-preferences.c:170 +msgid "Contact goes offline" +msgstr "Contact goes offline" -#~ msgid "Georgian" -#~ msgstr "Georgian" +#: ../src/empathy-preferences.c:171 +msgid "Account connected" +msgstr "Account connected" -#~ msgid "Kannada" -#~ msgstr "Kannada" +#: ../src/empathy-preferences.c:172 +msgid "Account disconnected" +msgstr "Account disconnected" -#~ msgid "Korean" -#~ msgstr "Korean" +#: ../src/empathy-preferences.c:475 +msgid "Language" +msgstr "Language" -#~ msgid "Kurdish" -#~ msgstr "Kurdish" +#. translators: Contact name for the chat theme preview +#: ../src/empathy-preferences.c:726 +msgid "Juliet" +msgstr "Juliet" + +#. translators: Contact name for the chat theme preview +#: ../src/empathy-preferences.c:733 +msgid "Romeo" +msgstr "Romeo" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:739 +msgid "O Romeo, Romeo, wherefore art thou Romeo?" +msgstr "O Romeo, Romeo, wherefore art thou Romeo?" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:743 +msgid "Deny thy father and refuse thy name;" +msgstr "Deny thy father and refuse thy name;" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:746 +msgid "Or if thou wilt not, be but sworn my love" +msgstr "Or if thou wilt not, be but sworn my love" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:749 +msgid "And I'll no longer be a Capulet." +msgstr "And I'll no longer be a Capulet." + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:752 +msgid "Shall I hear more, or shall I speak at this?" +msgstr "Shall I hear more, or shall I speak at this?" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:755 +msgid "Juliet has disconnected" +msgstr "Juliet has disconnected" + +#: ../src/empathy-preferences.c:1159 +msgid "Preferences" +msgstr "Preferences" -#~ msgid "Cornish" -#~ msgstr "Cornish" +#: ../src/empathy-preferences.ui.h:1 +msgid "Show _smileys as images" +msgstr "Show _smileys as images" -#~ msgid "Limburgish" -#~ msgstr "Limburgish" +#: ../src/empathy-preferences.ui.h:2 +msgid "Show contact _list in rooms" +msgstr "Show contact _list in rooms" -#~ msgid "Lithuanian" -#~ msgstr "Lithuanian" +#: ../src/empathy-preferences.ui.h:3 +msgid "Appearance" +msgstr "Appearance" -#~ msgid "Latvian" -#~ msgstr "Latvian" +#: ../src/empathy-preferences.ui.h:4 +msgid "Start chats in:" +msgstr "Start chats in:" -#~ msgid "Maori" -#~ msgstr "Maori" +#: ../src/empathy-preferences.ui.h:5 +msgid "new ta_bs" +msgstr "new ta_bs" -#~ msgid "Macedonian" -#~ msgstr "Macedonian" +#: ../src/empathy-preferences.ui.h:6 +msgid "new _windows" +msgstr "new _windows" -#~ msgid "Malayalam" -#~ msgstr "Malayalam" +#: ../src/empathy-preferences.ui.h:7 +msgid "Display incoming events in the notification area" +msgstr "Display incoming events in the notification area" -#~ msgid "Mongolian" -#~ msgstr "Mongolian" +#: ../src/empathy-preferences.ui.h:8 +msgid "_Automatically connect on startup" +msgstr "_Automatically connect on startup" -#~ msgid "Marathi" -#~ msgstr "Marathi" +#: ../src/empathy-preferences.ui.h:9 +msgid "Log conversations" +msgstr "Log conversations" -#~ msgid "Malay" -#~ msgstr "Malay" +#: ../src/empathy-preferences.ui.h:10 +msgid "Behavior" +msgstr "Behaviour" -#~ msgid "Norwegian (Bokmal)" -#~ msgstr "Norwegian (Bokmal)" +#: ../src/empathy-preferences.ui.h:11 +msgid "General" +msgstr "General" -#~ msgid "Nepali" -#~ msgstr "Nepali" +#: ../src/empathy-preferences.ui.h:12 +msgid "_Enable bubble notifications" +msgstr "_Enable bubble notifications" -#~ msgid "Dutch" -#~ msgstr "Dutch" +#: ../src/empathy-preferences.ui.h:13 +msgid "Disable notifications when _away or busy" +msgstr "Disable notifications when _away or busy" -#~ msgid "Norwegian" -#~ msgstr "Norwegian" +#: ../src/empathy-preferences.ui.h:14 +msgid "Enable notifications when the _chat is not focused" +msgstr "Enable notifications when the _chat is not focused" -#~ msgid "Norwegian (Nynorsk)" -#~ msgstr "Norwegian (Nynorsk)" +#: ../src/empathy-preferences.ui.h:15 +msgid "Enable notifications when a contact comes online" +msgstr "Enable notifications when a contact comes online" -#~ msgid "Norwegian (Nyorsk)" -#~ msgstr "Norwegian (Nyorsk)" +#: ../src/empathy-preferences.ui.h:16 +msgid "Enable notifications when a contact goes offline" +msgstr "Enable notifications when a contact goes offline" -#~ msgid "Oriya" -#~ msgstr "Oriya" +#: ../src/empathy-preferences.ui.h:17 +msgid "Notifications" +msgstr "Notifications" -#~ msgid "Punjabi" -#~ msgstr "Punjabi" +#: ../src/empathy-preferences.ui.h:18 +msgid "_Enable sound notifications" +msgstr "_Enable sound notifications" -#~ msgid "Polish" -#~ msgstr "Polish" +#: ../src/empathy-preferences.ui.h:19 +msgid "Disable sounds when _away or busy" +msgstr "Disable sounds when _away or busy" -#~ msgid "Portuguese" -#~ msgstr "Portuguese" +#: ../src/empathy-preferences.ui.h:20 +msgid "Play sound for events" +msgstr "Play sound for events" -#~ msgid "Portuguese (Portugal)" -#~ msgstr "Portuguese (Portugal)" +#: ../src/empathy-preferences.ui.h:21 +msgid "Sounds" +msgstr "Sounds" -#~ msgid "Portuguese (Brazil)" -#~ msgstr "Portuguese (Brazil)" +#: ../src/empathy-preferences.ui.h:22 +msgid "Use _echo cancellation to improve call quality" +msgstr "Use _echo cancellllation to improve call quality" -#~ msgid "Romanian" -#~ msgstr "Romanian" +#: ../src/empathy-preferences.ui.h:23 +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 "" +"Echo cancellllation 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 " +"cancellllation off and restarting the call." -#~ msgid "Russian" -#~ msgstr "Russian" +#: ../src/empathy-preferences.ui.h:26 +msgid "_Publish location to my contacts" +msgstr "_Publish location to my contacts" -#~ msgid "Kinyarwanda" -#~ msgstr "Kinyarwanda" +#: ../src/empathy-preferences.ui.h:27 +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 "" +"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." -#~ msgid "Slovak" -#~ msgstr "Slovak" +#. 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:29 +msgid "_Reduce location accuracy" +msgstr "_Reduce location accuracy" -#~ msgid "Slovenian" -#~ msgstr "Slovenian" +#: ../src/empathy-preferences.ui.h:30 +msgid "Privacy" +msgstr "Privacy" -#~ msgid "Albanian" -#~ msgstr "Albanian" +#: ../src/empathy-preferences.ui.h:31 +msgid "_GPS" +msgstr "_GPS" -#~ msgid "Serbian" -#~ msgstr "Serbian" +#: ../src/empathy-preferences.ui.h:32 +msgid "_Cellphone" +msgstr "_Cellphone" -#~ msgid "Swedish" -#~ msgstr "Swedish" +#: ../src/empathy-preferences.ui.h:33 +msgid "_Network (IP, Wi-Fi)" +msgstr "_Network (IP, Wi-Fi)" -#~ msgid "Tamil" -#~ msgstr "Tamil" +#: ../src/empathy-preferences.ui.h:34 +msgid "Location sources:" +msgstr "Location sources:" -#~ msgid "Telugu" -#~ msgstr "Telugu" +#: ../src/empathy-preferences.ui.h:36 +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." -#~ msgid "Thai" -#~ msgstr "Thai" +#: ../src/empathy-preferences.ui.h:37 +msgid "Enable spell checking for languages:" +msgstr "Enable spell checking for languages:" -#~ msgid "Turkmen" -#~ msgstr "Turkmen" +#: ../src/empathy-preferences.ui.h:38 +msgid "Spell Checking" +msgstr "Spell Checking" -#~ msgid "Turkish" -#~ msgstr "Turkish" +#: ../src/empathy-preferences.ui.h:39 +msgid "Chat Th_eme:" +msgstr "Chat Th_eme:" -#~ msgid "Ukrainian" -#~ msgstr "Ukrainian" +#: ../src/empathy-preferences.ui.h:40 +msgid "Variant:" +msgstr "Variant:" -#~ msgid "Vietnamese" -#~ msgstr "Vietnamese" +#: ../src/empathy-preferences.ui.h:41 +msgid "Themes" +msgstr "Themes" -#~ msgid "Wallon" -#~ msgstr "Wallon" +#: ../src/empathy-status-icon.ui.h:4 +msgid "Status" +msgstr "Status" -#~ msgid "Xhosa" -#~ msgstr "Xhosa" +#: ../src/empathy-status-icon.ui.h:5 +msgid "_Quit" +msgstr "_Quit" -#~ msgid "Yiddish" -#~ msgstr "Yiddish" +#: ../src/empathy-streamed-media-window.ui.h:3 +msgid "Redial" +msgstr "Redial" -#~ msgid "Chinese Simplified" -#~ msgstr "Chinese Simplified" +#: ../src/empathy-streamed-media-window.ui.h:4 +msgid "V_ideo" +msgstr "V_ideo" -#~ msgid "Chinese Traditional" -#~ msgstr "Chinese Traditional" +#: ../src/empathy-streamed-media-window.ui.h:5 +msgid "Video Off" +msgstr "Video Off" -#~ msgid "View Lo_g" -#~ msgstr "View Lo_g" +#: ../src/empathy-streamed-media-window.ui.h:6 +msgid "Video Preview" +msgstr "Video Preview" -#, fuzzy -#~ msgid "Gossip - Chat Rooms" -#~ msgstr "Gossip - Edit Chat Room" +#: ../src/empathy-streamed-media-window.ui.h:7 +msgid "Video On" +msgstr "Video On" -#~ msgid "Gossip - Group Chat" -#~ msgstr "Gossip - Group Chat" +#: ../src/empathy-streamed-media-window.ui.h:10 +msgid "Call the contact again" +msgstr "Call the contact again" -#, fuzzy -#~ msgid "Gossip - New Chatroom" -#~ msgstr "Gossip - Edit Chat Room" +#: ../src/empathy-streamed-media-window.ui.h:13 +msgid "Camera Off" +msgstr "Camera Off" -#~ msgid "Gossip - Add contact" -#~ msgstr "Gossip - Add contact" +#: ../src/empathy-streamed-media-window.ui.h:14 +msgid "Disable camera and stop sending video" +msgstr "Disable camera and stop sending video" -#~ msgid "Gossip - Contact Information" -#~ msgstr "Gossip - Contact Information" +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Preview" +msgstr "Preview" -#~ msgid "Gossip - Edit Groups" -#~ msgstr "Gossip - Edit Groups" +#: ../src/empathy-streamed-media-window.ui.h:16 +msgid "Enable camera but don't send video" +msgstr "Enable camera but don't send video" -#~ msgid "Gossip - New Account" -#~ msgstr "Gossip - New Account" +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Camera On" +msgstr "Camera On" -#~ msgid "Gossip - New Message" -#~ msgstr "Gossip - New Message" +#: ../src/empathy-streamed-media-window.ui.h:18 +msgid "Enable camera and send video" +msgstr "Enable camera and send video" -#~ msgid "Gossip - Personal Details" -#~ msgstr "Gossip - Personal Details" +#: ../src/empathy-map-view.c:471 +msgid "Contact Map View" +msgstr "Contact Map View" -#~ msgid "Gossip - Preferences" -#~ msgstr "Gossip - Preferences" +#: ../src/empathy-debug-window.c:1228 +msgid "Save" +msgstr "Save" -#~ msgid "Gossip - Spell Checker" -#~ msgstr "Gossip - Spell Checker" +#: ../src/empathy-debug-window.c:1435 +msgid "Debug Window" +msgstr "Debug Window" -#~ msgid "Gossip - Status Message" -#~ msgstr "Gossip - Status Message" +#: ../src/empathy-debug-window.c:1517 +msgid "Pause" +msgstr "Pause" -#~ msgid "Waiting for server to respond, please wait..." -#~ msgstr "Waiting for server to respond; please wait..." +#: ../src/empathy-debug-window.c:1529 +msgid "Level " +msgstr "Level " -#~ msgid "Connection could not be created" -#~ msgstr "Connection could not be created" +#: ../src/empathy-debug-window.c:1549 +msgid "Debug" +msgstr "Debug" -#~ msgid "Redirect" -#~ msgstr "Redirect" +#: ../src/empathy-debug-window.c:1555 +msgid "Info" +msgstr "Info" -#~ msgid "Bad Request" -#~ msgstr "Bad Request" +#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610 +msgid "Message" +msgstr "Message" -#~ msgid "Not Authorized" -#~ msgstr "Not Authorized" +#: ../src/empathy-debug-window.c:1567 +msgid "Warning" +msgstr "Warning" -#~ msgid "Payment Required" -#~ msgstr "Payment Required" +#: ../src/empathy-debug-window.c:1573 +msgid "Critical" +msgstr "Critical" -#~ msgid "Forbidden" -#~ msgstr "Forbidden" +#: ../src/empathy-debug-window.c:1579 +msgid "Error" +msgstr "Error" -#~ msgid "Not Found" -#~ msgstr "Not Found" +#: ../src/empathy-debug-window.c:1598 +msgid "Time" +msgstr "Time" -#~ msgid "Not Allowed" -#~ msgstr "Not Allowed" +#: ../src/empathy-debug-window.c:1601 +msgid "Domain" +msgstr "Domain" -#~ msgid "Not Acceptable" -#~ msgstr "Not Acceptable" +#: ../src/empathy-debug-window.c:1603 +msgid "Category" +msgstr "Category" -#~ msgid "Request Timeout" -#~ msgstr "Request Timeout" +#: ../src/empathy-debug-window.c:1605 +msgid "Level" +msgstr "Level" -#~ msgid "Conflict" -#~ msgstr "Conflict" +#: ../src/empathy-debug-window.c:1642 +msgid "" +"The selected connection manager does not support the remote debugging " +"extension." +msgstr "" +"The selected connection manager does not support the remote debugging " +"extension." -#~ msgid "Not Implemented" -#~ msgstr "Not Implemented" +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 +msgid "Invite Participant" +msgstr "Invite Participant" -#~ msgid "Remote Server Error" -#~ msgstr "Remote Server Error" +#: ../src/empathy-invite-participant-dialog.c:201 +msgid "Choose a contact to invite into the conversation:" +msgstr "Choose a contact to invite into the conversation:" -#~ msgid "Unknown error." -#~ msgstr "Unknown error." +#: ../src/empathy-invite-participant-dialog.c:224 +msgid "Invite" +msgstr "Invite" -#~ msgid "Custom" -#~ msgstr "Custom" +#: ../src/empathy-accounts.c:183 +msgid "Don't display any dialogs; do any work (eg, importing) and exit" +msgstr "Don't display any dialogs; do any work (eg, importing) and exit" -#~ msgid "The chat room you are trying is not responding." -#~ msgstr "The chat room you are trying is not responding." +#: ../src/empathy-accounts.c:187 +msgid "" +"Don't display any dialogs unless there are only \"People Nearby\" accounts" +msgstr "" +"Don't display any dialogs unless there are only \"People Nearby\" accounts" -#~ msgid "Check your details and try again." -#~ msgstr "Check your details and try again." +#: ../src/empathy-accounts.c:191 +msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" +msgstr "" +"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" + +#: ../src/empathy-accounts.c:193 +msgid "" +msgstr "" + +#: ../src/empathy-accounts.c:196 +msgid "Show account assistant" +msgstr "Show account assistant" + +#: ../src/empathy-accounts.c:202 +msgid "- Empathy Accounts" +msgstr "- Empathy Accounts" + +#: ../src/empathy-accounts.c:238 +msgid "Empathy Accounts" +msgstr "Empathy Accounts" + +#: ../src/empathy-debugger.c:69 +msgid "Show a particular service" +msgstr "Show a particular service" + +#: ../src/empathy-debugger.c:74 +msgid "- Empathy Debugger" +msgstr "- Empathy Debugger" + +#: ../src/empathy-debugger.c:113 +msgid "Empathy Debugger" +msgstr "Empathy Debugger" + +#: ../src/empathy-chat.c:107 +msgid "- Empathy Chat Client" +msgstr "- Empathy Chat Client" + +#: ../src/empathy-notifications-approver.c:190 +msgid "Respond" +msgstr "Respond" + +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 +msgid "Reject" +msgstr "Reject" + +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 +msgid "Answer" +msgstr "Answer" + +#: ../src/empathy-notifications-approver.c:214 +msgid "Answer with video" +msgstr "Answer with video" + +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 +msgid "Decline" +msgstr "Decline" + +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 +msgid "Accept" +msgstr "Accept" + +#. 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:247 +msgid "Provide" +msgstr "Provide" + +#: ../src/empathy-call-observer.c:134 +#, c-format +msgid "%s just tried to call you, but you were in another call." +msgstr "%s just tried to call you, but you were in another call." -#~ msgid "This is currently unsupported." -#~ msgstr "This is currently unsupported." +#. Translators: this is an "Info" label. It should be as short +#. * as possible. +#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 +msgid "i" +msgstr "i" -#~ msgid "Perhaps the conference server is busy, try again later." -#~ msgstr "Perhaps the conference server is busy; try again later." +#: ../src/empathy-call-window.c:2929 +msgid "On hold" +msgstr "On hold" -#~ msgid "Check the server host name is correct and is available." -#~ msgstr "Check the server host name is correct and is available." +#: ../src/empathy-call-window.c:2932 +msgid "Mute" +msgstr "Mute" -#~ msgid "Gossip will now try to use your account:" -#~ msgstr "Gossip will now try to use your account:" +#: ../src/empathy-call-window.c:2934 +msgid "Duration" +msgstr "Duration" -#~ msgid "Gossip will now try to register the account:" -#~ msgstr "Gossip will now try to register the account:" +#. Translators: 'status - minutes:seconds' the caller has been connected +#: ../src/empathy-call-window.c:2937 +#, c-format +msgid "%s — %d:%02dm" +msgstr "%s — %d:%02dm" -#~ msgid "Cus_tomize" -#~ msgstr "Cus_tomize" +#: ../src/empathy-call-window.c:3207 +#, c-format +msgid "Your current balance is %s." +msgstr "Your current balance is %s." -#~ msgid "Edit or Delete this favorite." -#~ msgstr "Edit or Delete this favourite." +#: ../src/empathy-call-window.c:3211 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "Sorry, you don’t have enough credit for that call." -#~ msgid "Gossip - Join Chat Room " -#~ msgstr "Gossip - Join Chat Room " +#: ../src/empathy-call-window.c:3213 +msgid "Top Up" +msgstr "Top Up" -#~ msgid "Choose a Server" -#~ msgstr "Choose a Server" +#: ../libempathy-gtk/empathy-search-bar.c:243 +msgid "_Match case" +msgstr "_Match case" -#~ msgid "On what server do you have an account?" -#~ msgstr "On what server do you have an account?" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Adding new account" diff --git a/po/es.po b/po/es.po index 38be0972..a2cacc02 100644 --- a/po/es.po +++ b/po/es.po @@ -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 , 2007, 2008, 2009, 2010, 2011. -# Daniel Mustieles , 2010, 2011. +# Daniel Mustieles , 2010, 2011, 2012. # 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: 2011-11-24 11:20+0000\n" -"PO-Revision-Date: 2011-11-25 17:08+0100\n" +"POT-Creation-Date: 2012-02-16 13:13+0000\n" +"PO-Revision-Date: 2012-02-16 17:23+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -20,533 +20,581 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "Chatee en Google Talk, Facebook, MSN y muchos otros servicios de chat" - -#: ../data/empathy.desktop.in.in.h:2 msgid "Empathy" msgstr "Empathy" +#: ../data/empathy.desktop.in.in.h:2 +msgid "IM Client" +msgstr "Cliente de mensajería instantánea" + #: ../data/empathy.desktop.in.in.h:3 msgid "Empathy Internet Messaging" msgstr "Mensajería instantánea Empathy" #: ../data/empathy.desktop.in.in.h:4 -msgid "IM Client" -msgstr "Cliente de mensajería instantánea" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "Chatee en Google Talk, Facebook, MSN y muchos otros servicios de chat" #: ../data/org.gnome.Empathy.gschema.xml.in.h:1 -msgid "Always open a separate chat window for new chats." -msgstr "Siempre abrir una ventana de chat separada para chats nuevos." +msgid "Connection managers should be used" +msgstr "Se deberían usar gestores de conexión" #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Camera device" -msgstr "Dispositivo de cámara" +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." +msgstr "" +"Indica si se debe usan usar gestores de conectividad para desconectarse/" +"reconectarse automáticamente." #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Camera position" -msgstr "Posición de la cámara" +msgid "Empathy should auto-connect on startup" +msgstr "Empathy se debería autoconectar al inicio" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." +msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "" -"Carácter que añadir después del apodo cuando se usa el completado de apodos " -"(tab) en salas de chat." +"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al " +"inicio." #: ../data/org.gnome.Empathy.gschema.xml.in.h:5 -msgid "Chat window theme" -msgstr "Tema de la ventana de charla" +msgid "Empathy should auto-away when idle" +msgstr "Empathy debería mostrar ausencia en inactividad" #: ../data/org.gnome.Empathy.gschema.xml.in.h:6 -msgid "Chat window theme variant" -msgstr "Variante del tema de la ventana de charla" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 msgid "" -"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +"Whether Empathy should go into away mode automatically if the user is idle." msgstr "" -"Lista separada por comas de idiomas que se usarán en la revisión ortográfica " -"(ej. «es, en, fr»)." +"Indica si Empathy debe entrar en modo de ausencia automáticamente si el " +"usuario está inactivo." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +msgid "Empathy default download folder" +msgstr "Carpeta de descargas predeterminada de Epiphany" #: ../data/org.gnome.Empathy.gschema.xml.in.h:8 -msgid "Compact contact list" -msgstr "Lista compacta de contactos" +msgid "The default folder to save file transfers in." +msgstr "La carpeta predeterminada donde guardar los archivos transferidos." #: ../data/org.gnome.Empathy.gschema.xml.in.h:9 -msgid "Connection managers should be used" -msgstr "Se deberían usar gestores de conexión" +msgid "Show offline contacts" +msgstr "Mostrar contactos no conectados" #: ../data/org.gnome.Empathy.gschema.xml.in.h:10 -msgid "Contact list sort criterion" -msgstr "Criterio de ordenación de la lista de contactos" +msgid "Whether to show contacts that are offline in the contact list." +msgstr "" +"Indica si se debe mostrar los contactos que están desconectados en la lista " +"de contactos." #: ../data/org.gnome.Empathy.gschema.xml.in.h:11 -msgid "D-Bus object path of the last account selected to join a room." -msgstr "" -"Ruta del objeto D-Bus de la última cuenta seleccionada para unirse a una " -"sala." +msgid "Show avatars" +msgstr "Mostrar avatares" #: ../data/org.gnome.Empathy.gschema.xml.in.h:12 -msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." msgstr "" -"El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, " -"ej. /dev/video0." +"Indica si se deben mostrar los avatares para los contactos en la lista de " +"contactos y ventanas de chat." #: ../data/org.gnome.Empathy.gschema.xml.in.h:13 -msgid "Default directory to select an avatar image from" -msgstr "Carpeta predeterminada para seleccionar un avatar" +msgid "Show protocols" +msgstr "Mostrar protocolos" #: ../data/org.gnome.Empathy.gschema.xml.in.h:14 -msgid "Disable popup notifications when away" -msgstr "Desactivar las notificaciones emergentes al estar ausente" +msgid "Whether to show protocols for contacts in the contact list." +msgstr "" +"Indica si se deben mostrar los protocolos para los contactos en la lista de " +"contactos." #: ../data/org.gnome.Empathy.gschema.xml.in.h:15 -msgid "Disable sounds when away" -msgstr "Desactivar los sonidos al ausentarse" +msgid "Show Balance in contact list" +msgstr "Mostrar crédito en la lista de contactos" #: ../data/org.gnome.Empathy.gschema.xml.in.h:16 -msgid "Display incoming events in the status area" -msgstr "Mostrar los eventos entrantes en el área de estado" +msgid "Whether to show account balances in the contact list." +msgstr "Indica si se debe mostrar el crédito en la lista de contactos." #: ../data/org.gnome.Empathy.gschema.xml.in.h:17 -msgid "" -"Display incoming events in the status area. If false, present them to the " -"user immediately." -msgstr "" -"Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos " -"directamente al usuario." +msgid "Compact contact list" +msgstr "Lista compacta de contactos" #: ../data/org.gnome.Empathy.gschema.xml.in.h:18 -msgid "Echo cancellation support" -msgstr "Soporte de cancelación de eco" +msgid "Whether to show the contact list in compact mode." +msgstr "Indica si se debe mostrar la lista de contactos en modo compacto." #: ../data/org.gnome.Empathy.gschema.xml.in.h:19 -msgid "Empathy can publish the user's location" -msgstr "Empathy puede publicar la ubicación del usuario" +msgid "Hide main window" +msgstr "Ocultar la ventana principal" #: ../data/org.gnome.Empathy.gschema.xml.in.h:20 -msgid "Empathy can use the GPS to guess the location" -msgstr "Empathy puede usar el GPS para deducir la ubicación" +msgid "Hide the main window." +msgstr "Ocultar la ventana principal." #: ../data/org.gnome.Empathy.gschema.xml.in.h:21 -msgid "Empathy can use the cellular network to guess the location" -msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación" +msgid "Default directory to select an avatar image from" +msgstr "Carpeta predeterminada para seleccionar un avatar" #: ../data/org.gnome.Empathy.gschema.xml.in.h:22 -msgid "Empathy can use the network to guess the location" -msgstr "Empathy puede usar la red para deducir la ubicación" +msgid "The last directory that an avatar image was chosen from." +msgstr "Última carpeta de la que se eligió un avatar." #: ../data/org.gnome.Empathy.gschema.xml.in.h:23 -msgid "Empathy default download folder" -msgstr "Carpeta de descargas predeterminada de Epiphany" +msgid "Open new chats in separate windows" +msgstr "Abrir chats nuevos en ventanas separadas" #: ../data/org.gnome.Empathy.gschema.xml.in.h:24 -msgid "Empathy should auto-away when idle" -msgstr "Empathy debería mostrar ausencia en inactividad" +msgid "Always open a separate chat window for new chats." +msgstr "Siempre abrir una ventana de chat separada para chats nuevos." #: ../data/org.gnome.Empathy.gschema.xml.in.h:25 -msgid "Empathy should auto-connect on startup" -msgstr "Empathy se debería autoconectar al inicio" +msgid "Display incoming events in the status area" +msgstr "Mostrar los eventos entrantes en el área de estado" #: ../data/org.gnome.Empathy.gschema.xml.in.h:26 -msgid "Empathy should reduce the location's accuracy" -msgstr "Empathy debería reducir la precisión de la ubicación" +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." +msgstr "" +"Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos " +"directamente al usuario." #: ../data/org.gnome.Empathy.gschema.xml.in.h:27 -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "" -"Empathy debería usar el avatar del contacto como icono de la ventana de chat" +msgid "The position for the chat window side pane" +msgstr "La posición para el panel lateral de la ventana de charla" #: ../data/org.gnome.Empathy.gschema.xml.in.h:28 -msgid "Enable WebKit Developer Tools" -msgstr "Activar las herramientas de desarrollo de WebKit" +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "" +"La posición almacenada (en píxeles) del panel lateral de la ventana de " +"charla." #: ../data/org.gnome.Empathy.gschema.xml.in.h:29 -msgid "Enable popup notifications for new messages" -msgstr "Activar notificaciones emergentes para mensajes nuevos" +msgid "Show contact groups" +msgstr "Mostrar grupos de contactos" #: ../data/org.gnome.Empathy.gschema.xml.in.h:30 -msgid "Enable spell checker" -msgstr "Activar revisor ortográfico" +msgid "Whether to show groups in the contact list." +msgstr "Indica si se deben mostrar los grupos en la lista de contactos." #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 -msgid "Hide main window" -msgstr "Ocultar la ventana principal" +msgid "Contact list sort criterion" +msgstr "Criterio de ordenación de la lista de contactos" #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 -msgid "Hide the main window." -msgstr "Ocultar la ventana principal." +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." +msgstr "" +"Qué criterio usar al ordenar la lista de contactos. El predeterminado es " +"ordenar por el estado del contacto con el valor «state» (estado). Un valor " +"«nombre» (nombre) ordenará la lista por el nombre." #: ../data/org.gnome.Empathy.gschema.xml.in.h:33 -msgid "Last account selected in Join Room dialog" -msgstr "Última cuenta seleccionada en el diálogo Unirse a sala" +msgid "Use notification sounds" +msgstr "Usar sonidos de notificación" #: ../data/org.gnome.Empathy.gschema.xml.in.h:34 -msgid "Nick completed character" -msgstr "Carácter de completado de apodo" +msgid "Whether to play a sound to notify of events." +msgstr "Indica si se debe reproducir un sonido para notificar eventos." #: ../data/org.gnome.Empathy.gschema.xml.in.h:35 -msgid "Open new chats in separate windows" -msgstr "Abrir chats nuevos en ventanas separadas" +msgid "Disable sounds when away" +msgstr "Desactivar los sonidos al ausentarse" #: ../data/org.gnome.Empathy.gschema.xml.in.h:36 -msgid "Path of the Adium theme to use" -msgstr "Ruta del tema Adium que usar" +msgid "Whether to play sound notifications when away or busy." +msgstr "" +"Indica si se deben reproducir sonidos de notificaciones cuando se esté " +"ausente u ocupado." #: ../data/org.gnome.Empathy.gschema.xml.in.h:37 -msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound for incoming messages" msgstr "Reproducir un sonido cuando lleguen mensajes" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 -msgid "Play a sound for new conversations" -msgstr "Reproducir un sonido para conversaciones nuevas" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +msgid "Whether to play a sound to notify of incoming messages." +msgstr "" +"Indica si se debe reproducir un sonido para notificar mensajes entrantes." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for outgoing messages" msgstr "Reproducir un sonido al enviar mensajes" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "" +"Indica si se debe reproducir un sonido para notificar mensajes salientes." + #: ../data/org.gnome.Empathy.gschema.xml.in.h:41 -msgid "Play a sound when a contact logs in" -msgstr "Reproducir un sonido cuando un contacto inicie sesión" +msgid "Play a sound for new conversations" +msgstr "Reproducir un sonido para conversaciones nuevas" #: ../data/org.gnome.Empathy.gschema.xml.in.h:42 -msgid "Play a sound when a contact logs out" -msgstr "Reproducir un sonido cuando un contacto finalice su sesión" +msgid "Whether to play a sound to notify of new conversations." +msgstr "" +"Indica si se debe reproducir un sonido para notificar conversaciones nuevas." #: ../data/org.gnome.Empathy.gschema.xml.in.h:43 -msgid "Play a sound when we log in" -msgstr "Reproducir un sonido cuando inicio sesión" +msgid "Play a sound when a contact logs in" +msgstr "Reproducir un sonido cuando un contacto inicie sesión" #: ../data/org.gnome.Empathy.gschema.xml.in.h:44 -msgid "Play a sound when we log out" -msgstr "Reproducir un sonido al finalizar una sesión" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "" +"Indica si se debe reproducir un sonido para notificar los inicios de sesión " +"de los contactos en la red." #: ../data/org.gnome.Empathy.gschema.xml.in.h:45 -msgid "Pop up notifications if the chat isn't focused" -msgstr "" -"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco" +msgid "Play a sound when a contact logs out" +msgstr "Reproducir un sonido cuando un contacto finalice su sesión" #: ../data/org.gnome.Empathy.gschema.xml.in.h:46 -msgid "Pop up notifications when a contact logs in" -msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta" +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "" +"Indica si se debe reproducir un sonido para notificar las finalizaciones de " +"sesión de los contactos en la red." #: ../data/org.gnome.Empathy.gschema.xml.in.h:47 -msgid "Pop up notifications when a contact logs out" -msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta" +msgid "Play a sound when we log in" +msgstr "Reproducir un sonido cuando inicio sesión" #: ../data/org.gnome.Empathy.gschema.xml.in.h:48 -msgid "Position the camera preview should be during a call." -msgstr "Posición donde estar la vista previa de la cámara durante una llamada." +msgid "Whether to play a sound when logging into a network." +msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red." #: ../data/org.gnome.Empathy.gschema.xml.in.h:49 -msgid "Show Balance in contact list" -msgstr "Mostrar crédito en la lista de contactos" +msgid "Play a sound when we log out" +msgstr "Reproducir un sonido al finalizar una sesión" #: ../data/org.gnome.Empathy.gschema.xml.in.h:50 -msgid "Show avatars" -msgstr "Mostrar avatares" +msgid "Whether to play a sound when logging out of a network." +msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red." #: ../data/org.gnome.Empathy.gschema.xml.in.h:51 -msgid "Show contact list in rooms" -msgstr "Mostrar lista de contactos en salas" +msgid "Enable popup notifications for new messages" +msgstr "Activar notificaciones emergentes para mensajes nuevos" #: ../data/org.gnome.Empathy.gschema.xml.in.h:52 -msgid "Show hint about closing the main window" -msgstr "Mostrar consejo sobre cómo cerrar la ventana principal" +msgid "Whether to show a popup notification when receiving a new message." +msgstr "" +"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje " +"nuevo." #: ../data/org.gnome.Empathy.gschema.xml.in.h:53 -msgid "Show offline contacts" -msgstr "Mostrar contactos no conectados" +msgid "Disable popup notifications when away" +msgstr "Desactivar las notificaciones emergentes al estar ausente" #: ../data/org.gnome.Empathy.gschema.xml.in.h:54 -msgid "Show protocols" -msgstr "Mostrar protocolos" +msgid "Whether to show popup notifications when away or busy." +msgstr "" +"Indica si se deben mostrar las notificaciones emergentes cuando se esté " +"ausente u ocupado." #: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -msgid "Spell checking languages" -msgstr "Idiomas para revisión ortográfica" +msgid "Pop up notifications if the chat isn't focused" +msgstr "" +"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco" #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 -msgid "The default folder to save file transfers in." -msgstr "La carpeta predeterminada donde guardar los archivos transferidos." +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" +"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje " +"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco." #: ../data/org.gnome.Empathy.gschema.xml.in.h:57 -msgid "The last directory that an avatar image was chosen from." -msgstr "Última carpeta de la que se eligió un avatar." +msgid "Pop up notifications when a contact logs in" +msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta" #: ../data/org.gnome.Empathy.gschema.xml.in.h:58 -msgid "The position for the chat window side pane" -msgstr "La posición para el panel lateral de la ventana de charla" +msgid "Whether to show a popup notification when a contact goes online." +msgstr "" +"Indica si se deben mostrar las notificaciones emergentes cuando un contacto " +"se conecta." #: ../data/org.gnome.Empathy.gschema.xml.in.h:59 -msgid "The stored position (in pixels) of the chat window side pane." -msgstr "" -"La posición almacenada (en píxeles) del panel lateral de la ventana de " -"charla." +msgid "Pop up notifications when a contact logs out" +msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta" #: ../data/org.gnome.Empathy.gschema.xml.in.h:60 -msgid "The theme that is used to display the conversation in chat windows." +msgid "Whether to show a popup notification when a contact goes offline." msgstr "" -"El tema que se usará para mostrar la conversación en las ventanas de chat." +"Indica si se deben mostrar las notificaciones emergentes cuando un contacto " +"se desconecta." #: ../data/org.gnome.Empathy.gschema.xml.in.h:61 -msgid "" -"The theme variant that is used to display the conversation in chat windows." -msgstr "" -"La variante del tema que se usará para mostrar la conversación en las " -"ventanas de chat." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "Usar emoticonos gráficos" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "" +"Indica si se deben convertir los emoticonos en imágenes gráficas en las " +"conversaciones." + #: ../data/org.gnome.Empathy.gschema.xml.in.h:63 -msgid "Use notification sounds" -msgstr "Usar sonidos de notificación" +msgid "Show contact list in rooms" +msgstr "Mostrar lista de contactos en salas" #: ../data/org.gnome.Empathy.gschema.xml.in.h:64 -msgid "Use theme for chat rooms" -msgstr "Usar tema para salas de chat" +msgid "Whether to show the contact list in chat rooms." +msgstr "Indica si se debe mostrar la lista de contactos en salas de chat." #: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "" -"Indica si Empathy puede publicar la ubicación del usuario a sus contactos." +msgid "Chat window theme" +msgstr "Tema de la ventana de charla" #: ../data/org.gnome.Empathy.gschema.xml.in.h:66 -msgid "Whether Empathy can use the GPS to guess the location." -msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación." +msgid "The theme that is used to display the conversation in chat windows." +msgstr "" +"El tema que se usará para mostrar la conversación en las ventanas de chat." #: ../data/org.gnome.Empathy.gschema.xml.in.h:67 -msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "" -"Indica si Empathy puede usar la red telefónica móvil para deducir la " -"ubicación." +msgid "Chat window theme variant" +msgstr "Variante del tema de la ventana de charla" #: ../data/org.gnome.Empathy.gschema.xml.in.h:68 -msgid "Whether Empathy can use the network to guess the location." -msgstr "Indica si Empathy puede usar la red para deducir la ubicación." +msgid "" +"The theme variant that is used to display the conversation in chat windows." +msgstr "" +"La variante del tema que se usará para mostrar la conversación en las " +"ventanas de chat." #: ../data/org.gnome.Empathy.gschema.xml.in.h:69 -msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "" -"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al " -"inicio." +msgid "Path of the Adium theme to use" +msgstr "Ruta del tema Adium que usar" #: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "" -"Whether Empathy should go into away mode automatically if the user is idle." -msgstr "" -"Indica si Empathy debe entrar en modo de ausencia automáticamente si el " -"usuario está inactivo." +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium." #: ../data/org.gnome.Empathy.gschema.xml.in.h:71 -msgid "" -"Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "" -"Indica si Empathy debería reducir la precisión de la ubicación por motivos " -"de privacidad." +msgid "Enable WebKit Developer Tools" +msgstr "Activar las herramientas de desarrollo de WebKit" #: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" -"Whether Empathy should use the avatar of the contact as the chat window icon." -msgstr "" -"Indica si Empathy debería usar el avatar del contacto como el icono de la " -"ventana de chat." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 -msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" "Indica si las herramientas de desarrollo de WebKit, tales como el Inspector " "web, den activarse." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +msgid "Inform other users when you are typing to them" +msgstr "Informar a otros usuarios de cuándo les esta escribiendo" + #: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" -"Whether connectivity managers should be used to automatically disconnect/" -"reconnect." +"Whether to send the 'composing' or 'paused' chat states. Does not currently " +"affect the 'gone' state." msgstr "" -"Indica si se debe usan usar gestores de conectividad para desconectarse/" -"reconectarse automáticamente." +"Indica si enviar los estados de chat «escribiendo» o «en pausa». No afecta al " +"estado «ausente»." #: ../data/org.gnome.Empathy.gschema.xml.in.h:75 -msgid "" -"Whether to check words typed against the languages you want to check with." -msgstr "" -"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas " -"con los que quiere comprobarlo." +msgid "Use theme for chat rooms" +msgstr "Usar tema para salas de chat" #: ../data/org.gnome.Empathy.gschema.xml.in.h:76 -msgid "Whether to convert smileys into graphical images in conversations." -msgstr "" -"Indica si se deben convertir los emoticonos en imágenes gráficas en las " -"conversaciones." +msgid "Whether to use the theme for chat rooms." +msgstr "Indica si se debe usar el tema para salas de chat." #: ../data/org.gnome.Empathy.gschema.xml.in.h:77 -msgid "Whether to enable Pulseaudio's echo cancellation filter." -msgstr "" -"Indica si se debe activar la el filtro de cancelación de eco de Pulseaudio." +msgid "Spell checking languages" +msgstr "Idiomas para revisión ortográfica" #: ../data/org.gnome.Empathy.gschema.xml.in.h:78 -msgid "Whether to play a sound to notify of contacts logging into the network." +msgid "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" -"Indica si se debe reproducir un sonido para notificar los inicios de sesión " -"de los contactos en la red." +"Lista separada por comas de idiomas que se usarán en la revisión ortográfica " +"(ej. «es, en, fr»)." #: ../data/org.gnome.Empathy.gschema.xml.in.h:79 -msgid "" -"Whether to play a sound to notify of contacts logging out of the network." -msgstr "" -"Indica si se debe reproducir un sonido para notificar las finalizaciones de " -"sesión de los contactos en la red." +msgid "Enable spell checker" +msgstr "Activar revisor ortográfico" #: ../data/org.gnome.Empathy.gschema.xml.in.h:80 -msgid "Whether to play a sound to notify of events." -msgstr "Indica si se debe reproducir un sonido para notificar eventos." +msgid "" +"Whether to check words typed against the languages you want to check with." +msgstr "" +"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas " +"con los que quiere comprobarlo." #: ../data/org.gnome.Empathy.gschema.xml.in.h:81 -msgid "Whether to play a sound to notify of incoming messages." -msgstr "" -"Indica si se debe reproducir un sonido para notificar mensajes entrantes." +msgid "Nick completed character" +msgstr "Carácter de completado de apodo" #: ../data/org.gnome.Empathy.gschema.xml.in.h:82 -msgid "Whether to play a sound to notify of new conversations." +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." msgstr "" -"Indica si se debe reproducir un sonido para notificar conversaciones nuevas." +"Carácter que añadir después del apodo cuando se usa el completado de apodos " +"(tab) en salas de chat." #: ../data/org.gnome.Empathy.gschema.xml.in.h:83 -msgid "Whether to play a sound to notify of outgoing messages." +msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "" -"Indica si se debe reproducir un sonido para notificar mensajes salientes." +"Empathy debería usar el avatar del contacto como icono de la ventana de chat" #: ../data/org.gnome.Empathy.gschema.xml.in.h:84 -msgid "Whether to play a sound when logging into a network." -msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red." +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." +msgstr "" +"Indica si Empathy debería usar el avatar del contacto como el icono de la " +"ventana de chat." #: ../data/org.gnome.Empathy.gschema.xml.in.h:85 -msgid "Whether to play a sound when logging out of a network." -msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red." +msgid "Last account selected in Join Room dialog" +msgstr "Última cuenta seleccionada en el diálogo Unirse a sala" #: ../data/org.gnome.Empathy.gschema.xml.in.h:86 -msgid "Whether to play sound notifications when away or busy." +msgid "D-Bus object path of the last account selected to join a room." msgstr "" -"Indica si se deben reproducir sonidos de notificaciones cuando se esté " -"ausente u ocupado." +"Ruta del objeto D-Bus de la última cuenta seleccionada para unirse a una " +"sala." #: ../data/org.gnome.Empathy.gschema.xml.in.h:87 -msgid "Whether to show a popup notification when a contact goes offline." -msgstr "" -"Indica si se deben mostrar las notificaciones emergentes cuando un contacto " -"se desconecta." +msgid "Camera device" +msgstr "Dispositivo de cámara" #: ../data/org.gnome.Empathy.gschema.xml.in.h:88 -msgid "Whether to show a popup notification when a contact goes online." +msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "" -"Indica si se deben mostrar las notificaciones emergentes cuando un contacto " -"se conecta." +"El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, " +"ej. /dev/video0." #: ../data/org.gnome.Empathy.gschema.xml.in.h:89 -msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." -msgstr "" -"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje " -"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 -msgid "Whether to show a popup notification when receiving a new message." -msgstr "" -"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje " -"nuevo." +msgid "Camera position" +msgstr "Posición de la cámara" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +msgid "Position the camera preview should be during a call." +msgstr "Posición donde estar la vista previa de la cámara durante una llamada." #: ../data/org.gnome.Empathy.gschema.xml.in.h:91 -msgid "Whether to show account balances in the contact list." -msgstr "Indica si se debe mostrar el crédito en la lista de contactos." +msgid "Echo cancellation support" +msgstr "Soporte de cancelación de eco" #: ../data/org.gnome.Empathy.gschema.xml.in.h:92 -msgid "" -"Whether to show avatars for contacts in the contact list and chat windows." +msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "" -"Indica si se deben mostrar los avatares para los contactos en la lista de " -"contactos y ventanas de chat." +"Indica si se debe activar la el filtro de cancelación de eco de Pulseaudio." #: ../data/org.gnome.Empathy.gschema.xml.in.h:93 -msgid "Whether to show contacts that are offline in the contact list." -msgstr "" -"Indica si se debe mostrar los contactos que están desconectados en la lista " -"de contactos." +msgid "Show hint about closing the main window" +msgstr "Mostrar consejo sobre cómo cerrar la ventana principal" #: ../data/org.gnome.Empathy.gschema.xml.in.h:94 -msgid "Whether to show popup notifications when away or busy." +msgid "" +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." msgstr "" -"Indica si se deben mostrar las notificaciones emergentes cuando se esté " -"ausente u ocupado." +"Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana " +"principal con el botón «x» en la barra de título." #: ../data/org.gnome.Empathy.gschema.xml.in.h:95 -msgid "Whether to show protocols for contacts in the contact list." -msgstr "" -"Indica si se deben mostrar los protocolos para los contactos en la lista de " -"contactos." +msgid "Empathy can publish the user's location" +msgstr "Empathy puede publicar la ubicación del usuario" #: ../data/org.gnome.Empathy.gschema.xml.in.h:96 -msgid "Whether to show the contact list in chat rooms." -msgstr "Indica si se debe mostrar la lista de contactos en salas de chat." +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "" +"Indica si Empathy puede publicar la ubicación del usuario a sus contactos." #: ../data/org.gnome.Empathy.gschema.xml.in.h:97 -msgid "Whether to show the contact list in compact mode." -msgstr "Indica si se debe mostrar la lista de contactos en modo compacto." +msgid "Empathy can use the network to guess the location" +msgstr "Empathy puede usar la red para deducir la ubicación" #: ../data/org.gnome.Empathy.gschema.xml.in.h:98 -msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." -msgstr "" -"Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana " -"principal con el botón «x» en la barra de título." +msgid "Whether Empathy can use the network to guess the location." +msgstr "Indica si Empathy puede usar la red para deducir la ubicación." #: ../data/org.gnome.Empathy.gschema.xml.in.h:99 -msgid "Whether to use the theme for chat rooms." -msgstr "Indica si se debe usar el tema para salas de chat." +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación" #: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "" +"Indica si Empathy puede usar la red telefónica móvil para deducir la " +"ubicación." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy puede usar el GPS para deducir la ubicación" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy debería reducir la precisión de la ubicación" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 msgid "" -"Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." +"Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" -"Qué criterio usar al ordenar la lista de contactos. El criterio " -"predeterminado es ordenar por el nombre del contacto con el valor " -"«name» (nombre). Un valor «state» (estado) ordenará la lista por el estado." +"Indica si Empathy debería reducir la precisión de la ubicación por motivos " +"de privacidad." +#. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2328 +msgid "Messaging and VoIP Accounts" +msgstr "Cuentas de mensajería y Voz IP" + +#: ../data/empathy-accounts.desktop.in.in.h:2 msgid "Manage Messaging and VoIP accounts" msgstr "Gestionar las cuentas de mensajería y Voz IP" -#. Tweak the dialog -#: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2312 -msgid "Messaging and VoIP Accounts" -msgstr "Cuentas de mensajería y Voz IP" +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "No se especificó ninguna razón" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Se requirió un cambio en el estado" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Canceló la transferencia del archivo" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "El otro participante canceló la transferencia del archivo" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Error la intentar transferir el archivo" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "El otro participante no puede transferir el archivo" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "Razón desconocida" + +#: ../libempathy/empathy-ft-handler.c:917 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:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "El contacto remoto no soporta la transferencia de archivos" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "El archivo seleccionado no es un archivo regular" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "El archivo seleccionado está vacío" @@ -566,173 +614,141 @@ msgstr "Llamó %s" msgid "Call from %s" msgstr "Llamada de %s" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "El tipo de socket no está soportado" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "No se especificó ninguna razón" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "Se requirió un cambio en el estado" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "Canceló la transferencia del archivo" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "El otro participante canceló la transferencia del archivo" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "Error la intentar transferir el archivo" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "El otro participante no puede transferir el archivo" - -#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Razón desconocida" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "Disponible" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "Ocupado" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "Ausente" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "Invisible" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "Desconectado" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "Desconocido" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "No se especificó ninguna razón" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "El estado se ha establecido a desconectado" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Error de red" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "Falló la autenticación" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "Error de cifrado" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "Nombre en uso" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "No se proporcionó el certificado" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "Certificado sin confianza" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "El certificado ha expirado" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "El certificado no está activado" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "El nombre del equipo del certificado no coincide" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "La huella del certificado no coincide" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "Certificado firmado consigo mismo" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "Error del certificado" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "El cifrado no está disponible" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "El certificado no es válido" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "Se rechazó la conexión" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "No se pudo establecer la conexión" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "Se perdió la conexión" -#: ../libempathy/empathy-utils.c:354 -msgid "This resource is already connected to the server" -msgstr "El recurso ya está conectado al servidor" +#: ../libempathy/empathy-utils.c:355 +msgid "This account is already connected to the server" +msgstr "Esta cuenta ya está conectada al servidor" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 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:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "La cuenta ya existe en el servidor" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 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:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "Se revocó el certificado" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 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:368 +#: ../libempathy/empathy-utils.c:369 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -741,286 +757,262 @@ msgstr "" "servidor de certificados exceden los límites impuestos por la biblioteca " "cripotográfica" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:373 msgid "Your software is too old" msgstr "Su software es demasiado antiguo" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "Error interno" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "Gente cerca" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Yahoo Japón" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Chat de Facebook" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, 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:93 +#: ../libempathy/empathy-time.c:96 #, 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:98 +#: ../libempathy/empathy-time.c:102 #, 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:103 +#: ../libempathy/empathy-time.c:108 #, 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:108 +#: ../libempathy/empathy-time.c:114 #, 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:113 +#: ../libempathy/empathy-time.c:120 #, 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:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "en el futuro" -#: ../libempathy-gtk/empathy-account-chooser.c:688 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "Todas las cuentas" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:336 msgid "Account" msgstr "Cuenta" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Contraseña" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Servidor" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Puerto" -#: ../libempathy-gtk/empathy-account-widget.c:776 -#: ../libempathy-gtk/empathy-account-widget.c:828 +#: ../libempathy-gtk/empathy-account-widget.c:765 +#: ../libempathy-gtk/empathy-account-widget.c:817 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1182 -msgid "My Web Accounts" -msgstr "Mis cuentas web" - -#: ../libempathy-gtk/empathy-account-widget.c:1199 -#, c-format -msgid "The account %s is edited via %s." -msgstr "La cuenta %s se edita a través de %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1205 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "No se puede editar la cuenta %s en Empathy." - -#: ../libempathy-gtk/empathy-account-widget.c:1224 -msgid "Launch My Web Accounts" -msgstr "Lanzar My Web Accounts" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1232 -#, c-format -msgid "Edit %s" -msgstr "Editar %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1582 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget.c:1398 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Username:" msgstr "Nombre de usuario:" -#: ../libempathy-gtk/empathy-account-widget.c:1900 +#: ../libempathy-gtk/empathy-account-widget.c:1710 msgid "A_pply" msgstr "_Aplicar" -#: ../libempathy-gtk/empathy-account-widget.c:1930 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "L_og in" msgstr "Iniciar _sesión" -#: ../libempathy-gtk/empathy-account-widget.c:2004 +#: ../libempathy-gtk/empathy-account-widget.c:1812 msgid "This account already exists on the server" msgstr "Esta cuenta ya existe en el servidor" -#: ../libempathy-gtk/empathy-account-widget.c:2007 +#: ../libempathy-gtk/empathy-account-widget.c:1816 msgid "Create a new account on the server" msgstr "Crear una cuenta nueva en el servidor" -#: ../libempathy-gtk/empathy-account-widget.c:2201 -msgid "Ca_ncel" -msgstr "Ca_ncelar" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2479 +#: ../libempathy-gtk/empathy-account-widget.c:2241 #, 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:2505 +#: ../libempathy-gtk/empathy-account-widget.c:2267 #, c-format msgid "%s Account" msgstr "Cuenta %s" -#: ../libempathy-gtk/empathy-account-widget.c:2509 +#: ../libempathy-gtk/empathy-account-widget.c:2271 msgid "New account" msgstr "Cuenta nueva" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 -msgid "Example: MyScreenName" -msgstr "Ejemplo: MiNombreEnPantalla" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Pass_word:" +msgstr "Contra_seña:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 -msgid "Advanced" -msgstr "Avanzadas" +msgid "Screen _Name:" +msgstr "_Nombre en pantalla:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +msgid "Example: MyScreenName" +msgstr "Ejemplo: MiNombreEnPantalla" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 -msgid "Pass_word:" -msgstr "Contra_seña:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "Recordar contraseña" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -msgid "Remember Password" -msgstr "Recordar contraseña" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Port:" +msgstr "_Puerto:" -#. remember password ticky box -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-base-password-dialog.c:261 -msgid "Remember password" -msgstr "Recordar contraseña" - -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 -msgid "Screen _Name:" -msgstr "_Nombre en pantalla:" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "_Server:" +msgstr "_Servidor:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 -msgid "What is your AIM password?" -msgstr "¿Cuál es su contraseña de AIM?" +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Advanced" +msgstr "Avanzadas" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 msgid "What is your AIM screen name?" msgstr "¿Cuál es su nombre en pantalla para AIM?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 -msgid "_Port:" -msgstr "_Puerto:" +msgid "What is your AIM password?" +msgstr "¿Cuál es su contraseña de AIM?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../src/empathy-new-chatroom-dialog.ui.h:9 -msgid "_Server:" -msgstr "_Servidor:" - -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "Example: username" -msgstr "Ejemplo: usuario" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "Remember Password" +msgstr "Recordar contraseña" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "_ID de sesión:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Example: username" +msgstr "Ejemplo: usuario" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 msgid "What is your GroupWise User ID?" msgstr "¿Cuál es su ID de usuario para GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 msgid "What is your GroupWise password?" msgstr "¿Cuál es su contraseña de GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "_UIN ICQ:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "Example: 123456789" msgstr "Ejemplo: 123456789" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "Ch_aracter set:" msgstr "C_onjunto de caracteres:" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 -msgid "ICQ _UIN:" -msgstr "_UIN ICQ:" - -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 msgid "What is your ICQ UIN?" msgstr "¿Cuál es su UIN de ICQ?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 msgid "What is your ICQ password?" msgstr "¿Cuál es su contraseña de ICQ?" @@ -1057,11 +1049,23 @@ msgstr "Opciones" msgid "None" msgstr "Ninguno" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Network" +msgstr "Red" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +msgid "Network:" +msgstr "Red:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Character set:" msgstr "Conjunto de caracteres:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +msgid "Servers" +msgstr "Servidores" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." @@ -1069,14 +1073,6 @@ msgstr "" "La mayoría de los servidores IRC no necesitan una contraseña, de tal forma " "que si no está seguro, no introduzca una contraseña." -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 -msgid "Network" -msgstr "Red" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 -msgid "Network:" -msgstr "Red:" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "Apodo:" @@ -1093,48 +1089,20 @@ msgstr "Mensaje de salida:" msgid "Real name:" msgstr "Nombre real:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 -msgid "Servers" -msgstr "Servidores" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 -msgid "What is your IRC nickname?" -msgstr "¿Cuál es su apodo del IRC?" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Which IRC network?" msgstr "¿Qué red de IRC?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "Example: user@gmail.com" -msgstr "Ejemplo: usuario@gmail.com" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "Example: user@jabber.org" -msgstr "Ejemplo: usuario@jabber.org" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 -msgid "Encr_yption required (TLS/SSL)" -msgstr "Requiere ci_frado (TLS/SSL)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 -msgid "I_gnore SSL certificate errors" -msgstr "_Ignorar los errores de certificados SSL" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 -msgid "Override server settings" -msgstr "Sobreescribir los ajustes del servidor" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 -msgid "Priori_ty:" -msgstr "Pri_oridad:" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "What is your IRC nickname?" +msgstr "¿Cuál es su apodo del IRC?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 -msgid "Reso_urce:" -msgstr "Re_curso:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "What is your Facebook username?" +msgstr "¿Cuál es su usuario de Facebook?" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/badger, enter badger.\n" @@ -1146,179 +1114,203 @@ msgstr "" "Use esta página para " "elegir un nombre de usuario en Facebook si no tiene uno." -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 -msgid "Use old SS_L" -msgstr "Usar SS_L antiguo" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "What is your Facebook password?" msgstr "¿Cuál es su contraseña de Facebook?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 -msgid "What is your Facebook username?" -msgstr "¿Cuál es su usuario de Facebook?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "What is your Google ID?" msgstr "¿Cuál es su ID de Google?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Example: user@gmail.com" +msgstr "Ejemplo: usuario@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "What is your Google password?" msgstr "¿Cuál es su contraseña de Google?" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +msgid "Example: user@jabber.org" +msgstr "Ejemplo: usuario@jabber.org" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "I_gnore SSL certificate errors" +msgstr "_Ignorar los errores de certificados SSL" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +msgid "Priori_ty:" +msgstr "Pri_oridad:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +msgid "Reso_urce:" +msgstr "Re_curso:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "Encr_yption required (TLS/SSL)" +msgstr "Requiere ci_frado (TLS/SSL)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "Use old SS_L" +msgstr "Usar SS_L antiguo" + #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "Override server settings" +msgstr "Sobreescribir los ajustes del servidor" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 msgid "What is your Jabber ID?" msgstr "¿Cuál es su ID de Jabber?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 -msgid "What is your Jabber password?" -msgstr "¿Cuál es su contraseña de Jabber?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 msgid "What is your desired Jabber ID?" msgstr "¿Cuál es el ID de usuario que quiere para Jabber?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +msgid "What is your Jabber password?" +msgstr "¿Cuál es su contraseña de Jabber?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 msgid "What is your desired Jabber password?" msgstr "¿Cuál es la contraseña que quiere para Jabber?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 msgid "Example: user@hotmail.com" msgstr "Ejemplo: usuario@hotmail.com" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 msgid "What is your Windows Live ID?" msgstr "¿Cuál es su ID de Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 msgid "What is your Windows Live password?" msgstr "¿Cuál es su contraseña de Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "E-_mail address:" -msgstr "Dirección de correo-_e:" - -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 msgid "Nic_kname:" msgstr "Apo_do:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "_Last Name:" +msgstr "Ape_llidos:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 msgid "_First Name:" msgstr "_Nombre:" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +msgid "_Published Name:" +msgstr "Nombre p_ublicado:" + #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Jabber ID:" msgstr "ID _Jabber:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 -msgid "_Last Name:" -msgstr "Ape_llidos:" +msgid "E-_mail address:" +msgstr "Dirección de correo-_e:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -msgid "_Published Name:" -msgstr "Nombre p_ublicado:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "_Username:" +msgstr "_Usuario:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Example: user@my.sip.server" msgstr "Ejemplo: usuario@mi.servidor.sip" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "Authentication username:" -msgstr "Usuario para la autenticación:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover Binding" -msgstr "Descubrir vinculación" - #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "Discover the STUN server automatically" -msgstr "Descubrir el servidor STUN automáticamente" +msgid "Use this account to call _landlines and mobile phones" +msgstr "Usar esta cuenta para llamar a te_léfonos fijos y móviles" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 -msgid "Ignore TLS Errors" -msgstr "Ignorar errores TLS" +msgid "NAT Traversal Options" +msgstr "Opciones de NAT transversal" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "Interval (seconds)" -msgstr "Intervalo (segundos)" +msgid "Proxy Options" +msgstr "Opciones del proxy" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -msgid "Keep-Alive Options" -msgstr "Opciones de «keepalive»" +msgid "Miscellaneous Options" +msgstr "Opciones de miscelánea" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 -msgid "Loose Routing" -msgstr "Enrutado impreciso" +msgid "STUN Server:" +msgstr "Servidor STUN:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 -msgid "Mechanism:" -msgstr "Mecanismo:" +msgid "Discover the STUN server automatically" +msgstr "Descubrir el servidor STUN automáticamente" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 -msgid "Miscellaneous Options" -msgstr "Opciones de miscelánea" +msgid "Discover Binding" +msgstr "Descubrir vinculación" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -msgid "NAT Traversal Options" -msgstr "Opciones de NAT transversal" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "Servidor:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Keep-Alive Options" +msgstr "Opciones de «keepalive»" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 -msgid "Port:" -msgstr "Puerto:" +msgid "Mechanism:" +msgstr "Mecanismo:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 -msgid "Proxy Options" -msgstr "Opciones del proxy" +msgid "Interval (seconds)" +msgstr "Intervalo (segundos)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Authentication username:" +msgstr "Usuario para la autenticación:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Transport:" +msgstr "Transporte:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -msgid "STUN Server:" -msgstr "Servidor STUN:" +msgid "Loose Routing" +msgstr "Enrutado impreciso" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 -msgid "Server:" -msgstr "Servidor:" +msgid "Ignore TLS Errors" +msgstr "Ignorar errores TLS" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -msgid "Transport:" -msgstr "Transporte:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -msgid "Use this account to call _landlines and mobile phones" -msgstr "Usar esta cuenta para llamar a te_léfonos fijos y móviles" +msgid "Port:" +msgstr "Puerto:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 -msgid "What is your SIP account password?" -msgstr "¿Cuál es la contraseña de su cuenta SIP?" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "¿Cuál es su ID de inicio de sesión SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 -msgid "_Username:" -msgstr "_Usuario:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP account password?" +msgstr "¿Cuál es la contraseña de su cuenta SIP?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Yahoo! I_D:" +msgstr "I_D de Yahoo!:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "I_gnore conference and chat room invitations" msgstr "_Ignorar invitaciones a conferencias y salas de chat" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Room List locale:" +msgstr "Configuración de la lista de _salas:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "What is your Yahoo! ID?" msgstr "¿Cuál es su ID de Yahoo!?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "What is your Yahoo! password?" msgstr "¿Cuál es su contraseña de Yahoo!?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "Yahoo! I_D:" -msgstr "I_D de Yahoo!:" - -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 -msgid "_Room List locale:" -msgstr "Configuración de la lista de _salas:" - #: ../libempathy-gtk/empathy-avatar-chooser.c:471 #: ../libempathy-gtk/empathy-avatar-chooser.c:556 msgid "Couldn't convert image" @@ -1381,40 +1373,40 @@ msgstr "Este protocolo no soporta llamadas de emergencia" 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:706 +#: ../libempathy-gtk/empathy-chat.c:728 msgid "Failed to open private chat" msgstr "Falló al abrir el chat privado" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:786 msgid "Topic not supported on this conversation" msgstr "El tema no está soportado en esta conversación" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:792 msgid "You are not allowed to change the topic" msgstr "No le está permitido cambiar el tema" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:991 #, c-format msgid "“%s” is not a valid contact ID" msgstr "%s no es un identificador de contacto válido" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1086 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:1069 +#: ../libempathy-gtk/empathy-chat.c:1089 msgid "/topic : set the topic of the current conversation" msgstr "/topic : establecer el tema para la conversación actual" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/join : join a new chat room" msgstr "/join : unirse a una sala de chat nueva" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "/j : join a new chat room" msgstr "/j : unirse a una sala de chat nueva" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "" "/part [] []: leave the chat room, by default the " "current one" @@ -1422,23 +1414,23 @@ msgstr "" "/part [] []: abandonar la sala de chat, la " "actual de manera predeterminada" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "/query []: open a private chat" msgstr "/query []: abrir un chat privado" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "/msg : open a private chat" msgstr "/msg : abrir un chat privado" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "/nick : change your nickname on the current server" msgstr "/nick : cambiar su apodo en el servidor actual" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "/me : send an ACTION message to the current conversation" msgstr "/me : enviar un mensaje de ACCIÓN a la conversación actual" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1448,11 +1440,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:1100 +#: ../libempathy-gtk/empathy-chat.c:1120 msgid "/whois : display information about a contact" msgstr "/whois : mostrar información sobre un contacto" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1123 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1460,122 +1452,128 @@ msgstr "" "/help []: mostrar todos los comandos soportados. Si está " "definido, muestra su uso." -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1142 #, c-format msgid "Usage: %s" msgstr "Uso: %s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1187 msgid "Unknown command" msgstr "Comando desconocido" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1313 msgid "Unknown command; see /help for the available commands" msgstr "Comando desconocido; consulte /help para ver los comandos disponibles" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1564 msgid "insufficient balance to send message" msgstr "no tiene balance suficiente para enviar el mensaje" -#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582 +#: ../libempathy-gtk/empathy-chat.c:1645 #, c-format msgid "Error sending message '%s': %s" msgstr "Error al enviar el mensaje «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587 +#: ../libempathy-gtk/empathy-chat.c:1649 #, 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:1469 +#: ../libempathy-gtk/empathy-chat.c:1576 #, c-format msgid "insufficient balance to send message. Top up." msgstr "" "no tiene balance suficiente para enviar el mensaje. Recargar." -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "not capable" msgstr "no es posible" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "offline" msgstr "desconectado" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1626 msgid "invalid contact" msgstr "contacto no válido" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1629 msgid "permission denied" msgstr "permiso denegado" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1632 msgid "too long message" msgstr "mensaje demasiado largo" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1635 msgid "not implemented" msgstr "no implementado" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1639 msgid "unknown" msgstr "desconocido" -#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "Tema:" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1721 #, c-format msgid "Topic set to: %s" msgstr "El tema se ha establecido a: %s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1723 +#, 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:1728 msgid "No topic defined" msgstr "No se ha definido el tema" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2244 msgid "(No Suggestions)" msgstr "(Sin sugerencias)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2312 #, 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:2231 +#: ../libempathy-gtk/empathy-chat.c:2349 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Añadir «%s» al diccionario de «%s»" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2419 msgid "Insert Smiley" msgstr "Insertar emoticono" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 +#: ../libempathy-gtk/empathy-chat.c:2437 #: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "E_nviar" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2376 +#: ../libempathy-gtk/empathy-chat.c:2494 msgid "_Spelling Suggestions" msgstr "_Sugerencias ortográficas" -#: ../libempathy-gtk/empathy-chat.c:2465 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Falló al recibir los registros recientes" -#: ../libempathy-gtk/empathy-chat.c:2602 +#: ../libempathy-gtk/empathy-chat.c:2722 #, c-format msgid "%s has disconnected" msgstr "%s se ha desconectado" @@ -1583,12 +1581,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:2609 +#: ../libempathy-gtk/empathy-chat.c:2729 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s expulsó a %1$s" -#: ../libempathy-gtk/empathy-chat.c:2612 +#: ../libempathy-gtk/empathy-chat.c:2732 #, c-format msgid "%s was kicked" msgstr "%s fue expulsado" @@ -1596,17 +1594,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:2620 +#: ../libempathy-gtk/empathy-chat.c:2740 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s vetó a %1$s" -#: ../libempathy-gtk/empathy-chat.c:2623 +#: ../libempathy-gtk/empathy-chat.c:2743 #, c-format msgid "%s was banned" msgstr "%s fue vetado" -#: ../libempathy-gtk/empathy-chat.c:2627 +#: ../libempathy-gtk/empathy-chat.c:2747 #, c-format msgid "%s has left the room" msgstr "%s ha dejado la sala" @@ -1616,17 +1614,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:2636 +#: ../libempathy-gtk/empathy-chat.c:2756 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2661 +#: ../libempathy-gtk/empathy-chat.c:2781 #, c-format msgid "%s has joined the room" msgstr "%s ha entrado en la sala" -#: ../libempathy-gtk/empathy-chat.c:2686 +#: ../libempathy-gtk/empathy-chat.c:2806 #, c-format msgid "%s is now known as %s" msgstr "Ahora %s se llama %s" @@ -1634,90 +1632,90 @@ 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:2839 +#: ../libempathy-gtk/empathy-chat.c:2993 #: ../src/empathy-streamed-media-window.c:1889 -#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1538 -#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545 +#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638 msgid "Disconnected" msgstr "Desconectado" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3485 +#: ../libempathy-gtk/empathy-chat.c:3657 msgid "Would you like to store this password?" msgstr "¿Quiere guardar esta contraseña?" -#: ../libempathy-gtk/empathy-chat.c:3491 +#: ../libempathy-gtk/empathy-chat.c:3663 msgid "Remember" msgstr "Recordar" -#: ../libempathy-gtk/empathy-chat.c:3501 +#: ../libempathy-gtk/empathy-chat.c:3673 msgid "Not now" msgstr "Ahora no" -#: ../libempathy-gtk/empathy-chat.c:3545 +#: ../libempathy-gtk/empathy-chat.c:3717 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Volver a intentarlo" -#: ../libempathy-gtk/empathy-chat.c:3549 +#: ../libempathy-gtk/empathy-chat.c:3721 msgid "Wrong password; please try again:" msgstr "Contraseña incorrecta; inténtelo de nuevo:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3679 +#: ../libempathy-gtk/empathy-chat.c:3851 msgid "This room is protected by a password:" msgstr "Esta sala está protegida por contraseña:" -#: ../libempathy-gtk/empathy-chat.c:3706 +#: ../libempathy-gtk/empathy-chat.c:3878 msgid "Join" msgstr "Unirse" -#: ../libempathy-gtk/empathy-chat.c:3894 ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Conectado" -#: ../libempathy-gtk/empathy-chat.c:3949 +#: ../libempathy-gtk/empathy-chat.c:4125 msgid "Conversation" msgstr "Conversación" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3954 +#: ../libempathy-gtk/empathy-chat.c:4130 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Identificador desconocido o no válido" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Bloqueo de contactos no disponible temporalmente" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Bloqueo de contactos no disponible" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Permiso denegado" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "No se pudo bloquear el contacto" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 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:506 -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1475 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "Account:" msgstr "Cuenta:" @@ -1727,7 +1725,7 @@ msgstr "Contactos bloqueados" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:2 #: ../src/empathy-chatrooms-window.ui.h:3 msgid "Remove" msgstr "Quitar" @@ -1750,152 +1748,47 @@ msgstr "_Abrir enlace" msgid "%A %B %d %Y" msgstr "%A %d %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:287 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Editar información del contacto" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:338 -msgid "Personal Information" -msgstr "Información personal" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:439 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "Contacto nuevo" -#: ../libempathy-gtk/empathy-contact-dialogs.c:508 -#: ../libempathy-gtk/empathy-individual-dialogs.c:198 +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "¿Bloquear a %s?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:513 -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 #, 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-contact-dialogs.c:518 -#: ../libempathy-gtk/empathy-individual-dialogs.c:275 +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 msgid "_Block" msgstr "_Bloquear" -#: ../libempathy-gtk/empathy-contact-dialogs.c:536 -#: ../libempathy-gtk/empathy-individual-dialogs.c:284 +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 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-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "Decidir _luego" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "Petición de suscripción" -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "_Block User" msgstr "_Bloquear usuario" -#: ../libempathy-gtk/empathy-contact-list-view.c:1935 -#: ../libempathy-gtk/empathy-individual-view.c:2397 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "¿Realmente quiere quitar el grupo «%s»?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1937 -#: ../libempathy-gtk/empathy-individual-view.c:2400 -msgid "Removing group" -msgstr "Quitando grupo" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-contact-list-view.c:2059 -#: ../libempathy-gtk/empathy-individual-view.c:2455 -#: ../libempathy-gtk/empathy-individual-view.c:2671 -msgid "_Remove" -msgstr "_Quitar" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2015 -#: ../libempathy-gtk/empathy-individual-view.c:2532 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "¿Realmente quiere quitar el contacto «%s»?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2017 -#: ../libempathy-gtk/empathy-individual-view.c:2553 -msgid "Removing contact" -msgstr "Quitando el contacto" - -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "_Añadir contacto…" - -#: ../libempathy-gtk/empathy-contact-menu.c:287 -msgid "_Block Contact" -msgstr "_Bloquear contacto" - -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:316 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../libempathy-gtk/empathy-new-message-dialog.c:320 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "_Chat" - -#: ../libempathy-gtk/empathy-contact-menu.c:348 -#: ../libempathy-gtk/empathy-individual-menu.c:850 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "Llamada de vo_z" - -#: ../libempathy-gtk/empathy-contact-menu.c:381 -#: ../libempathy-gtk/empathy-individual-menu.c:895 -msgctxt "menu item" -msgid "_Video Call" -msgstr "Llamada de _vídeo" - -#: ../libempathy-gtk/empathy-contact-menu.c:427 -#: ../libempathy-gtk/empathy-individual-menu.c:948 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "Conversaciones an_teriores" - -#: ../libempathy-gtk/empathy-contact-menu.c:449 -#: ../libempathy-gtk/empathy-individual-menu.c:989 -msgid "Send File" -msgstr "Enviar archivo" - -#: ../libempathy-gtk/empathy-contact-menu.c:472 -#: ../libempathy-gtk/empathy-individual-menu.c:1031 -msgid "Share My Desktop" -msgstr "Compartir mi escritorio" - -#: ../libempathy-gtk/empathy-contact-menu.c:501 -#: ../libempathy-gtk/empathy-individual-menu.c:1094 -msgid "Infor_mation" -msgstr "Infor_mación" - -#: ../libempathy-gtk/empathy-contact-menu.c:547 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "_Editar" - -#: ../libempathy-gtk/empathy-contact-menu.c:601 -#: ../libempathy-gtk/empathy-individual-menu.c:1285 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Invitándolo a esta sala" - -#: ../libempathy-gtk/empathy-contact-menu.c:632 -#: ../libempathy-gtk/empathy-individual-menu.c:1331 -msgid "_Invite to Chat Room" -msgstr "_Invitar a sala de chat" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "Decide _Later" +msgstr "Decidir _luego" #. Title #: ../libempathy-gtk/empathy-contact-search-dialog.c:499 @@ -1922,166 +1815,170 @@ msgstr "Su mensaje de presentación:" 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:571 +#: ../libempathy-gtk/empathy-contact-widget.c:569 #: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Canales:" -#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-contact-widget.c:749 #: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "Código ISO de país:" -#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-contact-widget.c:751 #: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "País:" -#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-contact-widget.c:753 #: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Estado:" -#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-contact-widget.c:755 #: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Ciudad:" -#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-contact-widget.c:757 #: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Área:" -#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-contact-widget.c:759 #: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Código postal:" -#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-contact-widget.c:761 #: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Calle:" -#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-contact-widget.c:763 #: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Edificio:" -#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-contact-widget.c:765 #: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Planta:" -#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-contact-widget.c:767 #: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Habitación:" -#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-contact-widget.c:769 #: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Texto:" -#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-contact-widget.c:771 #: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Descripción:" -#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-contact-widget.c:773 #: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:775 #: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Nivel de precisión:" -#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-contact-widget.c:777 #: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Error:" -#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-contact-widget.c:779 #: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Error vertical (metros):" -#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-contact-widget.c:781 #: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Error horizontal (metros):" -#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-contact-widget.c:783 #: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Velocidad:" -#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-contact-widget.c:785 #: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Retardo:" -#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-contact-widget.c:787 #: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Velocidad de ascenso:" -#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-contact-widget.c:789 #: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Actualizado por última vez:" -#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-contact-widget.c:791 #: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Longitud_" -#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-contact-widget.c:793 #: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Latitud:" -#: ../libempathy-gtk/empathy-contact-widget.c:797 +#: ../libempathy-gtk/empathy-contact-widget.c:795 #: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Altitud:" -#: ../libempathy-gtk/empathy-contact-widget.c:850 -#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 #: ../libempathy-gtk/empathy-individual-widget.c:593 #: ../libempathy-gtk/empathy-individual-widget.c:608 -#: ../src/empathy-preferences.ui.h:15 +#: ../src/empathy-preferences.ui.h:35 msgid "Location" msgstr "Ubicación geográfica" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:867 +#: ../libempathy-gtk/empathy-contact-widget.c:865 #: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:919 +#: ../libempathy-gtk/empathy-contact-widget.c:917 #: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%e de %B de %Y a las %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1001 -#: ../libempathy-gtk/empathy-individual-widget.c:901 +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Guardar avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:1057 -#: ../libempathy-gtk/empathy-individual-widget.c:959 +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "No se pudo guardar el avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:1745 -#: ../libempathy-gtk/empathy-individual-menu.c:1066 -#: ../libempathy-gtk/empathy-individual-widget.c:1358 -msgid "Favorite" -msgstr "Favorita" +#: ../libempathy-gtk/empathy-contact-widget.c:1446 +msgid "Personal Details" +msgstr "Detalles personales" + +#: ../libempathy-gtk/empathy-contact-widget.c:1449 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +msgid "Contact Details" +msgstr "Detalles del contacto" #: ../libempathy-gtk/empathy-contactinfo-utils.c:104 msgid "Full name" @@ -2148,54 +2045,49 @@ msgstr "postal" msgid "parcel" msgstr "grupo" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -msgid "Location at (date)\t" -msgstr "Ubicación en (fecha)\t" +#. Identifier to connect to Instant Messaging network +#. Translators: Identifier to connect to Instant Messaging network +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 +msgid "Identifier:" +msgstr "Identificador:" #. Alias -#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1294 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "Apodo:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "Client Information" -msgstr "Información del cliente" - #: ../libempathy-gtk/empathy-contact-widget.ui.h:5 -msgid "Client:" -msgstr "Cliente:" +msgid "Location at (date)\t" +msgstr "Ubicación en (fecha)\t" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 -msgid "Contact Details" -msgstr "Detalles del contacto" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +msgid "Information requested…" +msgstr "Información solicitadas" -#. Identifier to connect to Instant Messaging network -#. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1503 -msgid "Identifier:" -msgstr "Identificador:" +msgid "Client Information" +msgstr "Información del cliente" #: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 -msgid "Information requested…" -msgstr "Información solicitadas" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "OS:" msgstr "SO:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Version:" msgstr "Versión:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Client:" +msgstr "Cliente:" + +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "Grupos" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2203,107 +2095,170 @@ 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:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "_Añadir grupo" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Seleccionar" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1951 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1970 msgid "Group" msgstr "Grupo" -#: ../libempathy-gtk/empathy-individual-dialogs.c:258 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 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:265 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 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:" -#. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 -msgid "Linked Contacts" -msgstr "Contactos enlazados" - -#: ../libempathy-gtk/empathy-individual-linker.c:371 -msgid "Select contacts to link" -msgstr "Seleccionar contactos para enlazar" - -#: ../libempathy-gtk/empathy-individual-linker.c:445 -msgid "New contact preview" -msgstr "Vista previa del contacto nuevo" - -#: ../libempathy-gtk/empathy-individual-linker.c:489 -msgid "Contacts selected in the list on the left will be linked together." -msgstr "" -"Se enlazarán entre sí los contactos seleccionados en la lista de la " -"izquierda." +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Editar información del contacto" #. 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:145 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../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" -#. translators: Call is a noun. This string is used in the window -#. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 -#: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1288 -#: ../src/empathy-call-window.ui.h:2 -msgid "Call" -msgstr "Llamar" +#. translators: Call is a noun. This string is used in the window +#. * title +#: ../libempathy-gtk/empathy-individual-menu.c:348 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:18 +msgid "Call" +msgstr "Llamar" + +#: ../libempathy-gtk/empathy-individual-menu.c:413 +msgid "Mobile" +msgstr "Móvil" + +#: ../libempathy-gtk/empathy-individual-menu.c:415 +msgid "Work" +msgstr "Trabajo" + +#: ../libempathy-gtk/empathy-individual-menu.c:417 +msgid "HOME" +msgstr "Casa" + +#: ../libempathy-gtk/empathy-individual-menu.c:658 +msgid "_Block Contact" +msgstr "_Bloquear contacto" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1017 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:1 +msgid "_Chat" +msgstr "_Chat" + +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:1052 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 +msgid "_SMS" +msgstr "_SMS" + +#: ../libempathy-gtk/empathy-individual-menu.c:1085 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "Llamada de vo_z" + +#: ../libempathy-gtk/empathy-individual-menu.c:1118 +msgctxt "menu item" +msgid "_Video Call" +msgstr "Llamada de _vídeo" + +#: ../libempathy-gtk/empathy-individual-menu.c:1159 +#: ../src/empathy-roster-window-menubar.ui.h:4 +msgid "_Previous Conversations" +msgstr "Conversaciones an_teriores" + +#: ../libempathy-gtk/empathy-individual-menu.c:1188 +msgid "Send File" +msgstr "Enviar archivo" -#: ../libempathy-gtk/empathy-individual-menu.c:378 -msgid "Mobile" -msgstr "Móvil" +#: ../libempathy-gtk/empathy-individual-menu.c:1218 +msgid "Share My Desktop" +msgstr "Compartir mi escritorio" -#: ../libempathy-gtk/empathy-individual-menu.c:380 -msgid "Work" -msgstr "Trabajo" +#: ../libempathy-gtk/empathy-individual-menu.c:1244 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Favorita" -#: ../libempathy-gtk/empathy-individual-menu.c:382 -msgid "HOME" -msgstr "Casa" +#: ../libempathy-gtk/empathy-individual-menu.c:1263 +msgid "gnome-contacts not installed" +msgstr "gnome-contacts no está instalado" -#. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:805 -#: ../libempathy-gtk/empathy-new-message-dialog.c:314 -msgid "_SMS" -msgstr "_SMS" +#: ../libempathy-gtk/empathy-individual-menu.c:1266 +msgid "Please install gnome-contacts to access contacts details." +msgstr "Instale gnome-contacts para acceder a los detalles de los contactos." + +#: ../libempathy-gtk/empathy-individual-menu.c:1380 +msgid "Infor_mation" +msgstr "Infor_mación" -#: ../libempathy-gtk/empathy-individual-menu.c:1143 +#: ../libempathy-gtk/empathy-individual-menu.c:1429 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Editar" -#. Translators: this is a verb meaning "to connect two contacts together -#. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1169 -msgctxt "Link individual (contextual menu)" -msgid "_Link Contacts…" -msgstr "_Enlazar contactos…" +#: ../libempathy-gtk/empathy-individual-menu.c:1546 +#: ../src/empathy-chat-window.c:1175 +msgid "Inviting you to this room" +msgstr "Invitándolo a esta sala" + +#: ../libempathy-gtk/empathy-individual-menu.c:1592 +msgid "_Invite to Chat Room" +msgstr "_Invitar a sala de chat" + +#: ../libempathy-gtk/empathy-individual-menu.c:1788 +#: ../src/empathy-roster-window-menubar.ui.h:5 +msgid "_Add Contact…" +msgstr "_Añadir contacto…" -#: ../libempathy-gtk/empathy-individual-view.c:2362 +#: ../libempathy-gtk/empathy-individual-view.c:2306 msgid "Delete and _Block" msgstr "Eliminar y _bloquear" -#: ../libempathy-gtk/empathy-individual-view.c:2541 +#: ../libempathy-gtk/empathy-individual-view.c:2341 +#, 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:2344 +msgid "Removing group" +msgstr "Quitando grupo" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2399 +#: ../libempathy-gtk/empathy-individual-view.c:2603 +msgid "_Remove" +msgstr "_Quitar" + +#: ../libempathy-gtk/empathy-individual-view.c:2476 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "¿Realmente quiere quitar el contacto «%s»?" + +#: ../libempathy-gtk/empathy-individual-view.c:2485 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2312,7 +2267,11 @@ 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-widget.c:1642 +#: ../libempathy-gtk/empathy-individual-view.c:2497 +msgid "Removing contact" +msgstr "Quitando el contacto" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2323,23 +2282,23 @@ msgstr[1] "Contacto enlazado que contiene %u contactos" msgid "Location at (date)" msgstr "Ubicación en (fecha)" -#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 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:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "Red nueva" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "Elegir una red IRC" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "Rei_niciar lista de redes" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Seleccionar" @@ -2352,294 +2311,248 @@ msgstr "servidor nuevo" msgid "SSL" msgstr "SSL" -#. Translators: this is the title of the linking dialogue (reached by -#. * right-clicking on a contact and selecting "Link…"). "Link" in this title -#. * is a verb. -#: ../libempathy-gtk/empathy-linking-dialog.c:115 -msgid "Link Contacts" -msgstr "Enlazar contactos" - -#: ../libempathy-gtk/empathy-linking-dialog.c:120 -msgctxt "Unlink individual (button)" -msgid "_Unlink…" -msgstr "_Desenlazar…" - -#: ../libempathy-gtk/empathy-linking-dialog.c:121 -msgid "" -"Completely split the displayed linked contacts into the separate contacts." -msgstr "" -"Separar completamente los contactos enlazados mostrados en contactos " -"separados." - -#. Add button -#. Translators: this is an action button in the linking dialogue. "Link" is -#. * used here as a verb meaning "to connect two contacts to form a -#. * meta-contact". -#: ../libempathy-gtk/empathy-linking-dialog.c:136 -msgid "_Link" -msgstr "_Enlazar" - -#: ../libempathy-gtk/empathy-linking-dialog.c:183 -#, c-format -msgid "Unlink linked contacts '%s'?" -msgstr "¿Desenlazar los contactos enlazados «%s»?" - -#: ../libempathy-gtk/empathy-linking-dialog.c:186 -msgid "" -"Are you sure you want to unlink these linked contacts? This will completely " -"split the linked contacts into separate contacts." -msgstr "" -"¿Está seguro de querer desenlazar estos contactos enlazados? Esto separará " -"completamente los contactos enlazados en contactos separados." - -#: ../libempathy-gtk/empathy-linking-dialog.c:190 -msgctxt "Unlink individual (button)" -msgid "_Unlink" -msgstr "_Desenlazar" - -#: ../libempathy-gtk/empathy-log-window.c:621 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Histórico" -#: ../libempathy-gtk/empathy-log-window.c:676 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Mostrar" -#: ../libempathy-gtk/empathy-log-window.c:698 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Buscar" -#: ../libempathy-gtk/empathy-log-window.c:1147 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Chatee en %s" -#: ../libempathy-gtk/empathy-log-window.c:1149 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Chat con %s" -#: ../libempathy-gtk/empathy-log-window.c:1199 -#: ../libempathy-gtk/empathy-log-window.c:1346 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 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:1288 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1294 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1370 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, 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:1380 #, 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:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "La llamada duró %s, finalizó a las %s" -#: ../libempathy-gtk/empathy-log-window.c:1719 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Hoy" -#: ../libempathy-gtk/empathy-log-window.c:1723 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Ayer" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1738 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e de %B de %Y" -#: ../libempathy-gtk/empathy-log-window.c:1826 -#: ../libempathy-gtk/empathy-log-window.c:3458 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Cualquier hora" -#: ../libempathy-gtk/empathy-log-window.c:1915 -#: ../libempathy-gtk/empathy-log-window.c:2371 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Cualquiera" -#: ../libempathy-gtk/empathy-log-window.c:2684 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Quién" -#: ../libempathy-gtk/empathy-log-window.c:2893 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Cuándo" -#: ../libempathy-gtk/empathy-log-window.c:3009 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Cualquier cosa" -#: ../libempathy-gtk/empathy-log-window.c:3011 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Chats de texto" -#: ../libempathy-gtk/empathy-log-window.c:3013 -#: ../src/empathy-preferences.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "Llamadas" -#: ../libempathy-gtk/empathy-log-window.c:3018 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Llamadas entrantes" -#: ../libempathy-gtk/empathy-log-window.c:3019 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Llamadas salientes" -#: ../libempathy-gtk/empathy-log-window.c:3020 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Llamadas perdidas" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Qué" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3782 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:3755 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Limpiar todo" -#: ../libempathy-gtk/empathy-log-window.c:3762 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Eliminar de:" #: ../libempathy-gtk/empathy-log-window.ui.h:1 -msgid "Loading..." -msgstr "Cargando…" +msgid "_File" +msgstr "_Archivo" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 -#: ../src/empathy-chat-window.ui.h:3 -msgid "Chat" -msgstr "Chat" +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:12 +msgid "_Edit" +msgstr "_Editar" -#: ../libempathy-gtk/empathy-log-window.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Delete All History..." msgstr "Borrar todo el histórico…" -#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "Profile" msgstr "Perfil" -#: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:20 -msgid "Video" -msgstr "Vídeo" +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:19 +msgid "Chat" +msgstr "Chat" #: ../libempathy-gtk/empathy-log-window.ui.h:7 -#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 -msgid "_Edit" -msgstr "_Editar" +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "Video" +msgstr "Vídeo" #: ../libempathy-gtk/empathy-log-window.ui.h:8 -msgid "_File" -msgstr "_Archivo" - -#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "página 2" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "Loading..." +msgstr "Cargando…" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "El contacto está desconectado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 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:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 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:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 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:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 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:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "Se le ha bloqueado en este canal" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "Este canal está completo" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 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:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" msgstr "No se puede proceder mientras esté desconectado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "Permiso denegado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "Hubo un error al iniciar la conversación" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "Introduzca el identificador de un contacto o un número de teléfono:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:334 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Conversación nueva" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:226 +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "_Video Call" msgstr "Llamada de _vídeo" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:236 +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 msgid "_Audio Call" msgstr "Llamada de vo_z" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:246 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Llamada nueva" #: ../libempathy-gtk/empathy-bad-password-dialog.c:130 #, c-format -#| msgid "Authentication failed" msgid "Authentification failed for account %s" msgstr "Falló la autenticación para la cuenta %s" @@ -2700,20 +2613,20 @@ msgid "Find:" msgstr "Buscar:" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -msgid "Mat_ch case" -msgstr "_Coincidir con capitalización" +msgid "_Previous" +msgstr "_Anterior" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Phrase not found" -msgstr "No se encontró la frase" - -#: ../libempathy-gtk/empathy-search-bar.ui.h:4 msgid "_Next" msgstr "_Siguiente" +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "Mat_ch case" +msgstr "_Coincidir con capitalización" + #: ../libempathy-gtk/empathy-search-bar.ui.h:5 -msgid "_Previous" -msgstr "_Anterior" +msgid "Phrase not found" +msgstr "No se encontró la frase" #: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" @@ -2759,12 +2672,12 @@ msgstr "Finalizó la llamada de voz" msgid "Edit Custom Messages" msgstr "Editar mensajes personalizados" -#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "Mensaje editado a las %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1752 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "Normal" @@ -2843,18 +2756,22 @@ msgid "Certificate hostname: %s" msgstr "Nombre del servidor de certificados: %s" #: ../libempathy-gtk/empathy-tls-dialog.c:281 -msgid "Continue" -msgstr "Continuar" +msgid "C_ontinue" +msgstr "C_ontinuar" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "La conexión no es de confianza" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 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:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "Recordar esta opción para futuras conexiones" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "Detalles del certificado" @@ -3051,31 +2968,31 @@ msgstr "Occidental" msgid "Vietnamese" msgstr "Vietnamita" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Sin mensaje de eeror" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Mensaje instantáneo (Empathy)" -#: ../src/empathy.c:433 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "No conectarse automáticamente al inicio" -#: ../src/empathy.c:437 +#: ../src/empathy.c:441 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:452 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "- Cliente de mensajería instantánea Empathy" -#: ../src/empathy.c:639 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Error al contactar con el Gestor de cuentas" -#: ../src/empathy.c:641 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3122,11 +3039,11 @@ 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:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Un cliente de mensajería instantánea para GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Jorge González , 2007-2010\n" @@ -3163,35 +3080,36 @@ msgstr "" "Editar." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1272 +#: ../src/empathy-account-assistant.c:1277 msgid "An error occurred" msgstr "Ocurrió un error" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "¿Qué tipo de cuenta tiene?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "¿Tiene otras cuentas de chat que quiera configurar?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Introducir los detalles de su cuenta" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "¿Qué tipo de cuenta quiere crear?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "¿Quiere crear otras cuentas de chat?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Introducir los detalles para la cuenta nueva" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3202,41 +3120,41 @@ msgstr "" "Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un " "micrófono o una cámara web puede hacer incluso llamadas de voz o vídeo." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?" -#: ../src/empathy-account-assistant.c:653 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Sí, importar los detalles de mi cuenta desde " -#: ../src/empathy-account-assistant.c:674 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Sí, introduciré ahora los detalles de mi cuenta" -#: ../src/empathy-account-assistant.c:696 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "No, quiero crear una cuenta nueva" -#: ../src/empathy-account-assistant.c:706 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "No, por ahora sólo quiero ver la gente conectada cerca" -#: ../src/empathy-account-assistant.c:727 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Seleccione las cuentas que quiere importar:" -#: ../src/empathy-account-assistant.c:814 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:817 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Sí" -#: ../src/empathy-account-assistant.c:821 +#: ../src/empathy-account-assistant.c:824 msgid "No, that's all for now" msgstr "No, eso es todo por ahora" -#: ../src/empathy-account-assistant.c:1086 +#: ../src/empathy-account-assistant.c:1089 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 " @@ -3249,16 +3167,16 @@ msgstr "" "estos detalles posteriormente o desactivar esta característica usando el " "diálogo «Cuentas»." -#: ../src/empathy-account-assistant.c:1092 -#: ../src/empathy-account-assistant.c:1148 +#: ../src/empathy-account-assistant.c:1095 +#: ../src/empathy-account-assistant.c:1153 msgid "Edit->Accounts" msgstr "Editar->Cuentas" -#: ../src/empathy-account-assistant.c:1108 +#: ../src/empathy-account-assistant.c:1111 msgid "I do _not want to enable this feature for now" msgstr "_No quiero activar esta característica por ahora" -#: ../src/empathy-account-assistant.c:1144 +#: ../src/empathy-account-assistant.c:1149 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3270,42 +3188,42 @@ msgstr "" "instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde el " "diálogo Cuentas." -#: ../src/empathy-account-assistant.c:1150 +#: ../src/empathy-account-assistant.c:1155 msgid "telepathy-salut not installed" msgstr "telepathy-salut no está instalado" -#: ../src/empathy-account-assistant.c:1196 +#: ../src/empathy-account-assistant.c:1201 msgid "Messaging and VoIP Accounts Assistant" msgstr "Asistente de cuentas de mensajería y Voz IP" -#: ../src/empathy-account-assistant.c:1230 +#: ../src/empathy-account-assistant.c:1235 msgid "Welcome to Empathy" msgstr "Bienvenido a Empathy" -#: ../src/empathy-account-assistant.c:1239 +#: ../src/empathy-account-assistant.c:1244 msgid "Import your existing accounts" msgstr "Importar sus cuentas existentes" -#: ../src/empathy-account-assistant.c:1257 +#: ../src/empathy-account-assistant.c:1262 msgid "Please enter personal details" msgstr "Introduzca los detalles personales" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, 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:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Aún no se ha guardado su cuenta nueva." #: ../src/empathy-accounts-dialog.c:345 #: ../src/empathy-streamed-media-window.c:757 -#: ../src/empathy-call-window.c:1325 +#: ../src/empathy-call-window.c:1332 msgid "Connecting…" msgstr "Conectando…" @@ -3331,24 +3249,32 @@ msgstr "Estado desconocido" msgid "Offline — Account Disabled" msgstr "Desconectado: cuenta desactivada" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Va a crear una cuenta nueva que descartará sus cambios.\n" -"¿Seguro que quiere continuar?" +#: ../src/empathy-accounts-dialog.c:531 +msgid "Edit Connection Parameters" +msgstr "Editar los parámetros de la conexión" + +#: ../src/empathy-accounts-dialog.c:694 +msgid "Failed to retrieve your personal information from the server." +msgstr "Falló al recuperar su información personal del servidor." + +#: ../src/empathy-accounts-dialog.c:700 +msgid "Go online to edit your personal information." +msgstr "Conéctese para editar su información personal." -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:785 +msgid "_Edit Connection Parameters..." +msgstr "_Editar los parámetros de la conexión…" + +#: ../src/empathy-accounts-dialog.c:1281 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "¿Quiere quitar %s de su equipo?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1285 msgid "This will not remove your account on the server." msgstr "Esto no quitará su cuenta del servidor." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1521 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3357,15 +3283,15 @@ msgstr "" "¿Seguro que quiere continuar?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1697 msgid "_Enable" msgstr "_Activar" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1698 msgid "_Disable" msgstr "_Desactivar" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2181 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3377,19 +3303,15 @@ msgstr "" msgid "Add…" msgstr "Añadir…" -#: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Loading account information" -msgstr "Cargando información de la cuenta" - #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "No protocol installed" -msgstr "No hay protocolos instalados" +msgid "_Import…" +msgstr "_Importar…" #: ../src/empathy-accounts-dialog.ui.h:4 -msgid "Protocol:" -msgstr "Protocolo:" +msgid "Loading account information" +msgstr "Cargando información de la cuenta" -#: ../src/empathy-accounts-dialog.ui.h:6 +#: ../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." @@ -3397,15 +3319,16 @@ msgstr "" "Para añadir una nueva cuenta debe instalar primero un «backend» para cada " "protocolo que quiera usar." -#: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Import…" -msgstr "_Importar…" +#: ../src/empathy-accounts-dialog.ui.h:6 +#| msgid "No protocol installed" +msgid "No protocol backends installed" +msgstr "No hay «backends» de protocolos instalados" -#: ../src/empathy-auth-client.c:284 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr ": Cliente de autenticación de Empathy" -#: ../src/empathy-auth-client.c:300 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Cliente de autenticación de Empathy" @@ -3413,11 +3336,11 @@ msgstr "Cliente de autenticación de Empathy" msgid "People nearby" msgstr "Gente cerca" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:193 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:203 msgid "- Empathy Audio/Video Client" msgstr ": Cliente de sonido/vídeo Empathy" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:218 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:228 msgid "Empathy Audio/Video Client" msgstr "Cliente de sonido/vídeo Empathy" @@ -3460,33 +3383,33 @@ msgstr "Detalles" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title #: ../src/empathy-streamed-media-window.c:1209 -#: ../src/empathy-call-window.c:1927 +#: ../src/empathy-call-window.c:1934 #, c-format msgid "Call with %s" msgstr "Llamada con %s" #: ../src/empathy-streamed-media-window.c:1442 -#: ../src/empathy-call-window.c:2171 +#: ../src/empathy-call-window.c:2178 msgid "The IP address as seen by the machine" msgstr "La dirección IP como la ve la máquina" #: ../src/empathy-streamed-media-window.c:1444 -#: ../src/empathy-call-window.c:2173 +#: ../src/empathy-call-window.c:2180 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-streamed-media-window.c:1446 -#: ../src/empathy-call-window.c:2175 +#: ../src/empathy-call-window.c:2182 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-streamed-media-window.c:1448 -#: ../src/empathy-call-window.c:2177 +#: ../src/empathy-call-window.c:2184 msgid "The IP address of a relay server" msgstr "La dirección IP de un servidor de desvío" #: ../src/empathy-streamed-media-window.c:1450 -#: ../src/empathy-call-window.c:2179 +#: ../src/empathy-call-window.c:2186 msgid "The IP address of the multicast group" msgstr "La dirección IP del grupo multicast" @@ -3505,12 +3428,12 @@ msgid "Connected — %d:%02dm" msgstr "Conectado — %d:%02dm" #: ../src/empathy-streamed-media-window.c:2200 -#: ../src/empathy-call-window.c:3033 +#: ../src/empathy-call-window.c:3040 msgid "Technical Details" msgstr "Detalles técnicos" #: ../src/empathy-streamed-media-window.c:2238 -#: ../src/empathy-call-window.c:3072 +#: ../src/empathy-call-window.c:3079 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3520,7 +3443,7 @@ msgstr "" "por su equipo" #: ../src/empathy-streamed-media-window.c:2243 -#: ../src/empathy-call-window.c:3077 +#: ../src/empathy-call-window.c:3084 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3530,7 +3453,7 @@ msgstr "" "por su equipo" #: ../src/empathy-streamed-media-window.c:2249 -#: ../src/empathy-call-window.c:3083 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3540,12 +3463,12 @@ msgstr "" "una red que no acepta conexiones directas." #: ../src/empathy-streamed-media-window.c:2255 -#: ../src/empathy-call-window.c:3089 +#: ../src/empathy-call-window.c:3096 msgid "There was a failure on the network" msgstr "Hubo un fallo en la red" #: ../src/empathy-streamed-media-window.c:2259 -#: ../src/empathy-call-window.c:3093 +#: ../src/empathy-call-window.c:3100 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" @@ -3553,7 +3476,7 @@ msgstr "" "llamada" #: ../src/empathy-streamed-media-window.c:2262 -#: ../src/empathy-call-window.c:3096 +#: ../src/empathy-call-window.c:3103 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" @@ -3561,7 +3484,7 @@ msgstr "" "llamada" #: ../src/empathy-streamed-media-window.c:2272 -#: ../src/empathy-call-window.c:3108 +#: ../src/empathy-call-window.c:3115 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please " msgstr "" -#: ../src/empathy-accounts.c:196 +#: ../src/empathy-accounts.c:195 msgid "Show account assistant" msgstr "Mostrar el asistente de cuentas" -#: ../src/empathy-accounts.c:202 +#: ../src/empathy-accounts.c:201 msgid "- Empathy Accounts" msgstr ": Cuentas en Empathy" -#: ../src/empathy-accounts.c:238 +#: ../src/empathy-accounts.c:237 msgid "Empathy Accounts" msgstr "Cuentas en Empathy" @@ -4712,7 +4710,7 @@ msgstr "- Depurador de Empathy" msgid "Empathy Debugger" msgstr "Depurador de Empathy" -#: ../src/empathy-chat.c:107 +#: ../src/empathy-chat.c:109 msgid "- Empathy Chat Client" msgstr ": Cliente de chat Empathy" @@ -4721,13 +4719,13 @@ msgid "Respond" msgstr "Respuesta" #: ../src/empathy-notifications-approver.c:204 -#: ../src/empathy-call-window.c:1565 +#: ../src/empathy-call-window.c:1572 msgid "Reject" msgstr "Rechazar" #: ../src/empathy-notifications-approver.c:209 #: ../src/empathy-notifications-approver.c:214 -#: ../src/empathy-call-window.c:1566 +#: ../src/empathy-call-window.c:1573 msgid "Answer" msgstr "Responder" @@ -4759,38 +4757,38 @@ 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:1172 ../src/empathy-call-window.c:1195 +#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202 msgid "i" msgstr "Información" -#: ../src/empathy-call-window.c:2929 +#: ../src/empathy-call-window.c:2936 msgid "On hold" msgstr "En espera" -#: ../src/empathy-call-window.c:2932 +#: ../src/empathy-call-window.c:2939 msgid "Mute" msgstr "Silenciar" -#: ../src/empathy-call-window.c:2934 +#: ../src/empathy-call-window.c:2941 msgid "Duration" msgstr "Duración" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2937 +#: ../src/empathy-call-window.c:2944 #, c-format msgid "%s — %d:%02dm" msgstr "%s: %d:%02dm" -#: ../src/empathy-call-window.c:3207 +#: ../src/empathy-call-window.c:3214 #, c-format msgid "Your current balance is %s." msgstr "su balance actual es %s." -#: ../src/empathy-call-window.c:3211 +#: ../src/empathy-call-window.c:3218 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:3213 +#: ../src/empathy-call-window.c:3220 msgid "Top Up" msgstr "Recargar" @@ -4798,6 +4796,102 @@ msgstr "Recargar" msgid "_Match case" msgstr "_Coincidir con capitalización" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Añadiendo cuenta nueva" + +#~ msgid "Protocol:" +#~ msgstr "Protocolo:" + +#~ msgid "Select contacts to link" +#~ msgstr "Seleccionar contactos para enlazar" + +#~ msgid "New contact preview" +#~ msgstr "Vista previa del contacto nuevo" + +#~ msgid "Contacts selected in the list on the left will be linked together." +#~ msgstr "" +#~ "Se enlazarán entre sí los contactos seleccionados en la lista de la " +#~ "izquierda." + +#~ msgctxt "Link individual (contextual menu)" +#~ msgid "_Link Contacts…" +#~ msgstr "_Enlazar contactos…" + +#~ msgid "Link Contacts" +#~ msgstr "Enlazar contactos" + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink…" +#~ msgstr "_Desenlazar…" + +#~ msgid "" +#~ "Completely split the displayed linked contacts into the separate contacts." +#~ msgstr "" +#~ "Separar completamente los contactos enlazados mostrados en contactos " +#~ "separados." + +#~ msgid "_Link" +#~ msgstr "_Enlazar" + +#~ msgid "Unlink linked contacts '%s'?" +#~ msgstr "¿Desenlazar los contactos enlazados «%s»?" + +#~ msgid "" +#~ "Are you sure you want to unlink these linked contacts? This will " +#~ "completely split the linked contacts into separate contacts." +#~ msgstr "" +#~ "¿Está seguro de querer desenlazar estos contactos enlazados? Esto " +#~ "separará completamente los contactos enlazados en contactos separados." + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink" +#~ msgstr "_Desenlazar" + +#~ msgid "Linked Contacts" +#~ msgstr "Contactos enlazados" + +#~ msgid "_Open new chats in separate windows" +#~ msgstr "_Abrir charlas nuevas en ventanas separadas" + +#~ msgid "Personal Information" +#~ msgstr "Información personal" + +#~ msgid "_Personal Information" +#~ msgstr "Información p_ersonal" + +#~ msgid "Socket type not supported" +#~ msgstr "El tipo de socket no está soportado" + +#~ msgid "My Web Accounts" +#~ msgstr "Mis cuentas web" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "La cuenta %s se edita a través de %s." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "No se puede editar la cuenta %s en Empathy." + +#~ msgid "Launch My Web Accounts" +#~ msgstr "Lanzar My Web Accounts" + +#~ msgid "Edit %s" +#~ msgstr "Editar %s" + +#~ msgid "Ca_ncel" +#~ msgstr "Ca_ncelar" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "_Editar" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "Va a crear una cuenta nueva que descartará sus cambios.\n" +#~ "¿Seguro que quiere continuar?" + #~ msgid "Call volume" #~ msgstr "Volumen de la llamada" @@ -5066,9 +5160,6 @@ msgstr "_Coincidir con capitalización" #~ "Se le ha ofrecido una invitación para el servicio %s pero no tiene la " #~ "aplicación necesaria para manejarla" -#~ msgid "User requested disconnect" -#~ msgstr "Desconexión solicitada por el usuario" - #~ msgid "Location" #~ msgstr "Ubicación" diff --git a/po/et.po b/po/et.po index d5cd1e05..bd6dea44 100644 --- a/po/et.po +++ b/po/et.po @@ -4,15 +4,15 @@ # Copyright (C) 2005–2011 Free Software Foundation, Inc. # # Ivar Smolin , 2005–2011. -# Mattias Põldaru , 2009, 2010, 2011. +# Mattias Põldaru , 2009, 2010, 2011, 2012. # 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: 2011-11-05 01:30+0000\n" -"PO-Revision-Date: 2011-11-06 11:28+0200\n" +"POT-Creation-Date: 2012-02-07 16:57+0000\n" +"PO-Revision-Date: 2012-02-08 09:08+0200\n" "Last-Translator: Mattias Põldaru \n" "Language-Team: Estonian <>\n" "Language: et\n" @@ -23,77 +23,98 @@ msgstr "" "X-Poedit-Language: Estonian\n" "X-Poedit-Country: ESTONIA\n" -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "" -"Vestlus Google Talki, Facebooki, MSN-i ja paljude teiste vestlusteenuste " -"kaudu" - msgid "Empathy" msgstr "Empathy" +msgid "IM Client" +msgstr "Välksõnumiklient" + msgid "Empathy Internet Messaging" msgstr "Empathy interneti sõnumivahetus" -msgid "IM Client" -msgstr "Välksõnumiklient" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "" +"Vestlus Google Talki, Facebooki, MSN-i ja paljude teiste vestlusteenuste " +"kaudu" -msgid "Always open a separate chat window for new chats." -msgstr "Uutele vestlustele avatakse alati eraldi aken." +msgid "Connection managers should be used" +msgstr "Kas peab ühenduste haldureid kasutama" -msgid "Call volume" -msgstr "Kõne valjus" +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." +msgstr "" +"Kas automaatseks lahti- või taasühendumiseks tuleks kasutada ühenduste " +"haldurit või mitte." -msgid "Call volume, as a percentage." -msgstr "Kõne valjus protsentides." +msgid "Empathy should auto-connect on startup" +msgstr "Empathy peaks käivitumisel ise ühenduma" -msgid "Camera device" -msgstr "Kaameraseade" +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "Kas Empathy peaks käivitumisel ise kontodesse sisse logima." -msgid "Camera position" -msgstr "Kaamera asukoht" +msgid "Empathy should auto-away when idle" +msgstr "Empathy peaks jõudeoleku korral automaatselt eemaloleku määrama" msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." +"Whether Empathy should go into away mode automatically if the user is idle." msgstr "" -"Märk, mis lisatakse hüüdnime lõppu, kui jututoas kasutatakse nime " -"automaatlõpetust (tab-klahv)." +"Kas Empathy peaks jõudeoleku korral määrama olekuks automaatselt eemaloleku." -msgid "Chat window theme" -msgstr "Jututoaakende teema" +msgid "Empathy default download folder" +msgstr "Empathy vaikimisi allalaadimiste kataloog" -msgid "Chat window theme variant" -msgstr "Jututoaakende teema" +msgid "The default folder to save file transfers in." +msgstr "Vaikimisi kataloog, kuhu salvestada vastuvõetud failid." + +msgid "Show offline contacts" +msgstr "Ühendamata sõpru näidatakse" + +msgid "Whether to show contacts that are offline in the contact list." +msgstr "Kas näidata kontaktide nimekirjas kontakte, kes pole ühendatud." + +msgid "Show avatars" +msgstr "Näidatakse avatare" msgid "" -"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "" -"Komadega eraldatud loend õigekirjakontrolli keeltest (nt \"et, en, fi, ru\")." +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "Kas näidata kontaktide nimekirjas ja vestlusakendes avatare." + +msgid "Show protocols" +msgstr "Kuva protokolle" + +msgid "Whether to show protocols for contacts in the contact list." +msgstr "Kas näidata kontaktide nimekirjas kontaktide protokolle." + +msgid "Show Balance in contact list" +msgstr "Kontaktide nimekirjas näidatakse kontojääki" + +msgid "Whether to show account balances in the contact list." +msgstr "Kas näidata kontaktide nimekirjas kontojääki." msgid "Compact contact list" msgstr "Kompaktne sõbranimekiri" -msgid "Connection managers should be used" -msgstr "Kas peab ühenduste haldureid kasutama" - -msgid "Contact list sort criterion" -msgstr "Kontaktide nimekirja sortimise alus" +msgid "Whether to show the contact list in compact mode." +msgstr "Kas kontaktide nimekirja kuvatakse kompaktvaates või mitte." -msgid "D-Bus object path of the last account selected to join a room." -msgstr "Toaga ühinemiseks viimati valitud konto D-Busi objekti asukoht" +msgid "Hide main window" +msgstr "Peida peaaken" -msgid "Default camera device to use in video calls, e.g. /dev/video0." -msgstr "" -"Vaikimisi kaameraseade, mida kasutatakse videokõnede jaoks, nt /dev/video0" +msgid "Hide the main window." +msgstr "Peaakna peitmine." msgid "Default directory to select an avatar image from" msgstr "Vaikimisi kataloog, millest valida avatari pilti" -msgid "Disable popup notifications when away" -msgstr "Eemalolekul on hüpikmärguanded keelatud" +msgid "The last directory that an avatar image was chosen from." +msgstr "Kataloog, kust viimati valiti avatari pilt." -msgid "Disable sounds when away" -msgstr "Heliteated on minu eemaloleku korral keelatud" +msgid "Open new chats in separate windows" +msgstr "Uued jututoad avatakse eraldi akendes" + +msgid "Always open a separate chat window for new chats." +msgstr "Uutele vestlustele avatakse alati eraldi aken." msgid "Display incoming events in the status area" msgstr "Sündmuste kuvamine teatealal" @@ -105,288 +126,282 @@ msgstr "" "Saabuvate sündmuste kuvamine teatealal. Kui väär, näidatakse neid kasutajale " "otse." -msgid "Echo cancellation support" -msgstr "Kaja vähendamise tugi" - -msgid "Empathy can publish the user's location" -msgstr "Empathy tohib näidata kasutaja asukohta" - -msgid "Empathy can use the GPS to guess the location" -msgstr "Empathy tohib kasutada GPS-i andmeid asukoha arvamiseks" - -msgid "Empathy can use the cellular network to guess the location" -msgstr "Empathy tohib kasutada mobiilivõrku asukoha arvamiseks" - -msgid "Empathy can use the network to guess the location" -msgstr "Empathy tohib kasutada võrku asukoha arvamiseks" - -msgid "Empathy default download folder" -msgstr "Empathy vaikimisi allalaadimiste kataloog" - -msgid "Empathy should auto-away when idle" -msgstr "Empathy peaks jõudeoleku korral automaatselt eemaloleku määrama" - -msgid "Empathy should auto-connect on startup" -msgstr "Empathy peaks käivitumisel ise ühenduma" - -msgid "Empathy should reduce the location's accuracy" -msgstr "Empathy peaks vähendama asukoha täpsust" - -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "Empathy peaks kasutama avatari vestlusakna ikoonina" +msgid "The position for the chat window side pane" +msgstr "Vestlusakna külgpaneeli asukoht" -msgid "Enable WebKit Developer Tools" -msgstr "WebKit Developer tööriistade lubamine" +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "Vestlusakna külgpaneeli asukoht (pikslites)." -msgid "Enable popup notifications for new messages" -msgstr "Uute sõnumite hüpikmärguanded on lubatud" +msgid "Contact list sort criterion" +msgstr "Kontaktide nimekirja sortimise alus" -msgid "Enable spell checker" -msgstr "Õigekirjakontrolli lubamine" +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." +msgstr "" +"Kontaktide nimekirja sortimise alus. Vaikimisi väärtus on \"state\", sel " +"juhul sorditakse kontaktid oleku järgi. Väärtuse \"name\" korral toimub " +"sortimine nime järgi." -msgid "Hide main window" -msgstr "Peida peaaken" +msgid "Use notification sounds" +msgstr "Teatehelisid esitatakse" -msgid "Hide the main window." -msgstr "Peaakna peitmine." +msgid "Whether to play a sound to notify of events." +msgstr "Kas esitada heli sündmustest märkuandmiseks." -msgid "Last account selected in Join Room dialog" -msgstr "Viimane konto, mis valiti \"Ühine jututoaga\" dialoogis" +msgid "Disable sounds when away" +msgstr "Heliteated on minu eemaloleku korral keelatud" -msgid "Nick completed character" -msgstr "Nimele lisamise märk" +msgid "Whether to play sound notifications when away or busy." +msgstr "Kas esitada heli eemal või hõivatud oleku määramisest märkuandmiseks." -msgid "Open new chats in separate windows" -msgstr "Uued jututoad avatakse eraldi akendes" +msgid "Play a sound for incoming messages" +msgstr "Sissetulevate sõnumite puhul esitatakse heli" -msgid "Path of the Adium theme to use" -msgstr "Kasutatava Adiumi kujunduse asukoht" +msgid "Whether to play a sound to notify of incoming messages." +msgstr "Kas esitada heli saabuvatest sõnumitest märkuandmiseks." -msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "Kasutatava Adiumi kujunduse asukoht, kui vestluse kujundus on Adium." +msgid "Play a sound for outgoing messages" +msgstr "Väljuvate sõnumite puhul esitatakse heli" -msgid "Play a sound for incoming messages" -msgstr "Sissetulevate sõnumite puhul esitatakse heli" +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "Kas esitada heli väljuvatest sõnumitest märkuandmiseks." msgid "Play a sound for new conversations" msgstr "Uute vestluste puhul esitatakse heli" -msgid "Play a sound for outgoing messages" -msgstr "Väljuvate sõnumite puhul esitatakse heli" +msgid "Whether to play a sound to notify of new conversations." +msgstr "Kas esitada heli uutest vestlustest märkuandmiseks." msgid "Play a sound when a contact logs in" msgstr "Kontakti sisenemise puhul esitatakse heli" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "Kas esitada heli kontakti sisenemisest märkuandmiseks." + msgid "Play a sound when a contact logs out" msgstr "Kontakti väljumise puhul esitatakse heli" +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "Kas esitada heli kontakti väljumisest märkuandmiseks." + msgid "Play a sound when we log in" msgstr "Heli esitamine sisselogimisel" +msgid "Whether to play a sound when logging into a network." +msgstr "Kas esitada heli võrku sisselogimisest märkuandmiseks." + msgid "Play a sound when we log out" msgstr "Heli esitamine väljalogimisel" +msgid "Whether to play a sound when logging out of a network." +msgstr "Kas esitada heli võrgust väljumisest märkuandmiseks." + +msgid "Enable popup notifications for new messages" +msgstr "Uute sõnumite hüpikmärguanded on lubatud" + +msgid "Whether to show a popup notification when receiving a new message." +msgstr "Kas näidata hüpikteadet uue teate vastuvõtmisest märkuandmiseks." + +msgid "Disable popup notifications when away" +msgstr "Eemalolekul on hüpikmärguanded keelatud" + +msgid "Whether to show popup notifications when away or busy." +msgstr "Kas näidata hüpikteateid olles eemal või hõivatud." + msgid "Pop up notifications if the chat isn't focused" msgstr "Kui vestlus pole aktiivne, näidatakse hüpikteateid" +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" +"Kas näidata hüpikteadet uue sõnumi saamisest märkuandmiseks isegi siis, kui " +"vestlus on juba avatud, kuid mitte fookuses." + msgid "Pop up notifications when a contact logs in" msgstr "Kui kontakt siseneb, kuvatakse hüpikteade" +msgid "Whether to show a popup notification when a contact goes online." +msgstr "Kas näidata hüpikteadet kontakti sisenemisest märkuandmiseks." + msgid "Pop up notifications when a contact logs out" msgstr "Kui kontakt väljub, kuvatakse hüpikteade" -msgid "Position the camera preview should be during a call." -msgstr "Enda kaamera pildi asukoht kõne ajal." +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "Kas näidata hüpikteadet kontakti väljumisest märkuandmiseks." -msgid "Show Balance in contact list" -msgstr "Kontaktide nimekirjas näidatakse kontojääki" +msgid "Use graphical smileys" +msgstr "Tujunägudele kasutatakse pilte" -msgid "Show avatars" -msgstr "Näidatakse avatare" +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "Kas tujunäod tuleks teisendada vestlustes piltideks." msgid "Show contact list in rooms" msgstr "Jututubades näidatakse liikmete loendit" -msgid "Show hint about closing the main window" -msgstr "Peaakna sulgemise kohta näidatakse soovitust" - -msgid "Show offline contacts" -msgstr "Ühendamata sõpru näidatakse" - -msgid "Show protocols" -msgstr "Kuva protokolle" - -msgid "Spell checking languages" -msgstr "Õigekirjakontrolli keeled" - -msgid "The default folder to save file transfers in." -msgstr "Vaikimisi kataloog, kuhu salvestada vastuvõetud failid." - -msgid "The last directory that an avatar image was chosen from." -msgstr "Kataloog, kust viimati valiti avatari pilt." - -msgid "The position for the chat window side pane" -msgstr "Vestlusakna külgpaneeli asukoht" +msgid "Whether to show the contact list in chat rooms." +msgstr "Kas jututubades näidatakse osalejate nimekirja või mitte." -msgid "The stored position (in pixels) of the chat window side pane." -msgstr "Vestlusakna külgpaneeli asukoht (pikslites)." +msgid "Chat window theme" +msgstr "Jututoaakende teema" msgid "The theme that is used to display the conversation in chat windows." msgstr "Kujundus, mida kasutatakse jututoaakende vestluste kuvamisel." +msgid "Chat window theme variant" +msgstr "Jututoaakende teema" + msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "Kujundus, mida kasutatakse jututoaakende vestluste kuvamisel." -msgid "Use graphical smileys" -msgstr "Tujunägudele kasutatakse pilte" +msgid "Path of the Adium theme to use" +msgstr "Kasutatava Adiumi kujunduse asukoht" -msgid "Use notification sounds" -msgstr "Teatehelisid esitatakse" +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "Kasutatava Adiumi kujunduse asukoht, kui vestluse kujundus on Adium." + +msgid "Enable WebKit Developer Tools" +msgstr "WebKit Developer tööriistade lubamine" + +msgid "" +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." +msgstr "Kas WebKit developer tööriistad, näiteks Web Inspector, tuleks lubada." msgid "Use theme for chat rooms" msgstr "Jututubadele kasutatakse teemat" -msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "Kas Empathy võib avaldada kontaktidele kasutaja asukoha." - -msgid "Whether Empathy can use the GPS to guess the location." -msgstr "Kas Empathy võib kasutada GPS-i asukoha arvamiseks." +msgid "Whether to use the theme for chat rooms." +msgstr "Kas jututubadele kasutatakse kujundust või mitte." -msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "Kas Empathy võib kasutada mobiilivõrku asukoha arvamiseks." +msgid "Spell checking languages" +msgstr "Õigekirjakontrolli keeled" -msgid "Whether Empathy can use the network to guess the location." -msgstr "Kas Empathy võib kasutada võrku asukoha arvamiseks." +msgid "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +msgstr "" +"Komadega eraldatud loend õigekirjakontrolli keeltest (nt \"et, en, fi, ru\")." -msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "Kas Empathy peaks käivitumisel ise kontodesse sisse logima." +msgid "Enable spell checker" +msgstr "Õigekirjakontrolli lubamine" msgid "" -"Whether Empathy should go into away mode automatically if the user is idle." +"Whether to check words typed against the languages you want to check with." msgstr "" -"Kas Empathy peaks jõudeoleku korral määrama olekuks automaatselt eemaloleku." +"Kas sisestatud sõnade õigsust tuleks kontrollida sinu valitud keelte järgi." + +msgid "Nick completed character" +msgstr "Nimele lisamise märk" msgid "" -"Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "Kas Empathy peaks privaatsuse tagamiseks vähendama asukoha täpsust." +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "" +"Märk, mis lisatakse hüüdnime lõppu, kui jututoas kasutatakse nime " +"automaatlõpetust (tab-klahv)." + +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "Empathy peaks kasutama avatari vestlusakna ikoonina" msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "Kas Empathy peaks kasutama kontakti avatari vestlusakna ikoonina." -msgid "" -"Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "Kas WebKit developer tööriistad, näiteks Web Inspector, tuleks lubada." +msgid "Last account selected in Join Room dialog" +msgstr "Viimane konto, mis valiti \"Ühine jututoaga\" dialoogis" -msgid "" -"Whether connectivity managers should be used to automatically disconnect/" -"reconnect." -msgstr "" -"Kas automaatseks lahti- või taasühendumiseks tuleks kasutada ühenduste " -"haldurit või mitte." +msgid "D-Bus object path of the last account selected to join a room." +msgstr "Toaga ühinemiseks viimati valitud konto D-Busi objekti asukoht" -msgid "" -"Whether to check words typed against the languages you want to check with." +msgid "Camera device" +msgstr "Kaameraseade" + +msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "" -"Kas sisestatud sõnade õigsust tuleks kontrollida sinu valitud keelte järgi." +"Vaikimisi kaameraseade, mida kasutatakse videokõnede jaoks, nt /dev/video0" -msgid "Whether to convert smileys into graphical images in conversations." -msgstr "Kas tujunäod tuleks teisendada vestlustes piltideks." +msgid "Camera position" +msgstr "Kaamera asukoht" + +msgid "Position the camera preview should be during a call." +msgstr "Enda kaamera pildi asukoht kõne ajal." + +msgid "Echo cancellation support" +msgstr "Kaja vähendamise tugi" msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "Kas lubada Pulseaudio kaja vähendamise filter." -msgid "Whether to play a sound to notify of contacts logging into the network." -msgstr "Kas esitada heli kontakti sisenemisest märkuandmiseks." +msgid "Show hint about closing the main window" +msgstr "Peaakna sulgemise kohta näidatakse soovitust" msgid "" -"Whether to play a sound to notify of contacts logging out of the network." -msgstr "Kas esitada heli kontakti väljumisest märkuandmiseks." - -msgid "Whether to play a sound to notify of events." -msgstr "Kas esitada heli sündmustest märkuandmiseks." - -msgid "Whether to play a sound to notify of incoming messages." -msgstr "Kas esitada heli saabuvatest sõnumitest märkuandmiseks." - -msgid "Whether to play a sound to notify of new conversations." -msgstr "Kas esitada heli uutest vestlustest märkuandmiseks." +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." +msgstr "" +"Kas peaakna sulgemisel tiitliriba 'x' ristist küsitakse kinnitust või mitte." -msgid "Whether to play a sound to notify of outgoing messages." -msgstr "Kas esitada heli väljuvatest sõnumitest märkuandmiseks." +msgid "Empathy can publish the user's location" +msgstr "Empathy tohib näidata kasutaja asukohta" -msgid "Whether to play a sound when logging into a network." -msgstr "Kas esitada heli võrku sisselogimisest märkuandmiseks." +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "Kas Empathy võib avaldada kontaktidele kasutaja asukoha." -msgid "Whether to play a sound when logging out of a network." -msgstr "Kas esitada heli võrgust väljumisest märkuandmiseks." +msgid "Empathy can use the network to guess the location" +msgstr "Empathy tohib kasutada võrku asukoha arvamiseks" -msgid "Whether to play sound notifications when away or busy." -msgstr "Kas esitada heli eemal või hõivatud oleku määramisest märkuandmiseks." +msgid "Whether Empathy can use the network to guess the location." +msgstr "Kas Empathy võib kasutada võrku asukoha arvamiseks." -msgid "Whether to show a popup notification when a contact goes offline." -msgstr "Kas näidata hüpikteadet kontakti väljumisest märkuandmiseks." +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy tohib kasutada mobiilivõrku asukoha arvamiseks" -msgid "Whether to show a popup notification when a contact goes online." -msgstr "Kas näidata hüpikteadet kontakti sisenemisest märkuandmiseks." +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "Kas Empathy võib kasutada mobiilivõrku asukoha arvamiseks." -msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." -msgstr "" -"Kas näidata hüpikteadet uue sõnumi saamisest märkuandmiseks isegi siis, kui " -"vestlus on juba avatud, kuid mitte fookuses." +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy tohib kasutada GPS-i andmeid asukoha arvamiseks" -msgid "Whether to show a popup notification when receiving a new message." -msgstr "Kas näidata hüpikteadet uue teate vastuvõtmisest märkuandmiseks." +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Kas Empathy võib kasutada GPS-i asukoha arvamiseks." -msgid "Whether to show account balances in the contact list." -msgstr "Kas näidata kontaktide nimekirjas kontojääki." +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy peaks vähendama asukoha täpsust" msgid "" -"Whether to show avatars for contacts in the contact list and chat windows." -msgstr "Kas näidata kontaktide nimekirjas ja vestlusakendes avatare." - -msgid "Whether to show contacts that are offline in the contact list." -msgstr "Kas näidata kontaktide nimekirjas kontakte, kes pole ühendatud." +"Whether Empathy should reduce the location's accuracy for privacy reasons." +msgstr "Kas Empathy peaks privaatsuse tagamiseks vähendama asukoha täpsust." -msgid "Whether to show popup notifications when away or busy." -msgstr "Kas näidata hüpikteateid olles eemal või hõivatud." +#. Tweak the dialog +msgid "Messaging and VoIP Accounts" +msgstr "Sõnumi- ja VoIP kontod" -msgid "Whether to show protocols for contacts in the contact list." -msgstr "Kas näidata kontaktide nimekirjas kontaktide protokolle." +msgid "Manage Messaging and VoIP accounts" +msgstr "Sõnumi- ja VoIP kontode haldamine" -msgid "Whether to show the contact list in chat rooms." -msgstr "Kas jututubades näidatakse osalejate nimekirja või mitte." +msgid "No reason was specified" +msgstr "Põhjendust pole määratud." -msgid "Whether to show the contact list in compact mode." -msgstr "Kas kontaktide nimekirja kuvatakse kompaktvaates või mitte." +msgid "The change in state was requested" +msgstr "Nõuti olekumuutust" -msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." -msgstr "" -"Kas peaakna sulgemisel tiitliriba 'x' ristist küsitakse kinnitust või mitte." +msgid "You canceled the file transfer" +msgstr "Sina katkestasid failiülekande" -msgid "Whether to use the theme for chat rooms." -msgstr "Kas jututubadele kasutatakse kujundust või mitte." +msgid "The other participant canceled the file transfer" +msgstr "Vestluskaaslane katkestas failiülekande" -msgid "" -"Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." -msgstr "" -"Kontaktide nimekirja sortimise alus. Vaikimisi on väärtus \"name\" ja sel " -"juhul sorditakse kontaktid nime järgi. Väärtuse \"state\" korral toimub " -"sortimine oleku järgi." +msgid "Error while trying to transfer the file" +msgstr "Viga faili ülekandmisel" -msgid "Manage Messaging and VoIP accounts" -msgstr "Sõnumi- ja VoIP kontode haldamine" +msgid "The other participant is unable to transfer the file" +msgstr "Vestluse teine osapool pole võimeline faili edastama" -#. Tweak the dialog -msgid "Messaging and VoIP Accounts" -msgstr "Sõnumi- ja VoIP kontod" +msgid "Unknown reason" +msgstr "Tundmatu põhjus" msgid "File transfer completed, but the file was corrupted" msgstr "Fail on täielikult üle kantud, kuid faili sisu on rikutud" @@ -413,30 +428,6 @@ msgstr "Helistad kasutajale %s" msgid "Call from %s" msgstr "Kõne kasutajalt %s" -msgid "Socket type not supported" -msgstr "Sokli liik pole toetatud." - -msgid "No reason was specified" -msgstr "Põhjendust pole määratud." - -msgid "The change in state was requested" -msgstr "Nõuti olekumuutust" - -msgid "You canceled the file transfer" -msgstr "Sina katkestasid failiülekande" - -msgid "The other participant canceled the file transfer" -msgstr "Vestluskaaslane katkestas failiülekande" - -msgid "Error while trying to transfer the file" -msgstr "Viga faili ülekandmisel" - -msgid "The other participant is unable to transfer the file" -msgstr "Vestluse teine osapool pole võimeline faili edastama" - -msgid "Unknown reason" -msgstr "Tundmatu põhjus" - msgid "Available" msgstr "Saadaval" @@ -546,6 +537,9 @@ msgstr "" msgid "Your software is too old" msgstr "Sinu tarkvara on liiga vana" +msgid "Internal error" +msgstr "Sisemine viga" + msgid "People Nearby" msgstr "Lähedalasuvad inimesed" @@ -616,25 +610,6 @@ msgstr "Port" msgid "%s:" msgstr "%s:" -msgid "My Web Accounts" -msgstr "Minu veebikontod" - -#, c-format -msgid "The account %s is edited via %s." -msgstr "Kontot %s muudetakse %s kaudu." - -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Kontot %s pole võimalik Empathy abil muuta." - -msgid "Launch My Web Accounts" -msgstr "Käivita Minu Veebikontod" - -#. general handler -#, c-format -msgid "Edit %s" -msgstr "Muuda %s" - msgid "Username:" msgstr "Kasutajanimi:" @@ -650,9 +625,6 @@ msgstr "See konto on serveris juba olemas" msgid "Create a new account on the server" msgstr "Loo serverisse uus konto" -msgid "Ca_ncel" -msgstr "_Loobu" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". @@ -671,30 +643,18 @@ msgstr "%s konto" msgid "New account" msgstr "Uus konto" -msgid "Example: MyScreenName" -msgstr "Näide: MinuEkraaniNimi" - -msgid "Advanced" -msgstr "Laiendatud" - msgid "Pass_word:" msgstr "_Parool:" -msgid "Remember Password" -msgstr "Parooli peetakse meeles" - -#. remember password ticky box -msgid "Remember password" -msgstr "Parooli peetakse meeles" - msgid "Screen _Name:" msgstr "Ekraani_nimi:" -msgid "What is your AIM password?" -msgstr "Mis on sinu AIM-i parool?" +msgid "Example: MyScreenName" +msgstr "Näide: MinuEkraaniNimi" -msgid "What is your AIM screen name?" -msgstr "Mis on sinu AIM-i ekraaninimi?" +#. remember password ticky box +msgid "Remember password" +msgstr "Parooli peetakse meeles" msgid "_Port:" msgstr "_Port:" @@ -702,27 +662,39 @@ msgstr "_Port:" msgid "_Server:" msgstr "_Server:" -msgid "Example: username" -msgstr "Näide: kasutajanimi" +msgid "Advanced" +msgstr "Laiendatud" + +msgid "What is your AIM screen name?" +msgstr "Mis on sinu AIM-i ekraaninimi?" + +msgid "What is your AIM password?" +msgstr "Mis on sinu AIM-i parool?" + +msgid "Remember Password" +msgstr "Parooli peetakse meeles" msgid "Login I_D:" msgstr "Sisselogimise I_D:" +msgid "Example: username" +msgstr "Näide: kasutajanimi" + msgid "What is your GroupWise User ID?" msgstr "Mis on sinu GroupWise kasutaja ID?" msgid "What is your GroupWise password?" msgstr "Mis on sinu GroupWise parool?" +msgid "ICQ _UIN:" +msgstr "ICQ _UIN:" + msgid "Example: 123456789" msgstr "Näide: 123456789" msgid "Ch_aracter set:" msgstr "_Kooditabel:" -msgid "ICQ _UIN:" -msgstr "ICQ _UIN:" - msgid "What is your ICQ UIN?" msgstr "Mis on sinu ICQ UIN?" @@ -754,9 +726,18 @@ msgstr "Valikud" msgid "None" msgstr "Puudub" +msgid "Network" +msgstr "Võrk" + +msgid "Network:" +msgstr "Võrk:" + msgid "Character set:" msgstr "Kooditabel:" +msgid "Servers" +msgstr "Serverid" + msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." @@ -764,12 +745,6 @@ msgstr "" "Enamik IRC servereid ei vaja parooli. Kui sa pole kindel, ära sisesta " "parooli." -msgid "Network" -msgstr "Võrk" - -msgid "Network:" -msgstr "Võrk:" - msgid "Nickname:" msgstr "Hüüdnimi:" @@ -782,35 +757,14 @@ msgstr "Lahkumise teade:" msgid "Real name:" msgstr "Pärisnimi:" -msgid "Servers" -msgstr "Serverid" - -msgid "What is your IRC nickname?" -msgstr "Mis on sinu IRC ekraaninimi?" - msgid "Which IRC network?" msgstr "Milline IRC võrk?" -msgid "Example: user@gmail.com" -msgstr "Näide: kasutaja@gmail.com" - -msgid "Example: user@jabber.org" -msgstr "Näide: kasutaja@jabber.org" - -msgid "Encr_yption required (TLS/SSL)" -msgstr "_Krüpteeringu nõudmine (TLS/SSL)" - -msgid "I_gnore SSL certificate errors" -msgstr "SSL-sertifikaadi vigu _eiratakse" - -msgid "Override server settings" -msgstr "Serveri sätete eiramine" - -msgid "Priori_ty:" -msgstr "_Tähtsus:" +msgid "What is your IRC nickname?" +msgstr "Mis on sinu IRC ekraaninimi?" -msgid "Reso_urce:" -msgstr "_Vahend:" +msgid "What is your Facebook username?" +msgstr "Mis on sinu Facebooki kasutajanimi?" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. msgid "" @@ -824,30 +778,48 @@ msgstr "" "Kui sul veel ei ole Facebooki kasutajanime, saad selle luua siin lehel." -msgid "Use old SS_L" -msgstr "Kasutatakse _vana SSL-i" - msgid "What is your Facebook password?" msgstr "Mis on sinu Facebooki parool?" -msgid "What is your Facebook username?" -msgstr "Mis on sinu Facebooki kasutajanimi?" - msgid "What is your Google ID?" msgstr "Mis on sinu Google ID?" +msgid "Example: user@gmail.com" +msgstr "Näide: kasutaja@gmail.com" + msgid "What is your Google password?" msgstr "Mis on sinu Google parool?" +msgid "Example: user@jabber.org" +msgstr "Näide: kasutaja@jabber.org" + +msgid "I_gnore SSL certificate errors" +msgstr "SSL-sertifikaadi vigu _eiratakse" + +msgid "Priori_ty:" +msgstr "_Tähtsus:" + +msgid "Reso_urce:" +msgstr "_Vahend:" + +msgid "Encr_yption required (TLS/SSL)" +msgstr "_Krüpteeringu nõudmine (TLS/SSL)" + +msgid "Use old SS_L" +msgstr "Kasutatakse _vana SSL-i" + +msgid "Override server settings" +msgstr "Serveri sätete eiramine" + msgid "What is your Jabber ID?" msgstr "Mis on sinu Jabberi ID?" -msgid "What is your Jabber password?" -msgstr "Mis on sinu Jabberi parool?" - msgid "What is your desired Jabber ID?" msgstr "Mis on sinu poolt eelistatav Jabberi ID?" +msgid "What is your Jabber password?" +msgstr "Mis on sinu Jabberi parool?" + msgid "What is your desired Jabber password?" msgstr "Mis on sinu poolt eelistatav Jabberi parool?" @@ -860,99 +832,99 @@ msgstr "Mis on sinu Windows Live ID?" msgid "What is your Windows Live password?" msgstr "Mis on sinu Windows Live parool?" -msgid "E-_mail address:" -msgstr "_Meiliaadress:" - msgid "Nic_kname:" msgstr "_Hüüdnimi:" +msgid "_Last Name:" +msgstr "_Perekonnanimi:" + msgid "_First Name:" msgstr "_Eesnimi:" +msgid "_Published Name:" +msgstr "_Avaldatud nimi:" + msgid "_Jabber ID:" msgstr "_Jabberi ID:" -msgid "_Last Name:" -msgstr "_Perekonnanimi:" +msgid "E-_mail address:" +msgstr "_Meiliaadress:" -msgid "_Published Name:" -msgstr "_Avaldatud nimi:" +msgid "_Username:" +msgstr "_Kasutajanimi:" msgid "Example: user@my.sip.server" msgstr "Näide: kasutaja@minu.sip.server" -msgid "Authentication username:" -msgstr "Autentimise kasutajanimi:" +msgid "Use this account to call _landlines and mobile phones" +msgstr "Seda kontot kasutatakse _fiksvõrku ja mobiiltelefonidele helistamiseks" -msgid "Discover Binding" -msgstr "Seonduse avastamine" +msgid "NAT Traversal Options" +msgstr "NAT-traversal valikud" + +msgid "Proxy Options" +msgstr "Proksi valikud" + +msgid "Miscellaneous Options" +msgstr "Muud valikud" + +msgid "STUN Server:" +msgstr "STUN server:" msgid "Discover the STUN server automatically" msgstr "STUN-serveri automaatne tuvastus" -msgid "Ignore TLS Errors" -msgstr "TLS vigasid eiratakse" +msgid "Discover Binding" +msgstr "Seonduse avastamine" -msgid "Interval (seconds)" -msgstr "Intervall (sekundites)" +msgid "Server:" +msgstr "Server:" msgid "Keep-Alive Options" msgstr "Ühenduse elushoidmise valikud" -msgid "Loose Routing" -msgstr "Vaba marsruutimine" - msgid "Mechanism:" msgstr "Mehhanism:" -msgid "Miscellaneous Options" -msgstr "Muud valikud" - -msgid "NAT Traversal Options" -msgstr "NAT-traversal valikud" - -msgid "Port:" -msgstr "Port:" - -msgid "Proxy Options" -msgstr "Proksi valikud" - -msgid "STUN Server:" -msgstr "STUN server:" +msgid "Interval (seconds)" +msgstr "Intervall (sekundites)" -msgid "Server:" -msgstr "Server:" +msgid "Authentication username:" +msgstr "Autentimise kasutajanimi:" msgid "Transport:" msgstr "Transport:" -msgid "Use this account to call _landlines and mobile phones" -msgstr "Seda kontot kasutatakse _fiksvõrku ja mobiiltelefonidele helistamiseks" +msgid "Loose Routing" +msgstr "Vaba marsruutimine" -msgid "What is your SIP account password?" -msgstr "Mis on sinu SIP-konto parool?" +msgid "Ignore TLS Errors" +msgstr "TLS vigasid eiratakse" + +msgid "Port:" +msgstr "Port:" msgid "What is your SIP login ID?" msgstr "Mis on sinu SIP-i sisselogimise ID?" -msgid "_Username:" -msgstr "_Kasutajanimi:" +msgid "What is your SIP account password?" +msgstr "Mis on sinu SIP-konto parool?" + +msgid "Yahoo! I_D:" +msgstr "Yahoo! I_D:" msgid "I_gnore conference and chat room invitations" msgstr "Konverentside ja jututubade kutseid _eiratakse" +msgid "_Room List locale:" +msgstr "_Tubade nimekirja lokaat:" + msgid "What is your Yahoo! ID?" msgstr "Mis on sinu Yahoo! ID?" msgid "What is your Yahoo! password?" msgstr "Mis on sinu Yahoo! parool?" -msgid "Yahoo! I_D:" -msgstr "Yahoo! I_D:" - -msgid "_Room List locale:" -msgstr "_Tubade nimekirja lokaat:" - msgid "Couldn't convert image" msgstr "Pole võimalik pilti teisendada" @@ -1117,6 +1089,11 @@ msgstr "Teema:" msgid "Topic set to: %s" msgstr "Teema on: %s" +#, c-format +msgid "Topic set by %s to: %s" +msgstr "%s määras uue teema: %s" + +#. No need to display this 'event' is no topic can be defined anyway msgid "No topic defined" msgstr "Teemat pole seatud" @@ -1277,12 +1254,6 @@ msgstr "_Ava link" msgid "%A %B %d %Y" msgstr "%A, %d. %B %Y" -msgid "Edit Contact Information" -msgstr "Kontakti andmete redigeerimine" - -msgid "Personal Information" -msgstr "Isiklikud andmed" - msgid "New Contact" msgstr "Uus kontakt" @@ -1304,72 +1275,14 @@ msgid_plural "_Report these contacts as abusive" msgstr[0] "_Teata sellest kuritarvitavast kasutajast" msgstr[1] "_Teata nendest kuritarvitavatest kasutajatest" -msgid "Decide _Later" -msgstr "Otsusta _hiljem" - msgid "Subscription Request" msgstr "Tellimuse päring" msgid "_Block User" msgstr "_Blokeeri kasutaja" -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Kas tahad tõesti eemaldada grupi '%s'?" - -msgid "Removing group" -msgstr "Grupi eemaldamine" - -#. Remove -msgid "_Remove" -msgstr "_Eemalda" - -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Kas sa tõesti soovid eemaldada kontakti '%s'?" - -msgid "Removing contact" -msgstr "Kontakti eemaldamine" - -msgid "_Add Contact…" -msgstr "Lisa _kontakt…" - -msgid "_Block Contact" -msgstr "_Blokeeri kontakt" - -#. add chat button -msgid "_Chat" -msgstr "_Vestlus" - -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Audiovestlus" - -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Videovestlus" - -msgid "_Previous Conversations" -msgstr "_Eelmised vestlused" - -msgid "Send File" -msgstr "Faili saatmine" - -msgid "Share My Desktop" -msgstr "Jaga minu töölauda" - -msgid "Infor_mation" -msgstr "_Andmed" - -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "_Muuda" - -msgid "Inviting you to this room" -msgstr "Kutse sellesse tuppa" - -msgid "_Invite to Chat Room" -msgstr "_Kutsu jututuppa" +msgid "Decide _Later" +msgstr "Otsusta _hiljem" #. Title msgid "Search contacts" @@ -1482,9 +1395,6 @@ msgstr "Avatari salvestamine" msgid "Unable to save avatar" msgstr "Avatari salvestamine pole võimalik" -msgid "Favorite" -msgstr "Lemmik" - msgid "Full name" msgstr "Täisnimi" @@ -1535,36 +1445,36 @@ msgstr "postipakk" msgid "parcel" msgstr "kullerpakk" -msgid "Location at (date)\t" -msgstr "Asukoht kuupäeval\t" +#. Identifier to connect to Instant Messaging network +#. Translators: Identifier to connect to Instant Messaging network +msgid "Identifier:" +msgstr "Kasutajanimi:" #. Alias msgid "Alias:" msgstr "Alias:" -msgid "Client Information" -msgstr "Kliendi andmed" - -msgid "Client:" -msgstr "Klient:" +msgid "Location at (date)\t" +msgstr "Asukoht kuupäeval\t" msgid "Contact Details" msgstr "Kontaktandmed" -#. Identifier to connect to Instant Messaging network -#. Translators: Identifier to connect to Instant Messaging network -msgid "Identifier:" -msgstr "Kasutajanimi:" - msgid "Information requested…" msgstr "Päriti andmeid…" +msgid "Client Information" +msgstr "Kliendi andmed" + msgid "OS:" msgstr "OS:" msgid "Version:" msgstr "Versioon:" +msgid "Client:" +msgstr "Klient:" + msgid "Groups" msgstr "Grupid" @@ -1595,9 +1505,8 @@ msgid_plural "The following identities can not be blocked:" msgstr[0] "Järgnevat isikut pole võimalik blokkida:" msgstr[1] "Järgnevaid isikuid pole võimalik blokkida:" -#. Translators: the heading at the top of the Information dialogue -msgid "Linked Contacts" -msgstr "Liidetud kontaktid" +msgid "Edit Contact Information" +msgstr "Kontakti andmete redigeerimine" msgid "Select contacts to link" msgstr "Vali kontaktid, keda kokku liita" @@ -1632,10 +1541,46 @@ msgstr "Töö" msgid "HOME" msgstr "KODU" +msgid "_Block Contact" +msgstr "_Blokeeri kontakt" + +#. add chat button +msgid "_Chat" +msgstr "_Vestlus" + #. add SMS button msgid "_SMS" msgstr "_SMS" +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Audiovestlus" + +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Videovestlus" + +msgid "_Previous Conversations" +msgstr "_Eelmised vestlused" + +msgid "Send File" +msgstr "Faili saatmine" + +msgid "Share My Desktop" +msgstr "Jaga minu töölauda" + +msgid "Favorite" +msgstr "Lemmik" + +msgid "gnome-contacts not installed" +msgstr "gnome-contacts pole paigaldatud" + +msgid "Please install gnome-contacts to access contacts details." +msgstr "Kontakti andmete kuvamiseks paigalda palun gnome-contacts." + +msgid "Infor_mation" +msgstr "_Andmed" + msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Redaktor" @@ -1646,9 +1591,33 @@ msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "_Ühenda kontaktid…" +msgid "Inviting you to this room" +msgstr "Kutse sellesse tuppa" + +msgid "_Invite to Chat Room" +msgstr "_Kutsu jututuppa" + +msgid "_Add Contact…" +msgstr "Lisa _kontakt…" + msgid "Delete and _Block" msgstr "Kustuta ja _blokeeri" +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Kas tahad tõesti eemaldada grupi '%s'?" + +msgid "Removing group" +msgstr "Grupi eemaldamine" + +#. Remove +msgid "_Remove" +msgstr "_Eemalda" + +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Kas sa tõesti soovid eemaldada kontakti '%s'?" + #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -1657,6 +1626,9 @@ msgstr "" "Kas tõesti tahad eemaldada lingitud kontakti '%s'? See eemaldab kõik " "kontaktid, millest lingitud kontakt koosneb." +msgid "Removing contact" +msgstr "Kontakti eemaldamine" + #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -1824,11 +1796,11 @@ msgstr "Puhasta kõik" msgid "Delete from:" msgstr "Kustuta kust:" -msgid "Loading..." -msgstr "Laadimine..." +msgid "_File" +msgstr "_Fail" -msgid "Chat" -msgstr "Vestlus" +msgid "_Edit" +msgstr "_Redaktor" msgid "Delete All History..." msgstr "Kogu ajaloo kustutamine..." @@ -1836,18 +1808,18 @@ msgstr "Kogu ajaloo kustutamine..." msgid "Profile" msgstr "Profiil" +msgid "Chat" +msgstr "Vestlus" + msgid "Video" msgstr "Video" -msgid "_Edit" -msgstr "_Redaktor" - -msgid "_File" -msgstr "_Fail" - msgid "page 2" msgstr "leht 2" +msgid "Loading..." +msgstr "Laadimine..." + msgid "The contact is offline" msgstr "Kontakt pole võrku ühendatud" @@ -1900,6 +1872,10 @@ msgstr "_Audiokõne" msgid "New Call" msgstr "Uus kõne" +#, c-format +msgid "Authentification failed for account %s" +msgstr "Konto %s autentimine nurjus" + #, c-format msgid "" "Enter your password for account\n" @@ -1944,18 +1920,18 @@ msgstr "Uus %s konto" msgid "Find:" msgstr "Otsi:" +msgid "_Previous" +msgstr "_Eelmine" + +msgid "_Next" +msgstr "_Järgmine" + msgid "Mat_ch case" msgstr "_Tõstutundlik" msgid "Phrase not found" msgstr "Fraasi ei leitud" -msgid "_Next" -msgstr "_Järgmine" - -msgid "_Previous" -msgstr "_Eelmine" - msgid "Received an instant message" msgstr "Võeti vastu välksõnum" @@ -2053,6 +2029,9 @@ msgstr "Sertifikaadi hostinimi: %s" msgid "Continue" msgstr "Jätka" +msgid "Untrusted connection" +msgstr "Ebausaldusväärne ühendus" + msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Ühendus pole usaldusväärne. Kas tahad siiski jätkata?" @@ -2399,12 +2378,17 @@ msgstr "Tundmatu olek" msgid "Offline — Account Disabled" msgstr "Ühendamata — konto keelatud" -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Sa oled loomas uut kontot ja see tühistab tehtud muudatused\n" -"Kas sa soovid seda teha?" +msgid "Edit Connection Parameters" +msgstr "Ühenduse parameetrite muutmine" + +msgid "Failed to retrieve your personal information from the server." +msgstr "Sinu isiklike andmete hankimine serverist nurjus." + +msgid "Go online to edit your personal information." +msgstr "Oma isiklike andmete muutmiseks mine veebilehele." + +msgid "_Edit Connection Parameters..." +msgstr "_Ühenduse parameetrite muutmine..." #, c-format msgid "Do you want to remove %s from your computer?" @@ -2437,11 +2421,8 @@ msgstr "" msgid "Add…" msgstr "Lisa…" -msgid "Loading account information" -msgstr "Konto andmete laadimine" - -msgid "No protocol installed" -msgstr "Ühtegi protokolli pole paigaldatud" +msgid "_Import…" +msgstr "_Impordi…" msgid "Protocol:" msgstr "Protokoll:" @@ -2453,8 +2434,11 @@ msgstr "" "Uue konto lisamiseks pead paigaldama tugiprogrammi iga protokolli jaoks, " "mida tahad kasutada." -msgid "_Import…" -msgstr "_Impordi…" +msgid "No protocol installed" +msgstr "Ühtegi protokolli pole paigaldatud" + +msgid "Loading account information" +msgstr "Konto andmete laadimine" msgid " - Empathy authentication client" msgstr " - Empathy autentimisklient" @@ -2590,47 +2574,50 @@ msgstr "Helivoogu pole võimalik alustada" msgid "Can't establish video stream" msgstr "Videovoogu pole võimalik alustada" -msgid "Audio" -msgstr "Audio" +msgid "_Call" +msgstr "_Helista" -msgid "Decoding Codec:" -msgstr "Dekodeeriv koodek:" +msgid "_Microphone" +msgstr "_Mikrofon" -msgid "Disable camera" -msgstr "Keela kaamera" +msgid "_Camera" +msgstr "_Kaamera" -msgid "Display the dialpad" -msgstr "Kuva sõrmlaud" +msgid "_Settings" +msgstr "_Seaded" -msgid "Encoding Codec:" -msgstr "Kodeeriv koodek:" +msgid "_View" +msgstr "_Vaade" -msgid "Hang up" -msgstr "Toru hargile" +msgid "_Help" +msgstr "A_bi" -msgid "Hang up current call" -msgstr "Praeguse kõne lõpetamine" +msgid "_Contents" +msgstr "_Sisukord" -msgid "Local Candidate:" -msgstr "Kohalik kandidaat:" +msgid "_Debug" +msgstr "Si_lumine" -msgid "Maximise me" -msgstr "Maksimeeri mind" +msgid "Swap camera" +msgstr "Kaamera vahetamine" msgid "Minimise me" msgstr "Minimeeri mind" -msgid "Remote Candidate:" -msgstr "Kaugkandidaat:" +msgid "Maximise me" +msgstr "Maksimeeri mind" -msgid "Send Audio" -msgstr "Saada heli" +msgid "Disable camera" +msgstr "Keela kaamera" -msgid "Send Video" -msgstr "Video saatmine" +msgid "Hang up" +msgstr "Toru hargile" -msgid "Show dialpad" -msgstr "Sõrmlaua näitamine" +msgid "Hang up current call" +msgstr "Praeguse kõne lõpetamine" + +msgid "Video call" +msgstr "Videokõne" msgid "Start a video call" msgstr "Videokõne alustamine" @@ -2638,44 +2625,81 @@ msgstr "Videokõne alustamine" msgid "Start an audio call" msgstr "Audiokõne alustamine" -msgid "Swap camera" -msgstr "Kaamera vahetamine" +msgid "Show dialpad" +msgstr "Sõrmlaua näitamine" -msgid "Toggle audio transmission" -msgstr "Heliedastuse lüliti" +msgid "Display the dialpad" +msgstr "Kuva sõrmlaud" + +msgid "Send Video" +msgstr "Video saatmine" msgid "Toggle video transmission" msgstr "Videoedastuse lüliti" +msgid "Send Audio" +msgstr "Saada heli" + +msgid "Toggle audio transmission" +msgstr "Heliedastuse lüliti" + +msgid "Encoding Codec:" +msgstr "Kodeeriv koodek:" + msgid "Unknown" msgstr "Tundmatu" -msgid "Video call" -msgstr "Videokõne" +msgid "Decoding Codec:" +msgstr "Dekodeeriv koodek:" -msgid "_Call" -msgstr "_Helista" +msgid "Remote Candidate:" +msgstr "Kaugkandidaat:" -msgid "_Camera" -msgstr "_Kaamera" +msgid "Local Candidate:" +msgstr "Kohalik kandidaat:" -msgid "_Contents" -msgstr "_Sisukord" +msgid "Audio" +msgstr "Audio" -msgid "_Debug" -msgstr "Si_lumine" +msgid "Close this window?" +msgstr "Kas sulgeda see aken?" -msgid "_Help" -msgstr "A_bi" +#, c-format +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "" +"Selle akna sulgemisega lahkud %s võrgust. Kuni uuesti ühendumiseni ei saa sa " +"ühtegi teadet." -msgid "_Microphone" -msgstr "_Mikrofon" +#, 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] "" +"Selle akna sulgemisega lahkud jututoast. Kuni uuesti ühendumiseni ei saa sa " +"ühtegi teadet." +msgstr[1] "" +"Selle akna sulgemisega lahkud %u jututoast. Kuni uuesti ühendumiseni ei saa " +"sa ühtegi teadet." + +#, c-format +msgid "Leave %s?" +msgstr "Kas lahkuda toast %s?" -msgid "_Settings" -msgstr "_Seaded" +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "Kuni uuesti ühendumiseni ei saa sa sellest jututoast ühtegi teadet." -msgid "_View" -msgstr "_Vaade" +msgid "Close window" +msgstr "Sulge aken" + +msgid "Leave room" +msgstr "Lahku toast" #, c-format msgid "%s (%d unread)" @@ -2713,51 +2737,51 @@ msgstr[1] "%d sõnumi saatmine" msgid "Typing a message." msgstr "Kirjutab sõnumit." +msgid "_Conversation" +msgstr "_Vestlus" + msgid "C_lear" msgstr "_Puhasta" -msgid "C_ontact" -msgstr "_Kontakt" - msgid "Insert _Smiley" msgstr "Lisa _tujunägu" -msgid "Invite _Participant…" -msgstr "Kutsu _osaline…" - -msgid "Move Tab _Left" -msgstr "Tõsta kaart _vasakule" - -msgid "Move Tab _Right" -msgstr "Tõsta kaart _paremale" +msgid "_Favorite Chat Room" +msgstr "_Lemmikjututuba" msgid "Notify for All Messages" msgstr "Teavitamine kõigist sõnumitest" -msgid "_Conversation" -msgstr "_Vestlus" +msgid "_Show Contact List" +msgstr "_Sõbranimekirja näidatakse" -msgid "_Detach Tab" -msgstr "_Haagi kaart lahti" +msgid "Invite _Participant…" +msgstr "Kutsu _osaline…" -msgid "_Favorite Chat Room" -msgstr "_Lemmikjututuba" +msgid "C_ontact" +msgstr "_Kontakt" -msgid "_Next Tab" -msgstr "_Järgmine kaart" +msgid "_Tabs" +msgstr "_Sakid" msgid "_Previous Tab" msgstr "_Eelmine kaart" -msgid "_Show Contact List" -msgstr "_Sõbranimekirja näidatakse" - -msgid "_Tabs" -msgstr "_Sakid" +msgid "_Next Tab" +msgstr "_Järgmine kaart" msgid "_Undo Close Tab" msgstr "_Võta saki sulgemine tagasi" +msgid "Move Tab _Left" +msgstr "Tõsta kaart _vasakule" + +msgid "Move Tab _Right" +msgstr "Tõsta kaart _paremale" + +msgid "_Detach Tab" +msgstr "_Haagi kaart lahti" + msgid "Name" msgstr "Nimi" @@ -2960,6 +2984,9 @@ msgstr "Parooli sisestamine" msgid "Disconnect" msgstr "Katkesta ühendus" +msgid "You need to setup an account to see contacts here." +msgstr "Siin kontaktide nägemiseks pead mõne konto seadistama." + msgid "No match found" msgstr "Vastavust ei leitud" @@ -2982,7 +3009,7 @@ msgid "Edit Account" msgstr "Konto redigeerimine" #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." +#. * Top up My Account ($1.23)..." #, c-format msgid "Top up %s (%s)..." msgstr "Lae %s kontot (%s)..." @@ -2997,74 +3024,82 @@ msgstr "Lae kontot..." msgid "Contact" msgstr "Kontakt" +msgid "You need to enable one of your accounts to see contacts here." +msgstr "Siin kontaktide nägemiseks pead lubama vähemalt ühe oma kontodest." + +#. translators: argument is an account name +#, c-format +msgid "You need to enable %s to see contacts here." +msgstr "Pead lubama %s konto, et näha siin kontakte." + msgid "Contact List" msgstr "Kontaktide nimekiri" -msgid "Contacts on a _Map" -msgstr "Kontaktid _kaardil" +msgid "Account settings" +msgstr "Konto sätted" -msgid "Credit Balance" -msgstr "Kontojääk" +msgid "_New Conversation…" +msgstr "_Uus vestlus…" -msgid "Find in Contact _List" -msgstr "_Otsi kontaktide nimekirjast" +msgid "New _Call…" +msgstr "Uus _kõne…" -msgid "Join _Favorites" -msgstr "Ühine _lemmiktubadega" +msgid "_Search for Contacts…" +msgstr "_Otsi kontakte…" -msgid "Manage Favorites" -msgstr "Lemmiktubade haldamine" +msgid "_File Transfers" +msgstr "_Failiülekanded" -msgid "N_ormal Size" -msgstr "No_rmaalsuurus" +msgid "_Offline Contacts" +msgstr "Ü_hendamata kontaktid" -msgid "New _Call…" -msgstr "Uus _kõne…" +msgid "Show P_rotocols" +msgstr "Kuva _protokolle" -msgid "Normal Size With _Avatars" -msgstr "Normaalsuurus _avataridega" +msgid "Credit Balance" +msgstr "Kontojääk" + +msgid "Contacts on a _Map" +msgstr "Kontaktid _kaardil" + +msgid "_Accounts" +msgstr "_Kontod" + +msgid "_Blocked Contacts" +msgstr "_Blokitud kontaktid" msgid "P_references" msgstr "_Eelistused" -msgid "Show P_rotocols" -msgstr "Kuva _protokolle" - +msgid "Find in Contact _List" +msgstr "_Otsi kontaktide nimekirjast" + msgid "Sort by _Name" msgstr "Sortimine _nime järgi" msgid "Sort by _Status" msgstr "Sortimine _oleku järgi" -msgid "_Accounts" -msgstr "_Kontod" +msgid "Normal Size With _Avatars" +msgstr "Normaalsuurus _avataridega" -msgid "_Blocked Contacts" -msgstr "_Blokitud kontaktid" +msgid "N_ormal Size" +msgstr "No_rmaalsuurus" msgid "_Compact Size" msgstr "_Kompaktne" -msgid "_File Transfers" -msgstr "_Failiülekanded" +msgid "_Room" +msgstr "_Tuba" msgid "_Join…" msgstr "Ü_hine…" -msgid "_New Conversation…" -msgstr "_Uus vestlus…" - -msgid "_Offline Contacts" -msgstr "Ü_hendamata kontaktid" - -msgid "_Personal Information" -msgstr "_Isiklikud andmed" - -msgid "_Room" -msgstr "_Tuba" +msgid "Join _Favorites" +msgstr "Ühine _lemmiktubadega" -msgid "_Search for Contacts…" -msgstr "_Otsi kontakte…" +msgid "Manage Favorites" +msgstr "Lemmiktubade haldamine" msgid "Chat Room" msgstr "Jututuba" @@ -3095,8 +3130,8 @@ msgstr "Tubade nimekirja pole võimalik alustada" msgid "Could not stop room listing" msgstr "Tubade nimekirja pole võimalik lõpetada" -msgid "Couldn't load room list" -msgstr "Tubade nimekirja pole võimalik laadida" +msgid "Join Room" +msgstr "Toaga ühinemine" msgid "" "Enter the room name to join here or click on one or more rooms in the list." @@ -3104,6 +3139,9 @@ msgstr "" "Sisesta jututoa nimi, millega tahad liituda, või klõpsa loendis oleva toa " "nimele." +msgid "_Room:" +msgstr "_Tuba:" + msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" @@ -3111,15 +3149,12 @@ msgstr "" "Sisesta server, mis võõrustab jututuba, või jäta tühjaks, kui tuba on " "praeguse konto serveris" -msgid "Join Room" -msgstr "Toaga ühinemine" +msgid "Couldn't load room list" +msgstr "Tubade nimekirja pole võimalik laadida" msgid "Room List" msgstr "Tubade nimekiri" -msgid "_Room:" -msgstr "_Tuba:" - msgid "Message received" msgstr "Sõnumi vastuvõtmine" @@ -3129,7 +3164,7 @@ msgstr "Sõnumi saatmine" msgid "New conversation" msgstr "Uus vestlus" -msgid "Contact goes online" +msgid "Contact comes online" msgstr "Kontakti sisenemine" msgid "Contact goes offline" @@ -3179,70 +3214,85 @@ msgstr "Julia lahkus" msgid "Preferences" msgstr "Eelistused" +msgid "Show _smileys as images" +msgstr "_Tujunägusid näidatakse piltidena" + +msgid "Show contact _list in rooms" +msgstr "Jututubades näidatakse kontaktide _loendit" + msgid "Appearance" msgstr "Välimus" -msgid "Behavior" -msgstr "Käitumine" - -msgid "Chat Th_eme:" -msgstr "Vestluse _teema:" +msgid "Start chats in:" +msgstr "Jututoad asuvad:" -msgid "Disable notifications when _away or busy" -msgstr "_Eemal- või hõivatud oleku korral on teated keelatud" +msgid "new ta_bs" +msgstr "uutel _kaartidel" -msgid "Disable sounds when _away or busy" -msgstr "_Eemal- või hõivatud oleku korral on helid keelatud" +msgid "new _windows" +msgstr "uutes _akendes" msgid "Display incoming events in the notification area" msgstr "Sissetulevaid sündmuseid kuvatakse teatealal" -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 "" -"Kaja vähendamine teeb sinu hääle teiste jaoks puhtamaks, kuid võib " -"põhjustada probleeme mõnedel arvutitel. Kui sina või teine kõne osapool " -"kuuleb imelikku müra või krõpse kõne ajal, proovi kaja vähendamine välja " -"lülitada ja helista uuesti." - -msgid "Enable notifications when a contact comes online" -msgstr "Teatatakse kontakti sisenemisest" - -msgid "Enable notifications when a contact goes offline" -msgstr "Teatatakse kontakti väljumisest" +msgid "_Automatically connect on startup" +msgstr "_Käivitumisel ühendutakse automaatselt" -msgid "Enable notifications when the _chat is not focused" -msgstr "_Fokuseerimata jututoa teated on lubatud" +msgid "Log conversations" +msgstr "Vestluseid logitakse" -msgid "Enable spell checking for languages:" -msgstr "Õigekirjakontroll on lubatud järgmistele keeltele:" +msgid "Behavior" +msgstr "Käitumine" msgid "General" msgstr "Üldine" -msgid "Input level:" -msgstr "Sisendtase:" +msgid "_Enable bubble notifications" +msgstr "_Teatemullid on lubatud" -msgid "Input volume:" -msgstr "Sisendvaljus:" +msgid "Disable notifications when _away or busy" +msgstr "_Eemal- või hõivatud oleku korral on teated keelatud" -msgid "Location sources:" -msgstr "Asukohaallikad:" +msgid "Enable notifications when the _chat is not focused" +msgstr "_Fokuseerimata jututoa teated on lubatud" -msgid "Log conversations" -msgstr "Vestluseid logitakse" +msgid "Enable notifications when a contact comes online" +msgstr "Teatatakse kontakti sisenemisest" + +msgid "Enable notifications when a contact goes offline" +msgstr "Teatatakse kontakti väljumisest" msgid "Notifications" msgstr "Teavitamisviisid" +msgid "_Enable sound notifications" +msgstr "_Heliteated on lubatud" + +msgid "Disable sounds when _away or busy" +msgstr "_Eemal- või hõivatud oleku korral on helid keelatud" + msgid "Play sound for events" msgstr "Helisid esitatakse järgnevate sündmuste puhul" -msgid "Privacy" -msgstr "Privaatsus" +msgid "Sounds" +msgstr "Helid" + +msgid "Use _echo cancellation to improve call quality" +msgstr "_Kaja vähendamine kõne kvaliteedi parendamiseks" + +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 "" +"Kaja vähendamine teeb sinu hääle teiste jaoks puhtamaks, kuid võib " +"põhjustada probleeme mõnedel arvutitel. Kui sina või teine kõne osapool " +"kuuleb imelikku müra või krõpse kõne ajal, proovi kaja vähendamine välja " +"lülitada ja helista uuesti." + +msgid "_Publish location to my contacts" +msgstr "_Minu asukoht avaldatakse kontaktidele" msgid "" "Reduced location accuracy means that nothing more precise than your city, " @@ -3252,17 +3302,24 @@ msgstr "" "Vähendatud asukoha täpsuse korral avaldatakse ainult linn, maakond ja riik. " "GPSi laius- ja pikkuskraadid ümardatakse kümnendkohani." -msgid "Show _smileys as images" -msgstr "_Tujunägusid näidatakse piltidena" +#. 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. +msgid "_Reduce location accuracy" +msgstr "_Asukoha täpsust vähendatakse" -msgid "Show contact _list in rooms" -msgstr "Jututubades näidatakse kontaktide _loendit" +msgid "Privacy" +msgstr "Privaatsus" -msgid "Sounds" -msgstr "Helid" +msgid "_GPS" +msgstr "_GPS" -msgid "Spell Checking" -msgstr "Õigekirjakontroll" +msgid "_Cellphone" +msgstr "_Mobiiltelefon" + +msgid "_Network (IP, Wi-Fi)" +msgstr "_Võrk (IP, Wi-Fi)" + +msgid "Location sources:" +msgstr "Asukohaallikad:" msgid "" "The list of languages reflects only the languages for which you have a " @@ -3271,48 +3328,41 @@ msgstr "" "Keelte nimekiri kajastab ainult neid keeli, mille jaoks on paigaldatud " "sõnastik." -msgid "Themes" -msgstr "Teemad" +msgid "Enable spell checking for languages:" +msgstr "Õigekirjakontroll on lubatud järgmistele keeltele:" -msgid "Use _echo cancellation to improve call quality" -msgstr "_Kaja vähendamine kõne kvaliteedi parendamiseks" +msgid "Spell Checking" +msgstr "Õigekirjakontroll" + +msgid "Chat Th_eme:" +msgstr "Vestluse _teema:" msgid "Variant:" msgstr "Variant:" -msgid "_Automatically connect on startup" -msgstr "_Käivitumisel ühendutakse automaatselt" - -msgid "_Cellphone" -msgstr "_Mobiiltelefon" - -msgid "_Enable bubble notifications" -msgstr "_Teatemullid on lubatud" - -msgid "_Enable sound notifications" -msgstr "_Heliteated on lubatud" +msgid "Themes" +msgstr "Teemad" -msgid "_GPS" -msgstr "_GPS" +msgid "Status" +msgstr "Olek" -msgid "_Network (IP, Wi-Fi)" -msgstr "_Võrk (IP, Wi-Fi)" +msgid "_Quit" +msgstr "_Lõpeta" -msgid "_Open new chats in separate windows" -msgstr "_Uued vestlused avanevad eraldi akendes" +msgid "Redial" +msgstr "Vali uuesti" -msgid "_Publish location to my contacts" -msgstr "_Minu asukoht avaldatakse kontaktidele" +msgid "V_ideo" +msgstr "V_ideo" -#. 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. -msgid "_Reduce location accuracy" -msgstr "_Asukoha täpsust vähendatakse" +msgid "Video Off" +msgstr "Video väljas" -msgid "Status" -msgstr "Olek" +msgid "Video Preview" +msgstr "Video eelvaade" -msgid "_Quit" -msgstr "_Lõpeta" +msgid "Video On" +msgstr "Video sees" msgid "Call the contact again" msgstr "Helista kontaktile uuesti" @@ -3320,35 +3370,20 @@ msgstr "Helista kontaktile uuesti" msgid "Camera Off" msgstr "Kaamera väljas" -msgid "Camera On" -msgstr "Kaamera sees" - msgid "Disable camera and stop sending video" msgstr "Kaamera keelamine ja video saatmise lõpetamine" -msgid "Enable camera and send video" -msgstr "Kaamera lubamine ja video saatmine" - -msgid "Enable camera but don't send video" -msgstr "Kaamera lubamine ilma video saatmiseta" - msgid "Preview" msgstr "Eelvaade" -msgid "Redial" -msgstr "Vali uuesti" - -msgid "V_ideo" -msgstr "V_ideo" - -msgid "Video Off" -msgstr "Video väljas" +msgid "Enable camera but don't send video" +msgstr "Kaamera lubamine ilma video saatmiseta" -msgid "Video On" -msgstr "Video sees" +msgid "Camera On" +msgstr "Kaamera sees" -msgid "Video Preview" -msgstr "Video eelvaade" +msgid "Enable camera and send video" +msgstr "Kaamera lubamine ja video saatmine" msgid "Contact Map View" msgstr "Kontaktide kaardivaade" @@ -3507,89 +3542,5 @@ msgstr "Lae kontot" msgid "_Match case" msgstr "_Tõstutundlik" -#~ msgid "Empathy has migrated butterfly logs" -#~ msgstr "Empathy on üle kandnud butterfly logid" - -#~ msgid "Whether Empathy has migrated butterfly logs." -#~ msgstr "Kas Empathy on üle kandnud butterfly logid." - -#~ msgid "All" -#~ msgstr "Kõik" - -#~ msgid "_Enabled" -#~ msgstr "_Lubatud" - -#~ msgid "Ungrouped" -#~ msgstr "Grupeerimata" - -#~ msgid "Favorite People" -#~ msgstr "Lemmikud" - -#~ msgid "Select a contact" -#~ msgstr "Vali kontakt" - -#~ msgid "Date" -#~ msgstr "Kuupäev" - -#~ msgid "Conversations" -#~ msgstr "Vestlused" - -#~ msgid "Find Next" -#~ msgstr "Otsi järgmine" - -#~ msgid "Find Previous" -#~ msgstr "Otsi eelmine" - -#~ msgid "Previous Conversations" -#~ msgstr "Eelmised vestlused" - -#~ msgid "_For:" -#~ msgstr "_Otsing:" - -#~ msgid "Contact ID:" -#~ msgstr "Kontakti ID:" - -#~ msgid "C_hat" -#~ msgstr "_Vestle" - -#~ msgid "C_all" -#~ msgstr "_Helista" - -#~ msgid "Set your presence and current status" -#~ msgstr "Kohalolu ja praeguse oleku määramine" - -#~ msgid "Enter Custom Message" -#~ msgstr "Sisesta oma teade" - -#~ msgid "Save _New Status Message" -#~ msgstr "Salvesta _uus olekusõnum" - -#~ msgid "Saved Status Messages" -#~ msgstr "Salvestatud olekuteated" - -#~ msgid "The selected contact cannot receive files." -#~ msgstr "Valitud kontakt pole suuteline faile vastu võtma." - -#~ msgid "Show and edit accounts" -#~ msgstr "Kontode näitamine ja redigeerimine" - -#~ msgid "%s is now offline." -#~ msgstr "%s pole enam ühendatud." - -#~ msgid "%s is now online." -#~ msgstr "%s on nüüd ühendatud." - -#~ msgid "Context" -#~ msgstr "Kontekst" - -#~ msgid "The hash of the received file and the sent one do not match" -#~ msgstr "Vastuvõetud faili ja saadetud faili räsi ei kattu" - -#~ msgid "Add _New Preset" -#~ msgstr "_Uue oleku lisamine" - -#~ msgid "Saved Presets" -#~ msgstr "Salvestatud olekud" - -#~ msgid "Subscription requested by %s" -#~ msgstr "Tellimus, mida küsis %s" +msgid "Adding new account" +msgstr "Uue konto lisamine" diff --git a/po/gl.po b/po/gl.po index b0653dda..1b4e80d9 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,14 +7,14 @@ # Antón Méixome , 2010. # Francisco Diéguez , 2010. # Fran Diéguez ,2009, 2010, 2011. -# Fran Dieguez , 2009, 2010, 2011. +# Fran Dieguez , 2009, 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: empathy-master-po-gl-57278_.merged\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-04 13:01+0100\n" -"PO-Revision-Date: 2011-11-04 13:02+0100\n" +"POT-Creation-Date: 2012-02-14 21:58+0100\n" +"PO-Revision-Date: 2012-02-14 22:00+0100\n" "Last-Translator: Fran Dieguez \n" "Language-Team: Galician \n" "Language: gl\n" @@ -25,222 +25,246 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "" -"Converse en Google Talk, Facebook, MSN e moitos máis servizos de conversa" - -#: ../data/empathy.desktop.in.in.h:2 msgid "Empathy" msgstr "Empathy" +#: ../data/empathy.desktop.in.in.h:2 +msgid "IM Client" +msgstr "Cliente de MI" + #: ../data/empathy.desktop.in.in.h:3 msgid "Empathy Internet Messaging" msgstr "Mensaxaría na Internet Empathy" #: ../data/empathy.desktop.in.in.h:4 -msgid "IM Client" -msgstr "Cliente de MI" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "" +"Converse en Google Talk, Facebook, MSN e moitos máis servizos de conversa" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:1 -msgid "Always open a separate chat window for new chats." -msgstr "Abrir sempre unha xanela de conversa á parte para as conversas novas." +msgid "Connection managers should be used" +msgstr "Se se deberían usar xestores de conexión" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Volume da chamada" +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." +msgstr "" +"Indica se deberían usarse xestores de conectividade para conectarse ou " +"desconectarse automaticamente ou non." +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Volume da chamada, como porcentaxe." +msgid "Empathy should auto-connect on startup" +msgstr "O Empathy debería conectarse automaticamente ao inicio" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -msgid "Camera device" -msgstr "Dispositivo da cámara" +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "" +"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente " +"ao inicio ou non." +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:5 -msgid "Camera position" -msgstr "Posición da cámara" +msgid "Empathy should auto-away when idle" +msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." +"Whether Empathy should go into away mode automatically if the user is idle." msgstr "" -"O carácter para engadir despois do alcume cando se use o completado de " -"alcume (tabulador) nunha conversa de grupo." +"Indica se o Empathy debería pórse no estado de ausente se o usuario está " +"inactivo." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:7 -msgid "Chat window theme" -msgstr "Tema da xanela de conversa" +msgid "Empathy default download folder" +msgstr "Cartafol de descargas predeterminado do Empathy" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:8 -msgid "Chat window theme variant" -msgstr "Variante do tema da xanela de charla" +msgid "The default folder to save file transfers in." +msgstr "" +"O cartafol predeterminado en que gardar as transferencias de ficheiros." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:9 -msgid "" -"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "" -"Unha lista separada por vírgulas dos verificadores ortográficos a usar (p." -"ex., «gl, pt, en»)." +msgid "Show offline contacts" +msgstr "Mostrar os contactos desconectados" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:10 -msgid "Compact contact list" -msgstr "Lista de contactos compacta" +msgid "Whether to show contacts that are offline in the contact list." +msgstr "" +"Indica se mostrar ou non os contactos que están desconectados na lista de " +"contactos." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:11 -msgid "Connection managers should be used" -msgstr "Se se deberían usar xestores de conexión" +msgid "Show avatars" +msgstr "Mostrar os avatares" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:12 -msgid "Contact list sort criterion" -msgstr "Criterio de ordenación da lista de contactos" +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "" +"Indica se mostrar ou non os avatares dos contactos da lista de contactos e " +"das xanelas de conversa." #: ../data/org.gnome.Empathy.gschema.xml.in.h:13 -msgid "D-Bus object path of the last account selected to join a room." -msgstr "" -"Ruta do obxecto D-Bus da última conta seleccionada para unirse a unha sala." +msgid "Show protocols" +msgstr "Mostrar os protocolos" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:14 -msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgid "Whether to show protocols for contacts in the contact list." msgstr "" -"Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /" -"dev/video0." +"Indica se mostrar ou non os protocolos para os contacto na lista de " +"contactos." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:15 -msgid "Default directory to select an avatar image from" -msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar" +msgid "Show Balance in contact list" +msgstr "Mostrar o balance na lista de contactos" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:16 -msgid "Disable popup notifications when away" -msgstr "Desactivar as notificacións emerxentes cando se está ausente" +msgid "Whether to show account balances in the contact list." +msgstr "Indica se mostrar ou non os balances na lista de contactos." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:17 -msgid "Disable sounds when away" -msgstr "Desactivar os sons cando se está ausente" +msgid "Compact contact list" +msgstr "Lista de contactos compacta" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:18 -msgid "Display incoming events in the status area" -msgstr "Mostrar os eventos de entrada na área de estado" +msgid "Whether to show the contact list in compact mode." +msgstr "Indica se mostrar ou non a lista de contactos no modo compacto." +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:19 -msgid "" -"Display incoming events in the status area. If false, present them to the " -"user immediately." -msgstr "" -"Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos " -"directamente ao usuario." +msgid "Hide main window" +msgstr "Agochar a xanela principal" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:20 -msgid "Echo cancellation support" -msgstr "Compatibilidade de cancelación de eco" +msgid "Hide the main window." +msgstr "Agochar a xanela principal." +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:21 -msgid "Empathy can publish the user's location" -msgstr "Empathy pode publicar a localización dos usuarios" +msgid "Default directory to select an avatar image from" +msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:22 -msgid "Empathy can use the GPS to guess the location" -msgstr "Empathy pode usar o GPS para seguir a localización" +msgid "The last directory that an avatar image was chosen from." +msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar." +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:23 -msgid "Empathy can use the cellular network to guess the location" -msgstr "Empathy pode usar a rede de móbiles para seguir a localización" +msgid "Open new chats in separate windows" +msgstr "Abrir as novas conversas en xanelas separadas" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:24 -msgid "Empathy can use the network to guess the location" -msgstr "Empathy pode usar a rede para adiviñar a localización" +msgid "Always open a separate chat window for new chats." +msgstr "Abrir sempre unha xanela de conversa á parte para as conversas novas." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:25 -msgid "Empathy default download folder" -msgstr "Cartafol de descargas predeterminado do Empathy" +msgid "Display incoming events in the status area" +msgstr "Mostrar os eventos de entrada na área de estado" -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:26 -msgid "Empathy should auto-away when idle" -msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo" +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." +msgstr "" +"Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos " +"directamente ao usuario." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:27 -msgid "Empathy should auto-connect on startup" -msgstr "O Empathy debería conectarse automaticamente ao inicio" +msgid "The position for the chat window side pane" +msgstr "A posición do panel lateral da xanela de conversa" -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:28 -msgid "Empathy should reduce the location's accuracy" -msgstr "O Empathy debería reducir a precisión da localización" +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "" +"A posición almacenada (en píxeles) do panel lateral da xanela de conversa." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:29 -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "" -"O Empathy debería usar o avatar do contacto como a icona da xanela de " -"conversa" +msgid "Show contact groups" +msgstr "Mostrar os grupos de contactos" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:30 -msgid "Enable WebKit Developer Tools" -msgstr "Activar as ferramentas de desenvolvedor WebKit" +msgid "Whether to show groups in the contact list." +msgstr "Indica se mostrar ou non os grupos na lista de contactos." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 -msgid "Enable popup notifications for new messages" -msgstr "Activar as notificacións emerxentes para as mensaxes novas" +msgid "Contact list sort criterion" +msgstr "Criterio de ordenación da lista de contactos" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 -msgid "Enable spell checker" -msgstr "Activar a verificación ortográfica" +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." +msgstr "" +"Que criterio usar ao ordenar a lista de contactos. O predeterminado é usar a " +"ordenación polo estado co valor \"state\" (estado). Un valor de \"name" +"\" (nome) ordenará a lista de contactos polo nome." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:33 -msgid "Hide main window" -msgstr "Agochar a xanela principal" +msgid "Use notification sounds" +msgstr "Usar sons de notificación" -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:34 -msgid "Hide the main window." -msgstr "Agochar a xanela principal." +msgid "Whether to play a sound to notify of events." +msgstr "Indica se reproducir ou non un son para notificar os eventos." +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:35 -msgid "Last account selected in Join Room dialog" -msgstr "Última conta seleccionada no diálogo Unirse á sala" +msgid "Disable sounds when away" +msgstr "Desactivar os sons cando se está ausente" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:36 -msgid "Nick completed character" -msgstr "Carácter de completado de alcume" +msgid "Whether to play sound notifications when away or busy." +msgstr "" +"Indica se reproducir ou non un son para notificar cando se está ocupado ou " +"ausente." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:37 -msgid "Open new chats in separate windows" -msgstr "Abrir as novas conversas en xanelas separadas" +msgid "Play a sound for incoming messages" +msgstr "Reproducir un son para as mensaxes entrantes" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:38 -msgid "Path of the Adium theme to use" -msgstr "Ruta do tema de Adium para usar" +msgid "Whether to play a sound to notify of incoming messages." +msgstr "" +"Indica se reproducir ou non un son para notificar as mensaxes entrantes." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:39 -msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "" -"Ruta do tema de Adium para usar se o tema usado para o chat é de Adium." +msgid "Play a sound for outgoing messages" +msgstr "Reproducir un son para as mensaxes saíntes" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:40 -msgid "Play a sound for incoming messages" -msgstr "Reproducir un son para as mensaxes entrantes" +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:41 @@ -249,8 +273,8 @@ msgstr "Reproducir un son para as conversas novas" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:42 -msgid "Play a sound for outgoing messages" -msgstr "Reproducir un son para as mensaxes saíntes" +msgid "Whether to play a sound to notify of new conversations." +msgstr "Indica se reproducir ou non un son para notificar as conversas novas." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:43 @@ -259,387 +283,411 @@ msgstr "Reproducir un son cando un contacto inicia unha sesión" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:44 -msgid "Play a sound when a contact logs out" -msgstr "Reproducir un son cando un contacto saia da sesión" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "" +"Indica se reproducir ou non un son para notificar que os contactos inician " +"unha sesión na rede." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:45 -msgid "Play a sound when we log in" -msgstr "Reproducir un son cando iniciamos a sesión" +msgid "Play a sound when a contact logs out" +msgstr "Reproducir un son cando un contacto saia da sesión" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:46 -msgid "Play a sound when we log out" -msgstr "Reproducir un son cando saímos da sesión" +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "" +"Indica se reproducir ou non un son para notificar que os contactos terminan " +"unha sesión na rede." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:47 -msgid "Pop up notifications if the chat isn't focused" -msgstr "Facer emerxer unha notificación cando a conversa non está enfocada" +msgid "Play a sound when we log in" +msgstr "Reproducir un son cando iniciamos a sesión" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:48 -msgid "Pop up notifications when a contact logs in" -msgstr "Facer emerxer unha notificación cando un contacto entra" +msgid "Whether to play a sound when logging into a network." +msgstr "" +"Indica se reproducir ou non un son cando se inicia unha sesión na rede." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:49 -msgid "Pop up notifications when a contact logs out" -msgstr "Facer emerxer unha notificación cando un contacto sae" - +msgid "Play a sound when we log out" +msgstr "Reproducir un son cando saímos da sesión" + +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:50 -msgid "Position the camera preview should be during a call." -msgstr "" -"Posición onde debe estar a vista previa da cámara durante unha chamada." +msgid "Whether to play a sound when logging out of a network." +msgstr "Indica se reproducir ou non un son cando se sae da sesión na rede." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:51 -msgid "Show Balance in contact list" -msgstr "Mostrar o balance na lista de contactos" +msgid "Enable popup notifications for new messages" +msgstr "Activar as notificacións emerxentes para as mensaxes novas" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:52 -msgid "Show avatars" -msgstr "Mostrar os avatares" +msgid "Whether to show a popup notification when receiving a new message." +msgstr "" +"Indica se mostrar ou non unha notificación emerxente cando se reciba unha " +"mensaxe nova." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:53 -msgid "Show contact list in rooms" -msgstr "Mostrar a lista de contactos nas salas" +msgid "Disable popup notifications when away" +msgstr "Desactivar as notificacións emerxentes cando se está ausente" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:54 -msgid "Show hint about closing the main window" -msgstr "Mostrar unha indicación sobre pechar a xanela principal" +msgid "Whether to show popup notifications when away or busy." +msgstr "" +"Indica se mostrar ou non as notificacións emerxentes cando se está ausente " +"ou ocupado." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -msgid "Show offline contacts" -msgstr "Mostrar os contactos desconectados" +msgid "Pop up notifications if the chat isn't focused" +msgstr "Facer emerxer unha notificación cando a conversa non está enfocada" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 -msgid "Show protocols" -msgstr "Mostrar os protocolos" +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" +"Indica se mostrar ou non unha notificación emerxente cando se reciba unha " +"mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:57 -msgid "Spell checking languages" -msgstr "Idiomas para a corrección ortográfica" +msgid "Pop up notifications when a contact logs in" +msgstr "Facer emerxer unha notificación cando un contacto entra" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:58 -msgid "The default folder to save file transfers in." +msgid "Whether to show a popup notification when a contact goes online." msgstr "" -"O cartafol predeterminado en que gardar as transferencias de ficheiros." +"Indica se mostrar ou non unha notificación emerxente cando un contacto está " +"conectado." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:59 -msgid "The last directory that an avatar image was chosen from." -msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar." +msgid "Pop up notifications when a contact logs out" +msgstr "Facer emerxer unha notificación cando un contacto sae" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:60 -msgid "The position for the chat window side pane" -msgstr "A posición do panel lateral da xanela de conversa" +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "" +"Indica se mostrar ou non unha notificación emerxente cando un contacto está " +"desconectado." +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:61 -msgid "The stored position (in pixels) of the chat window side pane." -msgstr "" -"A posición almacenada (en píxeles) do panel lateral da xanela de conversa." +msgid "Use graphical smileys" +msgstr "Usar emoticonas gráficas" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:62 -msgid "The theme that is used to display the conversation in chat windows." -msgstr "O tema usado para mostrar as conversa nas xanelas de conversa." +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "" +"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:63 -msgid "" -"The theme variant that is used to display the conversation in chat windows." -msgstr "" -"A variante do tema que se usará para mostrar a conversa nas xanelas de chat." +msgid "Show contact list in rooms" +msgstr "Mostrar a lista de contactos nas salas" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:64 -msgid "Use graphical smileys" -msgstr "Usar emoticonas gráficas" +msgid "Whether to show the contact list in chat rooms." +msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "Use notification sounds" -msgstr "Usar sons de notificación" +msgid "Chat window theme" +msgstr "Tema da xanela de conversa" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:66 -msgid "Use theme for chat rooms" -msgstr "Usar un tema para as salas de conversa" +msgid "The theme that is used to display the conversation in chat windows." +msgstr "O tema usado para mostrar as conversa nas xanelas de conversa." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:67 -msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "" -"Indica se o Empathy pode ou non publicar a localización do usuario aos seus " -"contactos." +msgid "Chat window theme variant" +msgstr "Variante do tema da xanela de charla" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:68 -msgid "Whether Empathy can use the GPS to guess the location." +msgid "" +"The theme variant that is used to display the conversation in chat windows." msgstr "" -"Indica se o Empathy pode usar ou non o GPS para adiviñar a localización." +"A variante do tema que se usará para mostrar a conversa nas xanelas de chat." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:69 -msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "" -"Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar " -"a localización." +msgid "Path of the Adium theme to use" +msgstr "Ruta do tema de Adium para usar" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "Whether Empathy can use the network to guess the location." +msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "" -"Indica se o Empathy pode ou non usar a rede para adiviñar a localización." +"Ruta do tema de Adium para usar se o tema usado para o chat é de Adium." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:71 -msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "" -"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente " -"ao inicio ou non." +msgid "Enable WebKit Developer Tools" +msgstr "Activar as ferramentas de desenvolvedor WebKit" -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" -"Whether Empathy should go into away mode automatically if the user is idle." +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" -"Indica se o Empathy debería pórse no estado de ausente se o usuario está " -"inactivo." +"Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, " +"deberían ser activadas." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:73 -msgid "" -"Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "" -"Indica se o Empathy debería ou non reducir a precisión de localización por " -"motivos de privacidade." +msgid "Inform other users when you are typing to them" +msgstr "Informar a outros usuarios cando vostede está escribindo" -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" -"Whether Empathy should use the avatar of the contact as the chat window icon." +"Whether to send the 'composing' or 'paused' chat states. Does not currently " +"affect the 'gone' state." msgstr "" -"Indica se o Empathy debería usar o avatar dos contactos como a icona da " -"xanela da conversa ou non." +"Indica se enviar ou non os estados de conversa «escribindo» ou «pausado». No " +"afecta realmente ao estado «ausente»." +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:75 -msgid "" -"Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "" -"Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, " -"deberían ser activadas." +msgid "Use theme for chat rooms" +msgstr "Usar un tema para as salas de conversa" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:76 -msgid "" -"Whether connectivity managers should be used to automatically disconnect/" -"reconnect." -msgstr "" -"Indica se deberían usarse xestores de conectividade para conectarse ou " -"desconectarse automaticamente ou non." +msgid "Whether to use the theme for chat rooms." +msgstr "Indica se usar ou non o tema para as salas de conversa." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:77 -msgid "" -"Whether to check words typed against the languages you want to check with." -msgstr "" -"Indica se se deberían verificar ou non as palabras escritas no idioma co que " -"as quere verificar." +msgid "Spell checking languages" +msgstr "Idiomas para a corrección ortográfica" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:78 -msgid "Whether to convert smileys into graphical images in conversations." +msgid "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" -"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas." +"Unha lista separada por vírgulas dos verificadores ortográficos a usar (p." +"ex., «gl, pt, en»)." +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:79 -msgid "Whether to enable Pulseaudio's echo cancellation filter." -msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio." +msgid "Enable spell checker" +msgstr "Activar a verificación ortográfica" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:80 -msgid "Whether to play a sound to notify of contacts logging into the network." +msgid "" +"Whether to check words typed against the languages you want to check with." msgstr "" -"Indica se reproducir ou non un son para notificar que os contactos inician " -"unha sesión na rede." +"Indica se se deberían verificar ou non as palabras escritas no idioma co que " +"as quere verificar." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:81 -msgid "" -"Whether to play a sound to notify of contacts logging out of the network." -msgstr "" -"Indica se reproducir ou non un son para notificar que os contactos terminan " -"unha sesión na rede." +msgid "Nick completed character" +msgstr "Carácter de completado de alcume" +# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:82 -msgid "Whether to play a sound to notify of events." -msgstr "Indica se reproducir ou non un son para notificar os eventos." +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "" +"O carácter para engadir despois do alcume cando se use o completado de " +"alcume (tabulador) nunha conversa de grupo." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:83 -msgid "Whether to play a sound to notify of incoming messages." +msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "" -"Indica se reproducir ou non un son para notificar as mensaxes entrantes." +"O Empathy debería usar o avatar do contacto como a icona da xanela de " +"conversa" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:84 -msgid "Whether to play a sound to notify of new conversations." -msgstr "Indica se reproducir ou non un son para notificar as conversas novas." +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." +msgstr "" +"Indica se o Empathy debería usar o avatar dos contactos como a icona da " +"xanela da conversa ou non." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:85 -msgid "Whether to play a sound to notify of outgoing messages." -msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes." +msgid "Last account selected in Join Room dialog" +msgstr "Última conta seleccionada no diálogo Unirse á sala" -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:86 -msgid "Whether to play a sound when logging into a network." +msgid "D-Bus object path of the last account selected to join a room." msgstr "" -"Indica se reproducir ou non un son cando se inicia unha sesión na rede." +"Ruta do obxecto D-Bus da última conta seleccionada para unirse a unha sala." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:87 -msgid "Whether to play a sound when logging out of a network." -msgstr "Indica se reproducir ou non un son cando se sae da sesión na rede." +msgid "Camera device" +msgstr "Dispositivo da cámara" -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:88 -msgid "Whether to play sound notifications when away or busy." +msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "" -"Indica se reproducir ou non un son para notificar cando se está ocupado ou " -"ausente." +"Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /" +"dev/video0." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:89 -msgid "Whether to show a popup notification when a contact goes offline." -msgstr "" -"Indica se mostrar ou non unha notificación emerxente cando un contacto está " -"desconectado." +msgid "Camera position" +msgstr "Posición da cámara" -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:90 -msgid "Whether to show a popup notification when a contact goes online." +msgid "Position the camera preview should be during a call." msgstr "" -"Indica se mostrar ou non unha notificación emerxente cando un contacto está " -"conectado." +"Posición onde debe estar a vista previa da cámara durante unha chamada." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:91 -msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." -msgstr "" -"Indica se mostrar ou non unha notificación emerxente cando se reciba unha " -"mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada." +msgid "Echo cancellation support" +msgstr "Compatibilidade de cancelación de eco" -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:92 -msgid "Whether to show a popup notification when receiving a new message." -msgstr "" -"Indica se mostrar ou non unha notificación emerxente cando se reciba unha " -"mensaxe nova." +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio." # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:93 -msgid "Whether to show account balances in the contact list." -msgstr "Indica se mostrar ou non os balances na lista de contactos." +msgid "Show hint about closing the main window" +msgstr "Mostrar unha indicación sobre pechar a xanela principal" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "" -"Whether to show avatars for contacts in the contact list and chat windows." +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." msgstr "" -"Indica se mostrar ou non os avatares dos contactos da lista de contactos e " -"das xanelas de conversa." +"Indica se mostrar ou non o diálogo de mensaxe sobre pechar a xanela " +"principal co botón 'x' da barra de título." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:95 -msgid "Whether to show contacts that are offline in the contact list." -msgstr "" -"Indica se mostrar ou non os contactos que están desconectados na lista de " -"contactos." +msgid "Empathy can publish the user's location" +msgstr "Empathy pode publicar a localización dos usuarios" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:96 -msgid "Whether to show popup notifications when away or busy." +msgid "Whether Empathy can publish the user's location to their contacts." msgstr "" -"Indica se mostrar ou non as notificacións emerxentes cando se está ausente " -"ou ocupado." +"Indica se o Empathy pode ou non publicar a localización do usuario aos seus " +"contactos." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:97 -msgid "Whether to show protocols for contacts in the contact list." -msgstr "" -"Indica se mostrar ou non os protocolos para os contacto na lista de " -"contactos." +msgid "Empathy can use the network to guess the location" +msgstr "Empathy pode usar a rede para adiviñar a localización" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:98 -msgid "Whether to show the contact list in chat rooms." -msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa." +msgid "Whether Empathy can use the network to guess the location." +msgstr "" +"Indica se o Empathy pode ou non usar a rede para adiviñar a localización." -# rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:99 -msgid "Whether to show the contact list in compact mode." -msgstr "Indica se mostrar ou non a lista de contactos no modo compacto." +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy pode usar a rede de móbiles para seguir a localización" # rever #: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "" +"Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar " +"a localización." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy pode usar o GPS para seguir a localización" + +# rever +#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "" +"Indica se o Empathy pode usar ou non o GPS para adiviñar a localización." + +# rever +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 +msgid "Empathy should reduce the location's accuracy" +msgstr "O Empathy debería reducir a precisión da localización" + +# rever +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." +"Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" -"Indica se mostrar ou non o diálogo de mensaxe sobre pechar a xanela " -"principal co botón 'x' da barra de título." +"Indica se o Empathy debería ou non reducir a precisión de localización por " +"motivos de privacidade." + +#. Tweak the dialog +#: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2327 +msgid "Messaging and VoIP Accounts" +msgstr "Contas de mensaxaría e VoIP" + +#: ../data/empathy-accounts.desktop.in.in.h:2 +msgid "Manage Messaging and VoIP accounts" +msgstr "Xestionar as contas de mensaxaría e VoIP" + +# rever +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Non se especificou un motivo" + +# rever +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Foi solicitado o cambio de estado" + +# rever +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Vostede cancelou a transferencia de ficheiros" + +# rever +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "O outro participante cancelou a transferencia de ficheiros" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 -msgid "Whether to use the theme for chat rooms." -msgstr "Indica se usar ou non o tema para as salas de conversa." +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Produciuse un erro ao tentar transferir o ficheiro" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 -msgid "" -"Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." -msgstr "" -"Que criterio usará ao ordenar a lista de contactos. O predeterminado é usar " -"a ordenación polo nome do contacto co valor \"name\". Un valor de \"estado\" " -"ordenará a lista de contactos por estado." - -#: ../data/empathy-accounts.desktop.in.in.h:1 -msgid "Manage Messaging and VoIP accounts" -msgstr "Xestionar as contas de mensaxaría e VoIP" +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "O outro participante non pode transferir o ficheiro" -#. Tweak the dialog -#: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2307 -msgid "Messaging and VoIP Accounts" -msgstr "Contas de mensaxaría e VoIP" +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "Motivo descoñecido" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "" "Completouse a transferencia de ficheiro pero o ficheiro está corrompido" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "A transferencia de ficheiro non é permitida polo contacto remoto" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "O ficheiro seleccionado non é un ficheiro regular" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "O ficheiro seleccionado está baleiro" @@ -659,194 +707,156 @@ msgstr "Chamou %s" msgid "Call from %s" msgstr "Chamada de %s" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "O tipo de socket non é compatíbel" - -# rever -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "Non se especificou un motivo" - -# rever -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "Foi solicitado o cambio de estado" - -# rever -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "Vostede cancelou a transferencia de ficheiros" - -# rever -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "O outro participante cancelou a transferencia de ficheiros" - -# rever -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "Produciuse un erro ao tentar transferir o ficheiro" - -# rever -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "O outro participante non pode transferir o ficheiro" - -#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Motivo descoñecido" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "Dispoñíbel" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "Ocupado" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "Ausente" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "Invisíbel" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "Desconectado" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "Descoñecido" # rever -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "Non se especificou un motivo" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "O estado está definido a desconectado" # rever -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Erro de rede" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "Fallou a autenticación" # rever -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "Erro de cifrado" # rever -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "Nome en uso" # rever -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "Non se proporcionou o certificado" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "Certificado non fiábel" # rever -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "O certificado caducou" # rever -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "O certificado non está activado" # rever -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "O nome do host do certificado non coincide" # rever -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "A impresión dixital do certificado non coincide" # rever -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "Certificado autoasinado" # rever -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "Erro de certificado" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "O cifrado non está dispoñíbel" # rever -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "O certificado non é válido" # rever -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "Rexeitouse a conexión" # rever -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "Non é posíbel estabelecer a conexión" # rever -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "Perdeuse a conexión" -#: ../libempathy/empathy-utils.c:354 -msgid "This resource is already connected to the server" -msgstr "Este recurso xa está conectado ao servidor" +#: ../libempathy/empathy-utils.c:355 +msgid "This account is already connected to the server" +msgstr "Esta conta xa está conectada ao servidor" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "" "A conexión foi substituída por unha nova conexión empregando o mesmo recurso" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "Esta conta xa existe no servidor" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "Nestes intres o servidor está moi ocupado para xesionar a conexión" # rever -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "O certificado foi revocado" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "O certificado usa un algoritmo de cifrado inseguro ou cripotograficamente " "débil" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:369 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -855,295 +865,269 @@ msgstr "" "certificado do servidor excede os límites impostos pola biblioteca de " "criptografía." -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:373 msgid "Your software is too old" msgstr "O seu software é demasiado antigo" +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "Erro interno" + # rever -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "Persoas próximas" # rever -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Chat de Facebook" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "Hai %d segundo" msgstr[1] "Hai %d segundos" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "Hai %d minuto" msgstr[1] "Hai %d minutos" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "Hai %d hora" msgstr[1] "Hai %d horas" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Hai %d día" msgstr[1] "Hai %d días" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "Hai %d semana" msgstr[1] "Hai %d semanas" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "Hai %d mes" msgstr[1] "Hai %d meses" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "no futuro" -#: ../libempathy-gtk/empathy-account-chooser.c:688 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "Tódalas contas" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Conta" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Contrasinal" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Servidor" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Porto" -#: ../libempathy-gtk/empathy-account-widget.c:776 -#: ../libempathy-gtk/empathy-account-widget.c:828 +#: ../libempathy-gtk/empathy-account-widget.c:765 +#: ../libempathy-gtk/empathy-account-widget.c:817 #, c-format msgid "%s:" msgstr "%s:" -# rever -#: ../libempathy-gtk/empathy-account-widget.c:1182 -msgid "My Web Accounts" -msgstr "As miñas contas web" - -#: ../libempathy-gtk/empathy-account-widget.c:1199 -#, c-format -msgid "The account %s is edited via %s." -msgstr "A conta %s edítase mediante %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1205 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Non é posíbel editar a conta %s en Empathy." - -# rever -#: ../libempathy-gtk/empathy-account-widget.c:1224 -msgid "Launch My Web Accounts" -msgstr "Iniciar My Web Accounts" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1232 -#, c-format -msgid "Edit %s" -msgstr "Editar %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1582 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget.c:1398 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Username:" msgstr "Nome de _usuario:" -#: ../libempathy-gtk/empathy-account-widget.c:1900 +#: ../libempathy-gtk/empathy-account-widget.c:1710 msgid "A_pply" msgstr "A_plicar" -#: ../libempathy-gtk/empathy-account-widget.c:1930 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "L_og in" msgstr "Iniciar sesi_ón" -#: ../libempathy-gtk/empathy-account-widget.c:2004 +#: ../libempathy-gtk/empathy-account-widget.c:1812 msgid "This account already exists on the server" msgstr "Esta conta xa existe no servidor" -#: ../libempathy-gtk/empathy-account-widget.c:2007 +#: ../libempathy-gtk/empathy-account-widget.c:1816 msgid "Create a new account on the server" msgstr "Crear unha nova conta no servidor" -#: ../libempathy-gtk/empathy-account-widget.c:2199 -msgid "Ca_ncel" -msgstr "Ca_ncelar" - # rever #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2477 +#: ../libempathy-gtk/empathy-account-widget.c:2241 #, c-format msgid "%1$s on %2$s" msgstr "%1$s sobre %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2503 +#: ../libempathy-gtk/empathy-account-widget.c:2267 #, c-format msgid "%s Account" msgstr "Conta %s" # rever -#: ../libempathy-gtk/empathy-account-widget.c:2507 +#: ../libempathy-gtk/empathy-account-widget.c:2271 msgid "New account" msgstr "Conta nova" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 -msgid "Example: MyScreenName" -msgstr "Exemplo: MeuNomeEnPantalla" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Pass_word:" +msgstr "Con_trasinal:" +# rever #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 -msgid "Advanced" -msgstr "Avanzado" +msgid "Screen _Name:" +msgstr "_Nome en pantalla:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +msgid "Example: MyScreenName" +msgstr "Exemplo: MeuNomeEnPantalla" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 -msgid "Pass_word:" -msgstr "Con_trasinal:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "Lembrar o contrasinal" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -msgid "Remember Password" -msgstr "Lembrar o contrasinal" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Port:" +msgstr "_Porto:" -#. remember password ticky box -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 -msgid "Remember password" -msgstr "Lembrar o contrasinal" - -# rever -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 -msgid "Screen _Name:" -msgstr "_Nome en pantalla:" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "_Server:" +msgstr "_Servidor:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 -msgid "What is your AIM password?" -msgstr "Cal e o seu contrasinal para AIM?" +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Advanced" +msgstr "Avanzado" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 msgid "What is your AIM screen name?" msgstr "Cal é o seu nome en patalla para AIM?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 -msgid "_Port:" -msgstr "_Porto:" +msgid "What is your AIM password?" +msgstr "Cal e o seu contrasinal para AIM?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../src/empathy-new-chatroom-dialog.ui.h:9 -msgid "_Server:" -msgstr "_Servidor:" - -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "Example: username" -msgstr "Exemplo: nomeusuario" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "Remember Password" +msgstr "Lembrar o contrasinal" # rever -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "I_D de sesión:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Example: username" +msgstr "Exemplo: nomeusuario" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 msgid "What is your GroupWise User ID?" msgstr "Cal é o seu ID de usuario en GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 msgid "What is your GroupWise password?" msgstr "Cal é o seu contrasinal en GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +# rever +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "_UIN ICQ:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "Example: 123456789" msgstr "Exemplo: 123456789" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "Ch_aracter set:" msgstr "Codificación de c_aracteres:" -# rever -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 -msgid "ICQ _UIN:" -msgstr "_UIN ICQ:" - -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 msgid "What is your ICQ UIN?" msgstr "Cal é o seu UIN para ICQ?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 msgid "What is your ICQ password?" msgstr "Cal é o seu contrasinal pra ICQ?" @@ -1180,11 +1164,23 @@ msgstr "Opcións" msgid "None" msgstr "Ningún" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Network" +msgstr "Rede" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +msgid "Network:" +msgstr "Rede:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Character set:" msgstr "Codificación de caracteres:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +msgid "Servers" +msgstr "Servidores" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." @@ -1192,14 +1188,6 @@ msgstr "" "A maioría dos servidores IRC non precisan contrasinal, polo que se non está " "seguro non escriba un contrasinal." -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 -msgid "Network" -msgstr "Rede" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 -msgid "Network:" -msgstr "Rede:" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "Alcume:" @@ -1209,59 +1197,28 @@ msgid "Password:" msgstr "Contrasinal:" # rever -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 -msgid "Quit message:" -msgstr "Mensaxe de saída:" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 -msgid "Real name:" -msgstr "Nome real:" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 -msgid "Servers" -msgstr "Servidores" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 -msgid "What is your IRC nickname?" -msgstr "Cal é o seu alcume de IRC?" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 -msgid "Which IRC network?" -msgstr "Que rede IRC?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "Example: user@gmail.com" -msgstr "Examplo: usuario@gmail.com" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "Example: user@jabber.org" -msgstr "Exemplo: user@jabber.org" - -# rever -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 -msgid "Encr_yption required (TLS/SSL)" -msgstr "Requírese o c_ifrado (TLS/SSL)" - -# rever -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 -msgid "I_gnore SSL certificate errors" -msgstr "I_gnorar os erros do certificado SSL" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +msgid "Quit message:" +msgstr "Mensaxe de saída:" -# rever -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 -msgid "Override server settings" -msgstr "Ignorar as configuracións do servidor" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +msgid "Real name:" +msgstr "Nome real:" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 -msgid "Priori_ty:" -msgstr "Pri_oridade:" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 +msgid "Which IRC network?" +msgstr "Que rede IRC?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 -msgid "Reso_urce:" -msgstr "Rec_urso:" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "What is your IRC nickname?" +msgstr "Cal é o seu alcume de IRC?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "What is your Facebook username?" +msgstr "Cal é o seu nome de usuario para Facebook?" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/badger, enter badger.\n" @@ -1273,185 +1230,212 @@ msgstr "" "Use esta páxina para " "seleccioar o nome de usuario de Facebook se non ten ningún." -# rever -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 -msgid "Use old SS_L" -msgstr "Usar o SS_L antigo" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "What is your Facebook password?" msgstr "Cal é o seu contrasinal para Facebook?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 -msgid "What is your Facebook username?" -msgstr "Cal é o seu nome de usuario para Facebook?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "What is your Google ID?" msgstr "Cal é o seu ID de Google?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Example: user@gmail.com" +msgstr "Examplo: usuario@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "What is your Google password?" msgstr "Cal é o seu contrasinal de Google?" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +msgid "Example: user@jabber.org" +msgstr "Exemplo: user@jabber.org" + +# rever +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "I_gnore SSL certificate errors" +msgstr "I_gnorar os erros do certificado SSL" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +msgid "Priori_ty:" +msgstr "Pri_oridade:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +msgid "Reso_urce:" +msgstr "Rec_urso:" + +# rever +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "Encr_yption required (TLS/SSL)" +msgstr "Requírese o c_ifrado (TLS/SSL)" + +# rever +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "Use old SS_L" +msgstr "Usar o SS_L antigo" + +# rever #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "Override server settings" +msgstr "Ignorar as configuracións do servidor" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 msgid "What is your Jabber ID?" msgstr "Cal é o seu identificador de Jabber?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 -msgid "What is your Jabber password?" -msgstr "Cal é o seu contrasinal de Jabber?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 msgid "What is your desired Jabber ID?" msgstr "Cal é o ID de Jabber que desexa?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +msgid "What is your Jabber password?" +msgstr "Cal é o seu contrasinal de Jabber?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 msgid "What is your desired Jabber password?" msgstr "Cal é o contrasinal de Jabber que desexa?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 msgid "Example: user@hotmail.com" msgstr "Exemplo: usuario@hotmail.com" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 msgid "What is your Windows Live ID?" msgstr "Cal é o seu contrasinal para Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 msgid "What is your Windows Live password?" msgstr "Cal é o seu contrasinal para Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "E-_mail address:" -msgstr "Enderezo de correo _electrónico:" - -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 msgid "Nic_kname:" msgstr "_Alcume:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "_Last Name:" +msgstr "_Apelidos:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 msgid "_First Name:" msgstr "_Nome:" +# rever +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +msgid "_Published Name:" +msgstr "Nome _publicado:" + #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Jabber ID:" msgstr "ID para _Jabber:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 -msgid "_Last Name:" -msgstr "_Apelidos:" +msgid "E-_mail address:" +msgstr "Enderezo de correo _electrónico:" -# rever -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -msgid "_Published Name:" -msgstr "Nome _publicado:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "_Username:" +msgstr "Nome de _usuario:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Example: user@my.sip.server" msgstr "Exemplo: usuaruio@meu.servidor.sip" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "Authentication username:" -msgstr "Nome de usuario para a autenticación:" - -# rever -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover Binding" -msgstr "Descubrir ligazón" - #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "Discover the STUN server automatically" -msgstr "Descubrir o servidor STUN automaticamente" +msgid "Use this account to call _landlines and mobile phones" +msgstr "Usar esta conta para chamar a teléfonos _fixos e móbiles" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 -msgid "Ignore TLS Errors" -msgstr "Ignorar os erros TLS" +msgid "NAT Traversal Options" +msgstr "Opcións do NAT transversal" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "Interval (seconds)" -msgstr "Intervalo (segundos)" +msgid "Proxy Options" +msgstr "Opcións do proxy" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -msgid "Keep-Alive Options" -msgstr "Opcións de Keep-Alive" +msgid "Miscellaneous Options" +msgstr "Opcións varias" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 -msgid "Loose Routing" -msgstr "Enrutado aberto" +msgid "STUN Server:" +msgstr "Servidor STUN:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 -msgid "Mechanism:" -msgstr "Mecanismo:" +msgid "Discover the STUN server automatically" +msgstr "Descubrir o servidor STUN automaticamente" +# rever #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 -msgid "Miscellaneous Options" -msgstr "Opcións varias" +msgid "Discover Binding" +msgstr "Descubrir ligazón" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -msgid "NAT Traversal Options" -msgstr "Opcións do NAT transversal" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "Servidor:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Keep-Alive Options" +msgstr "Opcións de Keep-Alive" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 -msgid "Port:" -msgstr "Porto:" +msgid "Mechanism:" +msgstr "Mecanismo:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 -msgid "Proxy Options" -msgstr "Opcións do proxy" +msgid "Interval (seconds)" +msgstr "Intervalo (segundos)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Authentication username:" +msgstr "Nome de usuario para a autenticación:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Transport:" +msgstr "Transporte:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -msgid "STUN Server:" -msgstr "Servidor STUN:" +msgid "Loose Routing" +msgstr "Enrutado aberto" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 -msgid "Server:" -msgstr "Servidor:" +msgid "Ignore TLS Errors" +msgstr "Ignorar os erros TLS" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -msgid "Transport:" -msgstr "Transporte:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -msgid "Use this account to call _landlines and mobile phones" -msgstr "Usar esta conta para chamar a teléfonos _fixos e móbiles" +msgid "Port:" +msgstr "Porto:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 -msgid "What is your SIP account password?" -msgstr "Cal é o contrasinal da súa conta SIP?" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Cal é o seu ID de inicio de sesión SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 -msgid "_Username:" -msgstr "Nome de _usuario:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP account password?" +msgstr "Cal é o contrasinal da súa conta SIP?" # rever -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Yahoo! I_D:" +msgstr "I_D de Yahoo:" + +# rever +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "I_gnore conference and chat room invitations" msgstr "I_gnorar os convites para conferencias e salas de conversa" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +# rever +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Room List locale:" +msgstr "Configuración da lista de _salas:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "What is your Yahoo! ID?" msgstr "Cal é o seu ID para Yahoo?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "What is your Yahoo! password?" msgstr "Cal é o seu contrasinal para Yahoo?" -# rever -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "Yahoo! I_D:" -msgstr "I_D de Yahoo:" - -# rever -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 -msgid "_Room List locale:" -msgstr "Configuración da lista de _salas:" - # rever #: ../libempathy-gtk/empathy-avatar-chooser.c:471 #: ../libempathy-gtk/empathy-avatar-chooser.c:556 @@ -1520,40 +1504,40 @@ msgstr "Este protocolo non admite as chamadas de emerxencia" msgid "You don't have enough credit in order to place this call" msgstr "Non ten crédito dabondo para facer esta chamada" -#: ../libempathy-gtk/empathy-chat.c:706 +#: ../libempathy-gtk/empathy-chat.c:728 msgid "Failed to open private chat" msgstr "Produciuse un fallo ao abrir un chat privado" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:786 msgid "Topic not supported on this conversation" msgstr "Ese asunto non se admite nesta conversación" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:792 msgid "You are not allowed to change the topic" msgstr "Non se lle permite cambiar o asunto" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:991 #, c-format msgid "“%s” is not a valid contact ID" msgstr "«%s» non é un ID de contacto válido" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1086 msgid "/clear: clear all messages from the current conversation" msgstr "/clear, limpa todas as mensaxes da conversa actual" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1089 msgid "/topic : set the topic of the current conversation" msgstr "/topic , estabelece o asunto da conversa actual" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/join : join a new chat room" msgstr "/join , unirse a unha nova sala de conversa" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "/j : join a new chat room" msgstr "/j , unirse a unha nova sala de conversa" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "" "/part [] []: leave the chat room, by default the " "current one" @@ -1561,23 +1545,23 @@ msgstr "" "/part [] []: abandonar a sala de char, por omisión a " "actual" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "/query []: open a private chat" msgstr "/query [], abre unha conversa privada" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "/msg : open a private chat" msgstr "/msg , abre unha conversa privada" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "/nick : change your nickname on the current server" msgstr "/nick , cambia o seu nome de usuario no servidor actual" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "/me : send an ACTION message to the current conversation" msgstr "/me , envía unha mensaxe ACTION á conversa actual" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1587,11 +1571,11 @@ msgstr "" "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para " "unirse a unha nova sala de conversa\"" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1120 msgid "/whois : display information about a contact" msgstr "/whois : mostra información sobre un contacto" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1123 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1599,127 +1583,134 @@ msgstr "" "/help [], mostra todas as ordes admitidas. Se está " "definida, mostra o seu uso." -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1142 #, c-format msgid "Usage: %s" msgstr "Uso: %s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1187 msgid "Unknown command" msgstr "Orde descoñecida" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1313 msgid "Unknown command; see /help for the available commands" msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1564 msgid "insufficient balance to send message" msgstr "non ten balance suficiente para enviar a mensaxe" # rever -#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582 +#: ../libempathy-gtk/empathy-chat.c:1645 #, c-format msgid "Error sending message '%s': %s" msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s" # rever -#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587 +#: ../libempathy-gtk/empathy-chat.c:1649 #, c-format msgid "Error sending message: %s" msgstr "Produciuse un erro ao enviar a mensaxe: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1469 +#: ../libempathy-gtk/empathy-chat.c:1576 #, c-format msgid "insufficient balance to send message. Top up." msgstr "" "non ten balance dabondo para enviar a mensaxe Recargar." -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "not capable" msgstr "non é posíbel" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "offline" msgstr "desconectado" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1626 msgid "invalid contact" msgstr "contacto incorrecto" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1629 msgid "permission denied" msgstr "permiso denegado" # rever -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1632 msgid "too long message" msgstr "a mensaxe é demasiado longa" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1635 msgid "not implemented" msgstr "non implementado" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1639 msgid "unknown" msgstr "descoñecido" -#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "Asunto:" # rever -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1721 +#, c-format +msgid "Topic set to: %s" +msgstr "Cambiouse o asunto a: %s" + +# rever +#: ../libempathy-gtk/empathy-chat.c:1723 #, c-format -msgid "Topic set to: %s" -msgstr "Cambiouse o asunto a: %s" +msgid "Topic set by %s to: %s" +msgstr "Tema estabelecido por %s a: %s" # rever -#: ../libempathy-gtk/empathy-chat.c:1613 +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1728 msgid "No topic defined" msgstr "Non se definiu un asunto" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2244 msgid "(No Suggestions)" msgstr "(Sen suxestións)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2312 #, c-format msgid "Add '%s' to Dictionary" msgstr "Engadir «%s» ao dicionario" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2349 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Engadir «%s» ao dicionario de %s" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2419 msgid "Insert Smiley" msgstr "Inserir unha emoticona" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 -#: ../libempathy-gtk/empathy-ui-utils.c:1843 +#: ../libempathy-gtk/empathy-chat.c:2437 +#: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "_Enviar" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2373 +#: ../libempathy-gtk/empathy-chat.c:2494 msgid "_Spelling Suggestions" msgstr "Suxestións de _ortografía" -#: ../libempathy-gtk/empathy-chat.c:2462 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Produciuse un fallo ao obter os rexistros recentes" # rever -#: ../libempathy-gtk/empathy-chat.c:2599 +#: ../libempathy-gtk/empathy-chat.c:2722 #, c-format msgid "%s has disconnected" msgstr "%s desconectou" @@ -1727,12 +1718,12 @@ msgstr "%s desconectou" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2606 +#: ../libempathy-gtk/empathy-chat.c:2729 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s foi expulsado por %2$s" -#: ../libempathy-gtk/empathy-chat.c:2609 +#: ../libempathy-gtk/empathy-chat.c:2732 #, c-format msgid "%s was kicked" msgstr "%s foi expulsado" @@ -1740,17 +1731,17 @@ msgstr "%s foi expulsado" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2617 +#: ../libempathy-gtk/empathy-chat.c:2740 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s foi vetado por %2$s" -#: ../libempathy-gtk/empathy-chat.c:2620 +#: ../libempathy-gtk/empathy-chat.c:2743 #, c-format msgid "%s was banned" msgstr "%s foi excluído" -#: ../libempathy-gtk/empathy-chat.c:2624 +#: ../libempathy-gtk/empathy-chat.c:2747 #, c-format msgid "%s has left the room" msgstr "%s deixou a sala" @@ -1760,18 +1751,18 @@ msgstr "%s deixou a sala" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2633 +#: ../libempathy-gtk/empathy-chat.c:2756 #, c-format msgid " (%s)" msgstr " (%s)" # rever -#: ../libempathy-gtk/empathy-chat.c:2658 +#: ../libempathy-gtk/empathy-chat.c:2781 #, c-format msgid "%s has joined the room" msgstr "%s uniuse á sala" -#: ../libempathy-gtk/empathy-chat.c:2683 +#: ../libempathy-gtk/empathy-chat.c:2806 #, c-format msgid "%s is now known as %s" msgstr "%s agora é coñecido como %s" @@ -1779,90 +1770,91 @@ msgstr "%s agora é coñecido como %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2836 -#: ../src/empathy-streamed-media-window.c:1896 -#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1536 -#: ../src/empathy-call-window.c:1586 ../src/empathy-call-window.c:2632 +#: ../libempathy-gtk/empathy-chat.c:2993 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545 +#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638 msgid "Disconnected" msgstr "Desconectado" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3482 +#: ../libempathy-gtk/empathy-chat.c:3657 msgid "Would you like to store this password?" msgstr "Desexa gardar este contrasinal?" -#: ../libempathy-gtk/empathy-chat.c:3488 +#: ../libempathy-gtk/empathy-chat.c:3663 msgid "Remember" msgstr "Lembrar" -#: ../libempathy-gtk/empathy-chat.c:3498 +#: ../libempathy-gtk/empathy-chat.c:3673 msgid "Not now" msgstr "Agora non" -#: ../libempathy-gtk/empathy-chat.c:3542 +#: ../libempathy-gtk/empathy-chat.c:3717 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Reintentar" -#: ../libempathy-gtk/empathy-chat.c:3546 +#: ../libempathy-gtk/empathy-chat.c:3721 msgid "Wrong password; please try again:" msgstr "O contrasinal é incorrecto, ténteo de novo:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3676 +#: ../libempathy-gtk/empathy-chat.c:3851 msgid "This room is protected by a password:" msgstr "Esta sala está protexida por un contrasinal:" -#: ../libempathy-gtk/empathy-chat.c:3703 +#: ../libempathy-gtk/empathy-chat.c:3878 msgid "Join" msgstr "Unirse" -#: ../libempathy-gtk/empathy-chat.c:3891 ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Conectado" -#: ../libempathy-gtk/empathy-chat.c:3946 +#: ../libempathy-gtk/empathy-chat.c:4125 msgid "Conversation" msgstr "Conversa" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3951 +#: ../libempathy-gtk/empathy-chat.c:4130 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Identificador descoñecido ou non válido" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:438 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Bloqueo de contactos non dispoñíbel temporalmente" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Bloqueo de contactos non dispoñíbel" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:442 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Permiso denegado" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:446 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Non foi posíbel bloquear o contacto" # rever -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:789 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Editar os contactos bloqueados" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1441 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "Account:" msgstr "Conta:" @@ -1873,63 +1865,54 @@ msgstr "Contactos bloqueados" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:2 #: ../src/empathy-chatrooms-window.ui.h:3 msgid "Remove" msgstr "Eliminar" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "_Copiar o enderezo da ligazón" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 +#: ../libempathy-gtk/empathy-chat-text-view.c:329 #: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "_Abrir a ligazón" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:417 msgid "%A %B %d %Y" msgstr "%A, %d de %B de %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Editar a información de contacto" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 -msgid "Personal Information" -msgstr "Información persoal" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "Contacto novo" -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "Desexa bloquear a %s?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "" "Ten certeza de bloquear a «%s» para que non volva a contactar con vostede?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 msgid "_Block" msgstr "_Bloquear" -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Informar de este contacto como abusivo" @@ -1937,431 +1920,327 @@ msgstr[1] "_Informar destes contactos como abusivos" # rever #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "Decidir máis _adiante" - -# rever -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "Solicitude de subscrición" -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "_Block User" msgstr "_Bloquear usuario" # rever -#: ../libempathy-gtk/empathy-contact-list-view.c:1935 -#: ../libempathy-gtk/empathy-individual-view.c:2375 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Está seguro de que quere eliminar o grupo '%s'?" - -# rever -#: ../libempathy-gtk/empathy-contact-list-view.c:1937 -#: ../libempathy-gtk/empathy-individual-view.c:2378 -msgid "Removing group" -msgstr "Eliminando o grupo" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-contact-list-view.c:2063 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 -msgid "_Remove" -msgstr "_Eliminar" - -# rever -#: ../libempathy-gtk/empathy-contact-list-view.c:2016 -#: ../libempathy-gtk/empathy-individual-view.c:2500 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Está seguro de quere eliminar o contacto '%s'?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2018 -#: ../libempathy-gtk/empathy-individual-view.c:2521 -msgid "Removing contact" -msgstr "Eliminando o contacto" - -# rever -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "Eng_adir un contacto…" - -# rever -#: ../libempathy-gtk/empathy-contact-menu.c:292 -msgid "_Block Contact" -msgstr "_Bloquear contacto" - -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:321 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../libempathy-gtk/empathy-new-message-dialog.c:320 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "_Conversa" - -#: ../libempathy-gtk/empathy-contact-menu.c:353 -#: ../libempathy-gtk/empathy-individual-menu.c:850 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Audiochamada" - -#: ../libempathy-gtk/empathy-contact-menu.c:386 -#: ../libempathy-gtk/empathy-individual-menu.c:895 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Videochamada" - -# rever -#: ../libempathy-gtk/empathy-contact-menu.c:432 -#: ../libempathy-gtk/empathy-individual-menu.c:948 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "Conversas _previas" - -#: ../libempathy-gtk/empathy-contact-menu.c:454 -#: ../libempathy-gtk/empathy-individual-menu.c:989 -msgid "Send File" -msgstr "Enviar ficheiro" - -#: ../libempathy-gtk/empathy-contact-menu.c:477 -#: ../libempathy-gtk/empathy-individual-menu.c:1031 -msgid "Share My Desktop" -msgstr "Compartir o meu escritorio" - -#: ../libempathy-gtk/empathy-contact-menu.c:506 -#: ../libempathy-gtk/empathy-individual-menu.c:1094 -msgid "Infor_mation" -msgstr "Infor_mación" - -#: ../libempathy-gtk/empathy-contact-menu.c:552 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "_Editar" - -# rever -#: ../libempathy-gtk/empathy-contact-menu.c:606 -#: ../libempathy-gtk/empathy-individual-menu.c:1285 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Invítao a vostede a esta sala" - -# rever -#: ../libempathy-gtk/empathy-contact-menu.c:637 -#: ../libempathy-gtk/empathy-individual-menu.c:1331 -msgid "_Invite to Chat Room" -msgstr "Conv_idar a sala de conversa" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "Decide _Later" +msgstr "Decidir máis _adiante" # rever #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Buscar contactos" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Buscar:" # rever -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "_Engadir contacto" # rever -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Non se atoparon contactos" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "A súa mensaxe de presentación:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "Permítame ver cando está en liña. Grazas." -#: ../libempathy-gtk/empathy-contact-widget.c:504 +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Canles:" -#: ../libempathy-gtk/empathy-contact-widget.c:799 -#: ../libempathy-gtk/empathy-individual-widget.c:421 +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "Código ISO de país:" -#: ../libempathy-gtk/empathy-contact-widget.c:801 -#: ../libempathy-gtk/empathy-individual-widget.c:423 +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "País:" -#: ../libempathy-gtk/empathy-contact-widget.c:803 -#: ../libempathy-gtk/empathy-individual-widget.c:425 +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Rexión:" -#: ../libempathy-gtk/empathy-contact-widget.c:805 -#: ../libempathy-gtk/empathy-individual-widget.c:427 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Cidade:" -#: ../libempathy-gtk/empathy-contact-widget.c:807 -#: ../libempathy-gtk/empathy-individual-widget.c:429 +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Área:" -#: ../libempathy-gtk/empathy-contact-widget.c:809 -#: ../libempathy-gtk/empathy-individual-widget.c:431 +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Código postal:" -#: ../libempathy-gtk/empathy-contact-widget.c:811 -#: ../libempathy-gtk/empathy-individual-widget.c:433 +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Rúa:" -#: ../libempathy-gtk/empathy-contact-widget.c:813 -#: ../libempathy-gtk/empathy-individual-widget.c:435 +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Edificio:" # rever -#: ../libempathy-gtk/empathy-contact-widget.c:815 -#: ../libempathy-gtk/empathy-individual-widget.c:437 +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "_Andar:" -#: ../libempathy-gtk/empathy-contact-widget.c:817 -#: ../libempathy-gtk/empathy-individual-widget.c:439 +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Sala:" -#: ../libempathy-gtk/empathy-contact-widget.c:819 -#: ../libempathy-gtk/empathy-individual-widget.c:441 +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Texto:" -#: ../libempathy-gtk/empathy-contact-widget.c:821 -#: ../libempathy-gtk/empathy-individual-widget.c:443 +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Descrición:" -#: ../libempathy-gtk/empathy-contact-widget.c:823 -#: ../libempathy-gtk/empathy-individual-widget.c:445 +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:825 -#: ../libempathy-gtk/empathy-individual-widget.c:447 +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Nivel de precisión:" -#: ../libempathy-gtk/empathy-contact-widget.c:827 -#: ../libempathy-gtk/empathy-individual-widget.c:449 +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Erro:" -#: ../libempathy-gtk/empathy-contact-widget.c:829 -#: ../libempathy-gtk/empathy-individual-widget.c:451 +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Erro vertical (metros):" -#: ../libempathy-gtk/empathy-contact-widget.c:831 -#: ../libempathy-gtk/empathy-individual-widget.c:453 +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Erro horizontal (metros):" -#: ../libempathy-gtk/empathy-contact-widget.c:833 -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Velocidade:" -#: ../libempathy-gtk/empathy-contact-widget.c:835 -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Orientación:" -#: ../libempathy-gtk/empathy-contact-widget.c:837 -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Velocidade de incremento:" -#: ../libempathy-gtk/empathy-contact-widget.c:839 -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Última actualización:" -#: ../libempathy-gtk/empathy-contact-widget.c:841 -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Lonxitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:843 -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Latitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:845 -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Altitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:898 -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:559 -#: ../libempathy-gtk/empathy-individual-widget.c:574 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:35 msgid "Location" msgstr "Localización" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:576 +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:967 -#: ../libempathy-gtk/empathy-individual-widget.c:625 +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y de %R UTC" # rever -#: ../libempathy-gtk/empathy-contact-widget.c:1049 -#: ../libempathy-gtk/empathy-individual-widget.c:867 +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Gardar o avatar" # rever -#: ../libempathy-gtk/empathy-contact-widget.c:1105 -#: ../libempathy-gtk/empathy-individual-widget.c:925 +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Non foi posíbel gardar o avatar" # rever -#: ../libempathy-gtk/empathy-contact-widget.c:1793 -#: ../libempathy-gtk/empathy-individual-menu.c:1066 -#: ../libempathy-gtk/empathy-individual-widget.c:1324 -msgid "Favorite" -msgstr "Favorito" +#: ../libempathy-gtk/empathy-contact-widget.c:1446 +msgid "Personal Details" +msgstr "Detalles persoais" + +# rever +#: ../libempathy-gtk/empathy-contact-widget.c:1449 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +msgid "Contact Details" +msgstr "Detalles do contacto" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 msgid "Full name" msgstr "Nome completo" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 msgid "Phone number" msgstr "Número de teléfono" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 msgid "E-mail address" msgstr "Enderezo de correo electrónico" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Website" msgstr "Sitio web" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Birthday" msgstr "Aniversario" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Last seen:" msgstr "Última actividade" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 msgid "Connected from:" msgstr "Conectado desde:" # rever #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 msgid "Away message:" msgstr "Mensaxe de ausencia:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "work" msgstr "traballo" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 msgid "home" msgstr "persoal" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 msgid "mobile" msgstr "móbil" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 msgid "voice" msgstr "voz" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 msgid "preferred" msgstr "prefirido" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 msgid "postal" msgstr "postal" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 msgid "parcel" msgstr "grupo" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -msgid "Location at (date)\t" -msgstr "Localización o (date)\t" +#. Identifier to connect to Instant Messaging network +#. Translators: Identifier to connect to Instant Messaging network +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 +msgid "Identifier:" +msgstr "Identificador:" #. Alias -#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1260 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "Alias:" -# rever -#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "Client Information" -msgstr "Información do cliente" - #: ../libempathy-gtk/empathy-contact-widget.ui.h:5 -msgid "Client:" -msgstr "Cliente:" - -# rever -#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 -msgid "Contact Details" -msgstr "Detalles do contacto" - -#. Identifier to connect to Instant Messaging network -#. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1469 -msgid "Identifier:" -msgstr "Identificador:" +msgid "Location at (date)\t" +msgstr "Localización o (date)\t" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 msgid "Information requested…" msgstr "Información solicitada…" # rever -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Client Information" +msgstr "Información do cliente" + +# rever +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "OS:" msgstr "SO:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Version:" msgstr "Versión:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Client:" +msgstr "Cliente:" + +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "Grupos" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2369,108 +2248,180 @@ msgstr "" "Seleccione os grupos en que quere que aparezan estes contactos. Note que " "pode seleccionar máis dun grupo ou ningún." -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "Eng_adir grupo" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Seleccionar" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1953 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1970 msgid "Group" msgstr "Grupo" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Bloquearase a seguinte identidade:" msgstr[1] "Bloquearanse as seguintes identidades:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Non é posíbel bloquear a seguinte identidade:" msgstr[1] "Non é posíbel bloquear as seguintes identidades:" -# rever -#. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 -msgid "Linked Contacts" -msgstr "Contactos ligados" - -# rever -#: ../libempathy-gtk/empathy-individual-linker.c:370 -msgid "Select contacts to link" -msgstr "Seleccione os contactos a ligar" - -#: ../libempathy-gtk/empathy-individual-linker.c:444 -msgid "New contact preview" -msgstr "Vista previa do contacto novo" - -#: ../libempathy-gtk/empathy-individual-linker.c:488 -msgid "Contacts selected in the list on the left will be linked together." -msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Editar a información de contacto" #. 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:145 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Seleccione a conta a usar para realizar a chamada" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 -#: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1301 -#: ../src/empathy-call-window.ui.h:2 +#: ../libempathy-gtk/empathy-individual-menu.c:348 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "Chamar" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Móbil" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Traballo" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "Casa" +# rever +#: ../libempathy-gtk/empathy-individual-menu.c:658 +msgid "_Block Contact" +msgstr "_Bloquear contacto" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1017 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:1 +msgid "_Chat" +msgstr "_Conversa" + #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:805 -#: ../libempathy-gtk/empathy-new-message-dialog.c:314 +#: ../libempathy-gtk/empathy-individual-menu.c:1052 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1143 +#: ../libempathy-gtk/empathy-individual-menu.c:1085 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Audiochamada" + +#: ../libempathy-gtk/empathy-individual-menu.c:1118 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Videochamada" + +# rever +#: ../libempathy-gtk/empathy-individual-menu.c:1159 +#: ../src/empathy-roster-window-menubar.ui.h:4 +msgid "_Previous Conversations" +msgstr "Conversas _previas" + +#: ../libempathy-gtk/empathy-individual-menu.c:1188 +msgid "Send File" +msgstr "Enviar ficheiro" + +#: ../libempathy-gtk/empathy-individual-menu.c:1218 +msgid "Share My Desktop" +msgstr "Compartir o meu escritorio" + +# rever +#: ../libempathy-gtk/empathy-individual-menu.c:1244 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Favorito" + +#: ../libempathy-gtk/empathy-individual-menu.c:1263 +msgid "gnome-contacts not installed" +msgstr "gnome-contacts non está instalado" + +#: ../libempathy-gtk/empathy-individual-menu.c:1266 +msgid "Please install gnome-contacts to access contacts details." +msgstr "" +"Instale o programa gnome-contacts para acceder aos detalles dos contactos" + +#: ../libempathy-gtk/empathy-individual-menu.c:1380 +msgid "Infor_mation" +msgstr "Infor_mación" + +#: ../libempathy-gtk/empathy-individual-menu.c:1429 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Editar" # rever -#. Translators: this is a verb meaning "to connect two contacts together -#. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1169 -msgctxt "Link individual (contextual menu)" -msgid "_Link Contacts…" -msgstr "_Ligar contactos…" +#: ../libempathy-gtk/empathy-individual-menu.c:1546 +#: ../src/empathy-chat-window.c:1175 +msgid "Inviting you to this room" +msgstr "Invítao a vostede a esta sala" + +# rever +#: ../libempathy-gtk/empathy-individual-menu.c:1592 +msgid "_Invite to Chat Room" +msgstr "Conv_idar a sala de conversa" + +# rever +#: ../libempathy-gtk/empathy-individual-menu.c:1788 +#: ../src/empathy-roster-window-menubar.ui.h:5 +msgid "_Add Contact…" +msgstr "Eng_adir un contacto…" -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-view.c:2306 msgid "Delete and _Block" msgstr "Eliminar e _bloquear" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +# rever +#: ../libempathy-gtk/empathy-individual-view.c:2341 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Está seguro de que quere eliminar o grupo '%s'?" + +# rever +#: ../libempathy-gtk/empathy-individual-view.c:2344 +msgid "Removing group" +msgstr "Eliminando o grupo" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2399 +#: ../libempathy-gtk/empathy-individual-view.c:2603 +msgid "_Remove" +msgstr "_Eliminar" + +# rever +#: ../libempathy-gtk/empathy-individual-view.c:2476 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Está seguro de quere eliminar o contacto '%s'?" + +#: ../libempathy-gtk/empathy-individual-view.c:2485 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2479,7 +2430,11 @@ msgstr "" "Desexa eliminar o contacto ligado %s? Teña en conta que eliminaranse tamén " "todos os contactos que forman este contacto ligado." -#: ../libempathy-gtk/empathy-individual-widget.c:1608 +#: ../libempathy-gtk/empathy-individual-view.c:2497 +msgid "Removing contact" +msgstr "Eliminando o contacto" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2490,23 +2445,23 @@ msgstr[1] "Contactos ligados que conteñen %u contactos" msgid "Location at (date)" msgstr "Localización en (date)" -#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 msgid "Online from a phone or mobile device" msgstr "Conectado desde un teléfono ou un dispositivo móbil" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "Rede nova" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "Seleccione unha rede IRC" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "Rei_niciar a lista de redes" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Seleccionar" @@ -2520,295 +2475,257 @@ msgstr "servidor novo" msgid "SSL" msgstr "SSL" -# rever -#. Translators: this is the title of the linking dialogue (reached by -#. * right-clicking on a contact and selecting "Link…"). "Link" in this title -#. * is a verb. -#: ../libempathy-gtk/empathy-linking-dialog.c:115 -msgid "Link Contacts" -msgstr "Ligar contactos" - -#: ../libempathy-gtk/empathy-linking-dialog.c:120 -msgctxt "Unlink individual (button)" -msgid "_Unlink…" -msgstr "_Desligar…" - -#: ../libempathy-gtk/empathy-linking-dialog.c:121 -msgid "" -"Completely split the displayed linked contacts into the separate contacts." -msgstr "Separar por completo o contacto ligado nos contactos que contén." - -#. Add button -#. Translators: this is an action button in the linking dialogue. "Link" is -#. * used here as a verb meaning "to connect two contacts to form a -#. * meta-contact". -#: ../libempathy-gtk/empathy-linking-dialog.c:136 -msgid "_Link" -msgstr "_Ligar" - -#: ../libempathy-gtk/empathy-linking-dialog.c:183 -#, c-format -msgid "Unlink linked contacts '%s'?" -msgstr "Desexa desligar os contactos ligados «%s»?" - -#: ../libempathy-gtk/empathy-linking-dialog.c:186 -msgid "" -"Are you sure you want to unlink these linked contacts? This will completely " -"split the linked contacts into separate contacts." -msgstr "" -"Está seguro que quere desligar estes contactos ligados? Isto separará por " -"completo os contactos ligados en contactos separados." - -#: ../libempathy-gtk/empathy-linking-dialog.c:190 -msgctxt "Unlink individual (button)" -msgid "_Unlink" -msgstr "_Desligar" - -#: ../libempathy-gtk/empathy-log-window.c:620 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Historial" -#: ../libempathy-gtk/empathy-log-window.c:675 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Mostrar" -#: ../libempathy-gtk/empathy-log-window.c:697 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Buscar" -#: ../libempathy-gtk/empathy-log-window.c:1145 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Conversar en %s" -#: ../libempathy-gtk/empathy-log-window.c:1147 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Conversa con %s" -#: ../libempathy-gtk/empathy-log-window.c:1197 -#: ../libempathy-gtk/empathy-log-window.c:1344 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e de %B de %Y ás %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1286 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1292 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1368 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s segundo" msgstr[1] "%s segundos" -#: ../libempathy-gtk/empathy-log-window.c:1375 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s minuto" msgstr[1] "%s minutos" -#: ../libempathy-gtk/empathy-log-window.c:1383 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "A chamada levou %s, rematou ás %s" -#: ../libempathy-gtk/empathy-log-window.c:1715 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Hoxe" -#: ../libempathy-gtk/empathy-log-window.c:1719 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Mañá" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1734 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e de %B de %Y" -#: ../libempathy-gtk/empathy-log-window.c:1815 -#: ../libempathy-gtk/empathy-log-window.c:3430 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Calquera momento" -#: ../libempathy-gtk/empathy-log-window.c:1902 -#: ../libempathy-gtk/empathy-log-window.c:2358 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Calquera persoa" -#: ../libempathy-gtk/empathy-log-window.c:2671 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Quen" -#: ../libempathy-gtk/empathy-log-window.c:2875 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Cando" -#: ../libempathy-gtk/empathy-log-window.c:2991 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Calquera cousa" -#: ../libempathy-gtk/empathy-log-window.c:2993 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Conversas de texto" -#: ../libempathy-gtk/empathy-log-window.c:2995 -#: ../src/empathy-preferences.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "Chamadas" # rever -#: ../libempathy-gtk/empathy-log-window.c:3000 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Chamadas entrantes" # rever -#: ../libempathy-gtk/empathy-log-window.c:3001 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Chamadas de voz saíntes" -#: ../libempathy-gtk/empathy-log-window.c:3002 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Chamadas perdidas de %s" -#: ../libempathy-gtk/empathy-log-window.c:3024 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Que" -#: ../libempathy-gtk/empathy-log-window.c:3719 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Ten certeza de eliminar tódolos rexistros das conversas anteriores?" -#: ../libempathy-gtk/empathy-log-window.c:3723 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Limpar todo" -#: ../libempathy-gtk/empathy-log-window.c:3730 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Eliminar desde:" #: ../libempathy-gtk/empathy-log-window.ui.h:1 -msgid "Loading..." -msgstr "Cargando…" +msgid "_File" +msgstr "_Ficheiro" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 -#: ../src/empathy-chat-window.ui.h:3 -msgid "Chat" -msgstr "Conversa" +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:12 +msgid "_Edit" +msgstr "_Editar" -#: ../libempathy-gtk/empathy-log-window.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Delete All History..." msgstr "Eliminar todo o historial…" -#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "Profile" msgstr "Perfíl" -#: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:20 -msgid "Video" -msgstr "V_ídeo" +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:19 +msgid "Chat" +msgstr "Conversa" #: ../libempathy-gtk/empathy-log-window.ui.h:7 -#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 -msgid "_Edit" -msgstr "_Editar" +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "Video" +msgstr "V_ídeo" #: ../libempathy-gtk/empathy-log-window.ui.h:8 -msgid "_File" -msgstr "_Ficheiro" - -#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "páxina 2" +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "Loading..." +msgstr "Cargando…" + # rever -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "O contacto está desconectado" # rever -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 msgid "The specified contact is either invalid or unknown" msgstr "O contacto especificado é descoñecido ou non é válido" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" msgstr "O contacto non admite este tipo de conversa" -#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 msgid "The requested functionality is not implemented for this protocol" msgstr "A funcionalidade requirida non está implementada para este protocolo" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 msgid "Could not start a conversation with the given contact" msgstr "Non foi posíbel iniciar unha conversa co contacto dado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "Vostede foi bloqueado nesta canle" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "Esta canel está completa" # rever -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 msgid "You must be invited to join this channel" msgstr "Debe ter un convite para unirse a esta canle" # rever -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" msgstr "Non é posíbel continuar mentres estea desconectado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "Permiso denegado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "Produciuse un erro ao iniciar a conversa" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "Escriba o identificador dun contacto ou un número de teléfono:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:334 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Conversa nova" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:226 +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "_Video Call" msgstr "Chamada de _vídeo" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:236 +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 msgid "_Audio Call" msgstr "Chamada de vo_z" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:246 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Nova chamada" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Fallou a autenticación para a conta %s" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2864,22 +2781,22 @@ msgstr "Conta nova de %s" msgid "Find:" msgstr "Buscar:" +# rever #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -msgid "Mat_ch case" -msgstr "_Coincidir con capitalización" +msgid "_Previous" +msgstr "_Anterior" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Phrase not found" -msgstr "Frase non atopada" - -#: ../libempathy-gtk/empathy-search-bar.ui.h:4 msgid "_Next" msgstr "_Seguinte" -# rever +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "Mat_ch case" +msgstr "_Coincidir con capitalización" + #: ../libempathy-gtk/empathy-search-bar.ui.h:5 -msgid "_Previous" -msgstr "_Anterior" +msgid "Phrase not found" +msgstr "Frase non atopada" # rever #: ../libempathy-gtk/empathy-sound-manager.c:51 @@ -2934,12 +2851,12 @@ msgstr "Chamada de voz finalizada" msgid "Edit Custom Messages" msgstr "Editar mensaxes personalizadas" -#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "Mensaxe editado ás %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1752 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "Normal" @@ -3023,35 +2940,39 @@ msgid "Certificate hostname: %s" msgstr "Nome do servidor do certificado: %s" #: ../libempathy-gtk/empathy-tls-dialog.c:281 -msgid "Continue" -msgstr "Continuar" +msgid "C_ontinue" +msgstr "C_ontinuar" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "A conexión non é confianza" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "A conexión non confiábel. Desexa continuar de todas formas?" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "Lembrar esta elección para futuras conexións" # rever -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "Detalles do certificado" -#: ../libempathy-gtk/empathy-ui-utils.c:1738 +#: ../libempathy-gtk/empathy-ui-utils.c:1741 msgid "Unable to open URI" msgstr "Non foi posíbel abrir o URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1835 +#: ../libempathy-gtk/empathy-ui-utils.c:1859 msgid "Select a file" msgstr "Seleccione un ficheiro" -#: ../libempathy-gtk/empathy-ui-utils.c:1907 +#: ../libempathy-gtk/empathy-ui-utils.c:1934 msgid "Insufficient free space to save file" msgstr "Non hai espazo suficiente para gardar o ficheiro" -#: ../libempathy-gtk/empathy-ui-utils.c:1915 +#: ../libempathy-gtk/empathy-ui-utils.c:1942 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -3060,7 +2981,7 @@ msgstr "" "Requírense %s de espazo libre para gardar este ficheiro, pero só hai %s " "dispoñíbeis. Elixa outra localización." -#: ../libempathy-gtk/empathy-ui-utils.c:1959 +#: ../libempathy-gtk/empathy-ui-utils.c:1986 #, c-format msgid "Incoming file from %s" msgstr "Ficheiro entrante de %s" @@ -3233,34 +3154,34 @@ msgid "Vietnamese" msgstr "Vietnamita" # rever -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Non hai mensaxe de erro" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Mensaxe instantáneo (Empathy)" # rever -#: ../src/empathy.c:433 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Non conectarse ao inicio" # rever -#: ../src/empathy.c:437 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio" # rever -#: ../src/empathy.c:452 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr " - Cliente de mensaxaría instantánea Empathy" -#: ../src/empathy.c:639 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Produciuse un erro ao contactar co Xestor de contas" -#: ../src/empathy.c:641 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3310,11 +3231,11 @@ msgstr "" "Street, Fifth Floor, Boston, MA 02110-130159 USA" # rever -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Un cliente de mensaxaría instantánea para o GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Francisco Diéguez , 2009, 2010.\n" @@ -3357,37 +3278,38 @@ msgstr "" "deste asistente e engadir as contas máis tarde desde o menú Editar." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1276 msgid "An error occurred" msgstr "Produciuse un erro" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Que clase de conta de chat ten?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "Ten algunha outra conta de chat que queira estabelecer?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Introduza os seus detalles de conta" # rever -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Que clase de conta de chat quere crear?" # rever -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Quere crear outras contas de chat?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Introduza os detalles para a nova conta" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3398,41 +3320,41 @@ msgstr "" "que usen Google Talk, AIM, Windows Live e calquera outro programa de chat. " "Cun micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "Ten algunha outra conta que estea usando con outro programa de chat?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Si, importar os detalles da miña conta desde " -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Si, introducirei os meus detalles de conta agora" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Non, quero crear unha conta nova" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Non, só quero ver á xente conectada que estea próxima por agora" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Seleccione as contas que quere importar:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Si" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Non, isto é todo por agora" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3445,16 +3367,16 @@ msgstr "" "detalles máis tarde ou desactivar esta característica usando o diálogo " "\"Contas\"" -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 msgid "Edit->Accounts" msgstr "Editar->Contas" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "_Non quero activar esta característica por agora" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1148 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3466,89 +3388,97 @@ msgstr "" "Se quere activar esta característica, instale o paquete telepathy-salut e " "cree unha conta de Persoas próximas desde o diálogo Contas" -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1154 msgid "telepathy-salut not installed" msgstr "telepathy-salut non está instalado" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1200 msgid "Messaging and VoIP Accounts Assistant" msgstr "Asistente de contas de mensaxaría e VoIP" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1234 msgid "Welcome to Empathy" msgstr "Benvido/a ao Empathy" # rever -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1243 msgid "Import your existing accounts" msgstr "_Importar as súas contas existentes" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1261 msgid "Please enter personal details" msgstr "Insira os detalles persoais" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Hai modificacións sen gardar respecto da súa conta %s." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "A súa nova conta aínda non foi gardada." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:754 -#: ../src/empathy-call-window.c:1320 +#: ../src/empathy-accounts-dialog.c:344 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1332 msgid "Connecting…" msgstr "Conectando…" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:385 #, c-format msgid "Offline — %s" msgstr "Desconectado — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:397 #, c-format msgid "Disconnected — %s" msgstr "Desconectado — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:408 msgid "Offline — No Network Connection" msgstr "Desconectado — Sen conexión de rede" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:415 msgid "Unknown Status" msgstr "Estado descoñecido" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:427 msgid "Offline — Account Disabled" msgstr "Desconectado — Conta desactivada" # rever -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Vai crear unha conta nova, e descartaranse os seus cambios \n" -"Está seguro de que quere proceder?" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "Editar os parámetros da conexión" + +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "Produciuse un fallo ao recuperar a súa información persoal do servidor" + +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "Conéctese para editar a súa información persoal" + +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "_Editar os parámetros da conexión…" # rever -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:1289 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1293 msgid "This will not remove your account on the server." msgstr "Isto non eliminará a súa conta no servidor." # rever -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1529 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3557,16 +3487,16 @@ msgstr "" "Está seguro de que quere proceder?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1705 msgid "_Enable" msgstr "_Activar" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1706 msgid "_Disable" msgstr "_Desactivar" # rever -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2176 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3579,21 +3509,16 @@ msgstr "" msgid "Add…" msgstr "Engadir…" -#: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Loading account information" -msgstr "Cargando a información da conta" - -# rever #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "No protocol installed" -msgstr "Non hai ningún protocolo instalado" +msgid "_Import…" +msgstr "_Importar…" #: ../src/empathy-accounts-dialog.ui.h:4 msgid "Protocol:" msgstr "Protocolo:" # rever -#: ../src/empathy-accounts-dialog.ui.h:6 +#: ../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." @@ -3601,16 +3526,21 @@ msgstr "" "Para engadir unha conta nova primeiro ten que instalar unha infraestrutura " "para cada protocolo que quere usar." +# rever +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "Non hai ningún protocolo instalado" + #: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Import…" -msgstr "_Importar…" +msgid "Loading account information" +msgstr "Cargando a información da conta" # rever -#: ../src/empathy-auth-client.c:251 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr "- Cliente de autenticación Empathy" -#: ../src/empathy-auth-client.c:267 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Cliente de autenticación Empathy" @@ -3620,109 +3550,109 @@ msgid "People nearby" msgstr "Persoas próximas" # rever -#: ../src/empathy-av.c:118 ../src/empathy-call.c:193 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:203 msgid "- Empathy Audio/Video Client" msgstr "- Cliente de son/vídeo Empathy" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:218 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:228 msgid "Empathy Audio/Video Client" msgstr "Cliente de son/vídeo Empathy" -#: ../src/empathy-streamed-media-window.c:431 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Contraste" -#: ../src/empathy-streamed-media-window.c:434 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Brillo" -#: ../src/empathy-streamed-media-window.c:437 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-streamed-media-window.c:542 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Volume" -#: ../src/empathy-streamed-media-window.c:1110 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "Barra _lateral" # rever -#: ../src/empathy-streamed-media-window.c:1130 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Entrada de audio" # rever -#: ../src/empathy-streamed-media-window.c:1134 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Entrada de vídeo" -#: ../src/empathy-streamed-media-window.c:1142 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Marcador" # rever -#: ../src/empathy-streamed-media-window.c:1153 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Detalles do contacto" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1222 -#: ../src/empathy-call-window.c:1929 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1934 #, c-format msgid "Call with %s" msgstr "Chamar con %s" -#: ../src/empathy-streamed-media-window.c:1455 -#: ../src/empathy-call-window.c:2173 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2178 msgid "The IP address as seen by the machine" msgstr "O enderezo IP como é visto polo computador" -#: ../src/empathy-streamed-media-window.c:1457 -#: ../src/empathy-call-window.c:2175 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2180 msgid "The IP address as seen by a server on the Internet" msgstr "O enderezo IP como é visto por un servidor na Internet" -#: ../src/empathy-streamed-media-window.c:1459 -#: ../src/empathy-call-window.c:2177 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2182 msgid "The IP address of the peer as seen by the other side" msgstr "O enderezo IP do par como é visto pola outra parte" -#: ../src/empathy-streamed-media-window.c:1461 -#: ../src/empathy-call-window.c:2179 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2184 msgid "The IP address of a relay server" msgstr "O enderezo IP dun servidor de desvío" -#: ../src/empathy-streamed-media-window.c:1463 -#: ../src/empathy-call-window.c:2181 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2186 msgid "The IP address of the multicast group" msgstr "O enderezo IP do grupo multicast" -#: ../src/empathy-streamed-media-window.c:1845 -#: ../src/empathy-streamed-media-window.c:1848 -#: ../src/empathy-streamed-media-window.c:1851 -#: ../src/empathy-streamed-media-window.c:1854 +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 msgctxt "codec" msgid "Unknown" msgstr "Descoñecido" # rever #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2146 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "Conectado — %d:%02dm" # rever -#: ../src/empathy-streamed-media-window.c:2207 -#: ../src/empathy-call-window.c:2984 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3040 msgid "Technical Details" msgstr "Detalles técnicos" -#: ../src/empathy-streamed-media-window.c:2245 -#: ../src/empathy-call-window.c:3023 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3079 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3731,8 +3661,8 @@ msgstr "" "O software de %s non entende algúns dos formatos de video admitidos polo seu " "computador" -#: ../src/empathy-streamed-media-window.c:2250 -#: ../src/empathy-call-window.c:3028 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3084 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3741,8 +3671,8 @@ msgstr "" "O software de %s non entende algúns dos formatos de vídeo admitidos polo seu " "computador" -#: ../src/empathy-streamed-media-window.c:2256 -#: ../src/empathy-call-window.c:3034 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3751,25 +3681,25 @@ msgstr "" "Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede " "que non permite conexións directas." -#: ../src/empathy-streamed-media-window.c:2262 -#: ../src/empathy-call-window.c:3040 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3096 msgid "There was a failure on the network" msgstr "Produciuse un fallo na rede" -#: ../src/empathy-streamed-media-window.c:2266 -#: ../src/empathy-call-window.c:3044 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3100 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "Non ten instalados os formatos de audio necesarios neste computador" -#: ../src/empathy-streamed-media-window.c:2269 -#: ../src/empathy-call-window.c:3047 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3103 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "Non ten instalados os formatos de vídeo necesarios neste computador" -#: ../src/empathy-streamed-media-window.c:2279 -#: ../src/empathy-call-window.c:3059 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3115 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please Informe de este erro e anexe os rexistros que pode ollar na " "xanela «Depurar» no menú Axuda." -#: ../src/empathy-streamed-media-window.c:2287 -#: ../src/empathy-call-window.c:3068 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3124 msgid "There was a failure in the call engine" msgstr "Produciuse un fallo ao chamar ao motor" -#: ../src/empathy-streamed-media-window.c:2290 -#: ../src/empathy-call-window.c:3071 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3127 msgid "The end of the stream was reached" msgstr "Chegouse ao final do fluxo" -#: ../src/empathy-streamed-media-window.c:2330 -#: ../src/empathy-call-window.c:3111 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3167 msgid "Can't establish audio stream" msgstr "Non é posíbel estabelecer un fluxo de audio" -#: ../src/empathy-streamed-media-window.c:2340 -#: ../src/empathy-call-window.c:3121 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3177 msgid "Can't establish video stream" msgstr "Non é posíbel estabelecer un fluxo de vídeo" -#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2 +#: ../src/empathy-call-window.ui.h:1 #: ../src/empathy-streamed-media-window.ui.h:1 -msgid "Audio" -msgstr "Auto" +msgid "_Call" +msgstr "_Chamar" #: ../src/empathy-call-window.ui.h:3 -#: ../src/empathy-streamed-media-window.ui.h:5 -msgid "Decoding Codec:" -msgstr "Códec de decodificación:" +msgid "_Microphone" +msgstr "_Micrófono" #: ../src/empathy-call-window.ui.h:4 -msgid "Disable camera" -msgstr "Desactivar cámara" +msgid "_Camera" +msgstr "_Cámara" #: ../src/empathy-call-window.ui.h:5 -msgid "Display the dialpad" -msgstr "Desactivar o marcador" +msgid "_Settings" +msgstr "_Configuracións" #: ../src/empathy-call-window.ui.h:6 -#: ../src/empathy-streamed-media-window.ui.h:9 -msgid "Encoding Codec:" -msgstr "Códec de codificación:" +#: ../src/empathy-roster-window-menubar.ui.h:17 +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "_View" +msgstr "_Ver" -#: ../src/empathy-call-window.ui.h:7 -#: ../src/empathy-streamed-media-window.ui.h:10 -msgid "Hang up" -msgstr "Colgar" +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:27 +msgid "_Help" +msgstr "A_xuda" -#: ../src/empathy-call-window.ui.h:8 -#: ../src/empathy-streamed-media-window.ui.h:11 -msgid "Hang up current call" -msgstr "Colgar chamada actual" +#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:28 +msgid "_Contents" +msgstr "_Contidos" #: ../src/empathy-call-window.ui.h:9 -#: ../src/empathy-streamed-media-window.ui.h:12 -msgid "Local Candidate:" -msgstr "Candidato local:" +#: ../src/empathy-roster-window-menubar.ui.h:29 +msgid "_Debug" +msgstr "_Depuración" #: ../src/empathy-call-window.ui.h:10 -msgid "Maximise me" -msgstr "Maximizarme" +msgid "Swap camera" +msgstr "Trocar cámara" #: ../src/empathy-call-window.ui.h:11 msgid "Minimise me" msgstr "Minimizarme" #: ../src/empathy-call-window.ui.h:12 -#: ../src/empathy-streamed-media-window.ui.h:15 -msgid "Remote Candidate:" -msgstr "Candidato remoto:" +msgid "Maximise me" +msgstr "Maximizarme" -# rever #: ../src/empathy-call-window.ui.h:13 -#: ../src/empathy-streamed-media-window.ui.h:16 -msgid "Send Audio" -msgstr "Enviar audio" +msgid "Disable camera" +msgstr "Desactivar cámara" -# rever #: ../src/empathy-call-window.ui.h:14 -msgid "Send Video" -msgstr "Enviar vídeo" +#: ../src/empathy-streamed-media-window.ui.h:2 +msgid "Hang up" +msgstr "Colgar" #: ../src/empathy-call-window.ui.h:15 -msgid "Show dialpad" -msgstr "Mostrar marcador" +#: ../src/empathy-streamed-media-window.ui.h:9 +msgid "Hang up current call" +msgstr "Colgar chamada actual" #: ../src/empathy-call-window.ui.h:16 +msgid "Video call" +msgstr "Videochamada" + +#: ../src/empathy-call-window.ui.h:17 msgid "Start a video call" msgstr "Iniciar vídeochamada" -#: ../src/empathy-call-window.ui.h:17 +#: ../src/empathy-call-window.ui.h:19 msgid "Start an audio call" msgstr "Iniciar chamada de son" -#: ../src/empathy-call-window.ui.h:18 -msgid "Swap camera" -msgstr "Trocar cámara" - -#: ../src/empathy-call-window.ui.h:19 -#: ../src/empathy-streamed-media-window.ui.h:17 -msgid "Toggle audio transmission" -msgstr "Activar/desactivar transmisión de audio" - #: ../src/empathy-call-window.ui.h:20 -msgid "Toggle video transmission" -msgstr "Activar/desactivar transmisión de vídeo" +msgid "Show dialpad" +msgstr "Mostrar marcador" #: ../src/empathy-call-window.ui.h:21 -#: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2581 ../src/empathy-call-window.c:2582 -#: ../src/empathy-call-window.c:2583 ../src/empathy-call-window.c:2584 -msgid "Unknown" -msgstr "Descoñecido" +msgid "Display the dialpad" +msgstr "Desactivar o marcador" + +# rever +#: ../src/empathy-call-window.ui.h:22 +msgid "Send Video" +msgstr "Enviar vídeo" #: ../src/empathy-call-window.ui.h:23 -msgid "Video call" -msgstr "Videochamada" +msgid "Toggle video transmission" +msgstr "Activar/desactivar transmisión de vídeo" +# rever #: ../src/empathy-call-window.ui.h:24 -#: ../src/empathy-streamed-media-window.ui.h:24 -msgid "_Call" -msgstr "_Chamar" +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Send Audio" +msgstr "Enviar audio" #: ../src/empathy-call-window.ui.h:25 -msgid "_Camera" -msgstr "_Cámara" - -#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 -msgid "_Contents" -msgstr "_Contidos" +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Toggle audio transmission" +msgstr "Activar/desactivar transmisión de audio" #: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 -msgid "_Debug" -msgstr "_Depuración" +#: ../src/empathy-streamed-media-window.ui.h:20 +msgid "Encoding Codec:" +msgstr "Códec de codificación:" -#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 -msgid "_Help" -msgstr "A_xuda" +#: ../src/empathy-call-window.ui.h:28 +#: ../src/empathy-streamed-media-window.ui.h:21 +#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588 +#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590 +msgid "Unknown" +msgstr "Descoñecido" + +#: ../src/empathy-call-window.ui.h:29 +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Decoding Codec:" +msgstr "Códec de decodificación:" #: ../src/empathy-call-window.ui.h:30 -msgid "_Microphone" -msgstr "_Micrófono" +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Remote Candidate:" +msgstr "Candidato remoto:" #: ../src/empathy-call-window.ui.h:31 -msgid "_Settings" -msgstr "_Configuracións" +#: ../src/empathy-streamed-media-window.ui.h:24 +msgid "Local Candidate:" +msgstr "Candidato local:" + +#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:25 +msgid "Audio" +msgstr "Auto" + +# rever +#: ../src/empathy-chat-window.c:285 +msgid "Close this window?" +msgstr "Pechar esta xanela?" + +#: ../src/empathy-chat-window.c:290 +#, c-format +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "" +"Pechar esta xanela fará que abandone %s. Non recibirá máis mensaxes até que " +"se una de novo." + +#: ../src/empathy-chat-window.c:301 +#, 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] "" +"Pechar esta xanela fará que abandone unha sala de chat. Non recibirá máis " +"mensaxes até que se una de novo." +msgstr[1] "" +"Pechar esta xanela fará que abandone %u salas de chat. Non recibirá máis " +"mensaxes até que se una de novo." + +#: ../src/empathy-chat-window.c:310 +#, c-format +msgid "Leave %s?" +msgstr "Pechar %s?" + +#: ../src/empathy-chat-window.c:311 +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "Non recibirá máis mensaxes deste chat até que se una de novo." + +#: ../src/empathy-chat-window.c:330 +msgid "Close window" +msgstr "Pechar a xanela" -#: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 -#: ../src/empathy-streamed-media-window.ui.h:25 -msgid "_View" -msgstr "_Ver" +#: ../src/empathy-chat-window.c:330 +msgid "Leave room" +msgstr "Abandonar a sala" -#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 +#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d non lido)" msgstr[1] "%s (%d non lidos)" -#: ../src/empathy-chat-window.c:493 +#: ../src/empathy-chat-window.c:648 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (e outro %u)" msgstr[1] "%s (e outros %u)" -#: ../src/empathy-chat-window.c:509 +#: ../src/empathy-chat-window.c:664 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d non lido de outros)" msgstr[1] "%s (%d non lidos de outros)" -#: ../src/empathy-chat-window.c:518 +#: ../src/empathy-chat-window.c:673 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d non lido de todos)" msgstr[1] "%s (%d non lidos de todos)" -#: ../src/empathy-chat-window.c:733 +#: ../src/empathy-chat-window.c:888 msgid "SMS:" msgstr "SMS:" # rever -#: ../src/empathy-chat-window.c:743 +#: ../src/empathy-chat-window.c:898 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3977,73 +3955,73 @@ msgstr[0] "Enviando %d mensaxe." msgstr[1] "Enviando %d mensaxes." # rever -#: ../src/empathy-chat-window.c:765 +#: ../src/empathy-chat-window.c:920 msgid "Typing a message." msgstr "Escribindo unha mensaxe." #: ../src/empathy-chat-window.ui.h:1 -msgid "C_lear" -msgstr "_Limpo" +msgid "_Conversation" +msgstr "_Conversa" #: ../src/empathy-chat-window.ui.h:2 -msgid "C_ontact" -msgstr "C_ontacto" +msgid "C_lear" +msgstr "_Limpo" -#: ../src/empathy-chat-window.ui.h:4 +#: ../src/empathy-chat-window.ui.h:3 msgid "Insert _Smiley" msgstr "Inse_rir unha emoticona" +# rever +#: ../src/empathy-chat-window.ui.h:4 +msgid "_Favorite Chat Room" +msgstr "Sala de conversa _favorita" + +# rever #: ../src/empathy-chat-window.ui.h:5 -msgid "Invite _Participant…" -msgstr "Invitar _participante…" +msgid "Notify for All Messages" +msgstr "Notificar todas as mensaxes" -#: ../src/empathy-chat-window.ui.h:6 -msgid "Move Tab _Left" -msgstr "Mover a lapela á _esquerda" +# rever +#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1 +msgid "_Show Contact List" +msgstr "Mo_strar a lista de contactos" #: ../src/empathy-chat-window.ui.h:7 -msgid "Move Tab _Right" -msgstr "Mover a lapela á _dereita" +msgid "Invite _Participant…" +msgstr "Invitar _participante…" -# rever #: ../src/empathy-chat-window.ui.h:8 -msgid "Notify for All Messages" -msgstr "Notificar todas as mensaxes" +msgid "C_ontact" +msgstr "C_ontacto" #: ../src/empathy-chat-window.ui.h:10 -msgid "_Conversation" -msgstr "_Conversa" - -#: ../src/empathy-chat-window.ui.h:11 -msgid "_Detach Tab" -msgstr "Des_prender lapela" +msgid "_Tabs" +msgstr "_Lapelas" # rever -#: ../src/empathy-chat-window.ui.h:13 -msgid "_Favorite Chat Room" -msgstr "Sala de conversa _favorita" +#: ../src/empathy-chat-window.ui.h:11 +msgid "_Previous Tab" +msgstr "Lapela _anterior" -#: ../src/empathy-chat-window.ui.h:15 +#: ../src/empathy-chat-window.ui.h:12 msgid "_Next Tab" msgstr "Lapela _seguinte" -# rever -#: ../src/empathy-chat-window.ui.h:16 -msgid "_Previous Tab" -msgstr "Lapela _anterior" +#: ../src/empathy-chat-window.ui.h:13 +msgid "_Undo Close Tab" +msgstr "_Desfacer o peche da lapela" -# rever -#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5 -msgid "_Show Contact List" -msgstr "Mo_strar a lista de contactos" +#: ../src/empathy-chat-window.ui.h:14 +msgid "Move Tab _Left" +msgstr "Mover a lapela á _esquerda" -#: ../src/empathy-chat-window.ui.h:18 -msgid "_Tabs" -msgstr "_Lapelas" +#: ../src/empathy-chat-window.ui.h:15 +msgid "Move Tab _Right" +msgstr "Mover a lapela á _dereita" -#: ../src/empathy-chat-window.ui.h:19 -msgid "_Undo Close Tab" -msgstr "_Desfacer o peche da lapela" +#: ../src/empathy-chat-window.ui.h:16 +msgid "_Detach Tab" +msgstr "Des_prender lapela" #: ../src/empathy-chatrooms-window.c:251 msgid "Name" @@ -4059,111 +4037,111 @@ msgid "Auto-Connect" msgstr "Conectar automaticamente" # rever -#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-chatrooms-window.ui.h:1 msgid "Manage Favorite Rooms" msgstr "Xestionar as salas preferidas" # rever -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Chamada de vídeo entrante" # rever -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1553 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562 msgid "Incoming call" msgstr "Chamada entrante" # rever -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s solicítalle unha videochamada. Desexa responderlle?" # rever -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s estao chamando. Quérelle responder?" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1559 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568 #, c-format msgid "Incoming call from %s" msgstr "Chamada entrante de %s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "_Rexeitar" # rever -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_Responder" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "_Responder con vídeo" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1559 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1568 #, c-format msgid "Incoming video call from %s" msgstr "Videochamada entrante de %s" # rever -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Convite para unha sala" # rever -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Invitación a unirse a %s" # rever -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s estao convidando a unirse a %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_Declinar" -#: ../src/empathy-event-manager.c:858 -#: ../src/empathy-new-chatroom-dialog.ui.h:7 +#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "_Join" msgstr "_Unirse" # rever -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s convidouno a unirse a %s" # rever -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "Vostede foi convidado a unirse a %s" # rever -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Transferencia de ficheiro entrante de %s" -#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374 msgid "Password required" msgstr "Requírese o contrasinal" -#: ../src/empathy-event-manager.c:1210 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s solicita permiso para ver cando vostede está dispoñíbel" -#: ../src/empathy-event-manager.c:1214 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -4173,44 +4151,44 @@ msgstr "" "Mensaxe: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Descoñecido" # rever -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s de %s en %s/s" # rever -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s de %s" # rever #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Recibindo «%s» de %s" # rever #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Enviando «%s» a %s" @@ -4218,30 +4196,30 @@ msgstr "Enviando «%s» a %s" # rever #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Produciuse un erro ao recibir «%s» de %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Produciuse un erro ao recibir un ficheiro" # rever -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Produciuse un erro ao enviar «%s» a %s" # rever -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Produciuse un erro ao enviar un ficheiro" # rever #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "recibiuse «%s» de %s" @@ -4249,39 +4227,39 @@ msgstr "recibiuse «%s» de %s" # rever #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "enviado «%s» a %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Transferencia de ficheiros rematada" # rever -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Agardando pola resposta do outro participante" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Verificando a integridade de «%s»" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Aplicando o hash «%s»" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Ficheiro" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Restantes" @@ -4311,172 +4289,187 @@ msgid "Import Accounts" msgstr "Importar contas" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "Importar" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Protocolo" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Orixe" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-roster-window.c:391 msgid "Provide Password" msgstr "Escriba o seu contrasinal" -#: ../src/empathy-main-window.c:401 +#: ../src/empathy-roster-window.c:397 msgid "Disconnect" msgstr "Desconectar" +#: ../src/empathy-roster-window.c:657 +msgid "You need to setup an account to see contacts here." +msgstr "Debe configurar unha conta para ver contactos aquí." + # rever -#: ../src/empathy-main-window.c:638 +#: ../src/empathy-roster-window.c:673 msgid "No match found" msgstr "Non se atopou ningunha coincidencia." -#: ../src/empathy-main-window.c:746 +#: ../src/empathy-roster-window.c:783 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" "As contas de %s non se poden usar até que non teña actualizado o seu " "software %s." -#: ../src/empathy-main-window.c:814 +#: ../src/empathy-roster-window.c:849 msgid "Update software..." msgstr "Actualizar software…" -#: ../src/empathy-main-window.c:820 ../src/empathy-main-window.c:941 +#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972 msgid "Close" msgstr "Pechar" -#: ../src/empathy-main-window.c:929 +#: ../src/empathy-roster-window.c:960 msgid "Reconnect" msgstr "Reconectar" -#: ../src/empathy-main-window.c:935 +#: ../src/empathy-roster-window.c:966 msgid "Edit Account" msgstr "Editar a conta" #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:1074 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1110 #, c-format msgid "Top up %s (%s)..." msgstr "Recargar %s (%s)…" -#: ../src/empathy-main-window.c:1121 +#: ../src/empathy-roster-window.c:1156 msgid "Top up account credit" msgstr "Recargar o saldo da conta" #. top up button -#: ../src/empathy-main-window.c:1192 +#: ../src/empathy-roster-window.c:1228 msgid "Top Up..." msgstr "Recargar…" -#: ../src/empathy-main-window.c:1935 +#: ../src/empathy-roster-window.c:1952 msgid "Contact" msgstr "Contacto" -#: ../src/empathy-main-window.c:2310 +#: ../src/empathy-roster-window.c:2150 +msgid "You need to enable one of your accounts to see contacts here." +msgstr "Debe activar unha das súas contas para ver contactos aquí." + +#. translators: argument is an account name +#: ../src/empathy-roster-window.c:2158 +#, c-format +msgid "You need to enable %s to see contacts here." +msgstr "Debe activar %s para ver contactos aquí." + +#: ../src/empathy-roster-window.c:2460 msgid "Contact List" msgstr "Lista de contactos" -#: ../src/empathy-main-window-menubar.ui.h:1 -msgid "Contacts on a _Map" -msgstr "Contactos no mapa" +#: ../src/empathy-roster-window.ui.h:1 +msgid "Account settings" +msgstr "Configuración da conta" -#: ../src/empathy-main-window-menubar.ui.h:2 -msgid "Credit Balance" -msgstr "Crédito" +#: ../src/empathy-roster-window-menubar.ui.h:2 +#: ../src/empathy-status-icon.ui.h:2 +msgid "_New Conversation…" +msgstr "_Nova conversa…" -#: ../src/empathy-main-window-menubar.ui.h:3 -msgid "Find in Contact _List" -msgstr "_Buscar na lista de contactos" +#: ../src/empathy-roster-window-menubar.ui.h:3 +#: ../src/empathy-status-icon.ui.h:3 +msgid "New _Call…" +msgstr "Nova _chamada…" # rever -#: ../src/empathy-main-window-menubar.ui.h:4 -msgid "Join _Favorites" -msgstr "Unirse a pre_feridos" +#: ../src/empathy-roster-window-menubar.ui.h:6 +msgid "_Search for Contacts…" +msgstr "_Buscar contactos…" -#: ../src/empathy-main-window-menubar.ui.h:5 -msgid "Manage Favorites" -msgstr "Xestionar as preferidas" +#: ../src/empathy-roster-window-menubar.ui.h:7 +msgid "_File Transfers" +msgstr "Trans_ferencias de ficheiros" -#: ../src/empathy-main-window-menubar.ui.h:6 -msgid "N_ormal Size" -msgstr "Tamañ_o normal" +# rever +#: ../src/empathy-roster-window-menubar.ui.h:8 +msgid "_Offline Contacts" +msgstr "Mostrar os contactos _desconectados" -#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 -msgid "New _Call…" -msgstr "Nova _chamada…" +#: ../src/empathy-roster-window-menubar.ui.h:9 +msgid "Show P_rotocols" +msgstr "Mostrar os p_rotocolos" -#: ../src/empathy-main-window-menubar.ui.h:8 -msgid "Normal Size With _Avatars" -msgstr "Tamaño normal con _avatares" +#: ../src/empathy-roster-window-menubar.ui.h:10 +msgid "Credit Balance" +msgstr "Crédito" + +#: ../src/empathy-roster-window-menubar.ui.h:11 +msgid "Contacts on a _Map" +msgstr "Contactos no mapa" + +#: ../src/empathy-roster-window-menubar.ui.h:13 +msgid "_Accounts" +msgstr "_Contas" + +# rever +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Blocked Contacts" +msgstr "Contactos _bloqueados" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "P_references" msgstr "P_referencias" -#: ../src/empathy-main-window-menubar.ui.h:10 -msgid "Show P_rotocols" -msgstr "Mostrar os p_rotocolos" +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "Find in Contact _List" +msgstr "_Buscar na lista de contactos" # rever -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "Sort by _Name" msgstr "Ordenar por _nome" # rever -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "Sort by _Status" msgstr "Ordenar por es_tado" -#: ../src/empathy-main-window-menubar.ui.h:13 -msgid "_Accounts" -msgstr "_Contas" +#: ../src/empathy-roster-window-menubar.ui.h:20 +msgid "Normal Size With _Avatars" +msgstr "Tamaño normal con _avatares" -# rever -#: ../src/empathy-main-window-menubar.ui.h:15 -msgid "_Blocked Contacts" -msgstr "Contactos _bloqueados" +#: ../src/empathy-roster-window-menubar.ui.h:21 +msgid "N_ormal Size" +msgstr "Tamañ_o normal" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Compact Size" msgstr "Ta_maño compacto" -#: ../src/empathy-main-window-menubar.ui.h:21 -msgid "_File Transfers" -msgstr "Trans_ferencias de ficheiros" +#: ../src/empathy-roster-window-menubar.ui.h:23 +msgid "_Room" +msgstr "Sa_la" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:24 msgid "_Join…" msgstr "_Unirse…" -#: ../src/empathy-main-window-menubar.ui.h:24 -#: ../src/empathy-status-icon.ui.h:3 -msgid "_New Conversation…" -msgstr "_Nova conversa…" - # rever -#: ../src/empathy-main-window-menubar.ui.h:25 -msgid "_Offline Contacts" -msgstr "Mostrar os contactos _desconectados" - -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "Información _persoal" - -#: ../src/empathy-main-window-menubar.ui.h:28 -msgid "_Room" -msgstr "Sa_la" +#: ../src/empathy-roster-window-menubar.ui.h:25 +msgid "Join _Favorites" +msgstr "Unirse a pre_feridos" -# rever -#: ../src/empathy-main-window-menubar.ui.h:29 -msgid "_Search for Contacts…" -msgstr "_Buscar contactos…" +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "Manage Favorites" +msgstr "Xestionar as preferidas" # rever #: ../src/empathy-new-chatroom-dialog.c:369 @@ -4489,7 +4482,7 @@ msgstr "Membros" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:623 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4502,22 +4495,22 @@ msgstr "" "Contrasinal requirido: %s\n" "Membros: %s" -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "Non" -#: ../src/empathy-new-chatroom-dialog.c:654 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "Non foi posíbel arrincar a lista da sala" -#: ../src/empathy-new-chatroom-dialog.c:664 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "Non foi posíbel deter a lista da sala" -#: ../src/empathy-new-chatroom-dialog.ui.h:2 -msgid "Couldn't load room list" -msgstr "Non foi posíbel ler a lista da sala" +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Join Room" +msgstr "Unirse á sala" # rever #: ../src/empathy-new-chatroom-dialog.ui.h:3 @@ -4527,8 +4520,12 @@ msgstr "" "Introduza o nome da sala aquí para unirse ou prema nunha ou máis salas da " "lista." -# rever #: ../src/empathy-new-chatroom-dialog.ui.h:4 +msgid "_Room:" +msgstr "Sa_la:" + +# rever +#: ../src/empathy-new-chatroom-dialog.ui.h:5 msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" @@ -4536,343 +4533,338 @@ msgstr "" "Introduza o servidor onde se aloxa a sala ou déixeo baleiro se a sala está " "na conta do servidor actual" -#: ../src/empathy-new-chatroom-dialog.ui.h:5 -msgid "Join Room" -msgstr "Unirse á sala" +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "Couldn't load room list" +msgstr "Non foi posíbel ler a lista da sala" # rever -#: ../src/empathy-new-chatroom-dialog.ui.h:6 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 msgid "Room List" msgstr "Lista de _salas" -#: ../src/empathy-new-chatroom-dialog.ui.h:8 -msgid "_Room:" -msgstr "Sa_la:" - -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Mensaxe recibida" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Mensaxe enviada" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Conversa nova" # rever -#: ../src/empathy-preferences.c:172 -msgid "Contact goes online" +#: ../src/empathy-preferences.c:169 +msgid "Contact comes online" msgstr "O contacto conéctase" # rever -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "O contacto desconéctase" # rever -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Conta conectada" # rever -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Conta desconectada" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Idioma" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:726 msgid "Juliet" msgstr "Xulieta" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:733 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:739 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Oh, Romeo, Romeo!, ¿onde estás que non te vexo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:743 msgid "Deny thy father and refuse thy name;" msgstr "Nega ao teu pai e rexeita o teu nome;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:746 msgid "Or if thou wilt not, be but sworn my love" msgstr "Ou, se non queres, xúrame tan só que me amas" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:749 msgid "And I'll no longer be a Capulet." msgstr "Y deixarei eu de ser unha Capuleto." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:752 msgid "Shall I hear more, or shall I speak at this?" msgstr "Debo escoitar máis ou contestar ao dito?" # rever #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" msgstr "Xulieta desconectouse" -#: ../src/empathy-preferences.c:1175 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "Preferencias" +# rever #: ../src/empathy-preferences.ui.h:1 +msgid "Show _smileys as images" +msgstr "Mostrar as _emoticonas como imaxes" + +# rever +#: ../src/empathy-preferences.ui.h:2 +msgid "Show contact _list in rooms" +msgstr "Mostrar a _lista de contactos nas salas" + +#: ../src/empathy-preferences.ui.h:3 msgid "Appearance" msgstr "Aparencia" -#: ../src/empathy-preferences.ui.h:3 -msgid "Behavior" -msgstr "Comportamento" +#: ../src/empathy-preferences.ui.h:4 +msgid "Start chats in:" +msgstr "Iniciar conversas en:" -# rever #: ../src/empathy-preferences.ui.h:5 -msgid "Chat Th_eme:" -msgstr "T_ema da conversa:" +msgid "new ta_bs" +msgstr "lapelas no_vas" -# rever #: ../src/empathy-preferences.ui.h:6 -msgid "Disable notifications when _away or busy" -msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado" +msgid "new _windows" +msgstr "xan_elas novas" -# rever #: ../src/empathy-preferences.ui.h:7 -msgid "Disable sounds when _away or busy" -msgstr "Desactivar os sons cando se estea _ausente ou ocupado" - -#: ../src/empathy-preferences.ui.h:8 msgid "Display incoming events in the notification area" msgstr "Mostrar os eventos de entrada na área de notificación" +# rever +#: ../src/empathy-preferences.ui.h:8 +msgid "_Automatically connect on startup" +msgstr "_Conectar automaticamente ao iniciar" + #: ../src/empathy-preferences.ui.h:9 -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 "" -"A cancelación de eco axúdalle a facer o son da súa voz máis claro ás outras " -"persoas pero pode causar problemas nalgúns computadores. Se vostede ou outra " -"persoa escoita ruidos estranos ou ten problemas técnicos durante as chamadas " -"tente desactivando a cancelación do eco e reiniciando a chamada." +msgid "Log conversations" +msgstr "Rexistrar conversas" -# rever #: ../src/empathy-preferences.ui.h:10 -msgid "Enable notifications when a contact comes online" -msgstr "Activar as notificacións cando un contacto está conectado" +msgid "Behavior" +msgstr "Comportamento" -# rever #: ../src/empathy-preferences.ui.h:11 -msgid "Enable notifications when a contact goes offline" -msgstr "Activar as notificacións cando un contacto está desconectado" +msgid "General" +msgstr "Xeral" # rever #: ../src/empathy-preferences.ui.h:12 -msgid "Enable notifications when the _chat is not focused" -msgstr "Activar as notificacións cando a _conversa non está enfocada" +msgid "_Enable bubble notifications" +msgstr "_Activar as burbullas de notificación" # rever #: ../src/empathy-preferences.ui.h:13 -msgid "Enable spell checking for languages:" -msgstr "Activar a verificación ortográfica para os idiomas:" +msgid "Disable notifications when _away or busy" +msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado" +# rever #: ../src/empathy-preferences.ui.h:14 -msgid "General" -msgstr "Xeral" +msgid "Enable notifications when the _chat is not focused" +msgstr "Activar as notificacións cando a _conversa non está enfocada" +# rever #: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "Nivel de entrada:" +msgid "Enable notifications when a contact comes online" +msgstr "Activar as notificacións cando un contacto está conectado" +# rever #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "Volume de entrada:" +msgid "Enable notifications when a contact goes offline" +msgstr "Activar as notificacións cando un contacto está desconectado" + +#: ../src/empathy-preferences.ui.h:17 +msgid "Notifications" +msgstr "Notificacións" +# rever #: ../src/empathy-preferences.ui.h:18 -msgid "Location sources:" -msgstr "Fontes de localización:" +msgid "_Enable sound notifications" +msgstr "_Activar as notificacións de son" +# rever #: ../src/empathy-preferences.ui.h:19 -msgid "Log conversations" -msgstr "Rexistrar conversas" - -#: ../src/empathy-preferences.ui.h:20 -msgid "Notifications" -msgstr "Notificacións" +msgid "Disable sounds when _away or busy" +msgstr "Desactivar os sons cando se estea _ausente ou ocupado" # rever -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:20 msgid "Play sound for events" msgstr "Reproducir un son para os eventos" +#: ../src/empathy-preferences.ui.h:21 +msgid "Sounds" +msgstr "Sons" + #: ../src/empathy-preferences.ui.h:22 -msgid "Privacy" -msgstr "Privacidade" +msgid "Use _echo cancellation to improve call quality" +msgstr "Usar cancelación de _eco para mellorar a calidade da chamada" #: ../src/empathy-preferences.ui.h:23 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." +"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 "" -"Unha reducida precisión de localización significa que nada máis preciso que " -"a súa cidade, rexión e país serán publicados. As coordenadas GPS serán " -"aproximadas a 1 valor decimal." - -# rever -#: ../src/empathy-preferences.ui.h:24 -msgid "Show _smileys as images" -msgstr "Mostrar as _emoticonas como imaxes" - -# rever -#: ../src/empathy-preferences.ui.h:25 -msgid "Show contact _list in rooms" -msgstr "Mostrar a _lista de contactos nas salas" +"A cancelación de eco axúdalle a facer o son da súa voz máis claro ás outras " +"persoas pero pode causar problemas nalgúns computadores. Se vostede ou outra " +"persoa escoita ruidos estranos ou ten problemas técnicos durante as chamadas " +"tente desactivando a cancelación do eco e reiniciando a chamada." #: ../src/empathy-preferences.ui.h:26 -msgid "Sounds" -msgstr "Sons" +msgid "_Publish location to my contacts" +msgstr "_Publicar a miña localización aos meus contactos" #: ../src/empathy-preferences.ui.h:27 -msgid "Spell Checking" -msgstr "Verificación ortográfica" - -# rever -#: ../src/empathy-preferences.ui.h:28 msgid "" -"The list of languages reflects only the languages for which you have a " -"dictionary installed." +"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 "" -"A lista de idiomas reflicte só naqueles idiomas para os que ten un " -"dicionario instalado." +"Unha reducida precisión de localización significa que nada máis preciso que " +"a súa cidade, rexión e país serán publicados. As coordenadas GPS serán " +"aproximadas a 1 valor decimal." +#. 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:29 -msgid "Themes" -msgstr "Temas" +msgid "_Reduce location accuracy" +msgstr "_Reducir a precisión de localización" #: ../src/empathy-preferences.ui.h:30 -msgid "Use _echo cancellation to improve call quality" -msgstr "Usar cancelación de _eco para mellorar a calidade da chamada" +msgid "Privacy" +msgstr "Privacidade" #: ../src/empathy-preferences.ui.h:31 -msgid "Variant:" -msgstr "Variante:" +msgid "_GPS" +msgstr "_GPS" # rever #: ../src/empathy-preferences.ui.h:32 -msgid "_Automatically connect on startup" -msgstr "_Conectar automaticamente ao iniciar" - -# rever -#: ../src/empathy-preferences.ui.h:33 msgid "_Cellphone" msgstr "_Teléfono móbil" -# rever +#: ../src/empathy-preferences.ui.h:33 +msgid "_Network (IP, Wi-Fi)" +msgstr "_Rede (IP, Wifi)" + #: ../src/empathy-preferences.ui.h:34 -msgid "_Enable bubble notifications" -msgstr "_Activar as burbullas de notificación" +msgid "Location sources:" +msgstr "Fontes de localización:" # rever -#: ../src/empathy-preferences.ui.h:35 -msgid "_Enable sound notifications" -msgstr "_Activar as notificacións de son" - #: ../src/empathy-preferences.ui.h:36 -msgid "_GPS" -msgstr "_GPS" +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "" +"A lista de idiomas reflicte só naqueles idiomas para os que ten un " +"dicionario instalado." +# rever #: ../src/empathy-preferences.ui.h:37 -msgid "_Network (IP, Wi-Fi)" -msgstr "_Rede (IP, Wifi)" +msgid "Enable spell checking for languages:" +msgstr "Activar a verificación ortográfica para os idiomas:" -# rever #: ../src/empathy-preferences.ui.h:38 -msgid "_Open new chats in separate windows" -msgstr "A_brir as conversas novas en xanelas separadas" +msgid "Spell Checking" +msgstr "Verificación ortográfica" +# rever #: ../src/empathy-preferences.ui.h:39 -msgid "_Publish location to my contacts" -msgstr "_Publicar a miña localización aos meus contactos" +msgid "Chat Th_eme:" +msgstr "T_ema da conversa:" + +#: ../src/empathy-preferences.ui.h:40 +msgid "Variant:" +msgstr "Variante:" -#. 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:41 -msgid "_Reduce location accuracy" -msgstr "_Reducir a precisión de localización" +msgid "Themes" +msgstr "Temas" -#: ../src/empathy-status-icon.ui.h:2 +#: ../src/empathy-status-icon.ui.h:4 msgid "Status" msgstr "Estado" -#: ../src/empathy-status-icon.ui.h:4 +#: ../src/empathy-status-icon.ui.h:5 msgid "_Quit" msgstr "_Saír" -# rever -#: ../src/empathy-streamed-media-window.ui.h:2 -msgid "Call the contact again" -msgstr "Chamar ao contacto de novo" - #: ../src/empathy-streamed-media-window.ui.h:3 -msgid "Camera Off" -msgstr "Cámara desactivada" +msgid "Redial" +msgstr "Remarcación" #: ../src/empathy-streamed-media-window.ui.h:4 -msgid "Camera On" -msgstr "Cámara activada" +msgid "V_ideo" +msgstr "V_ídeo" + +# rever +#: ../src/empathy-streamed-media-window.ui.h:5 +msgid "Video Off" +msgstr "Vídeo desactivado" #: ../src/empathy-streamed-media-window.ui.h:6 -msgid "Disable camera and stop sending video" -msgstr "Desactivar cámara e deter o envío do vídeo" +msgid "Video Preview" +msgstr "Previsualizar o vídeo" +# rever #: ../src/empathy-streamed-media-window.ui.h:7 -msgid "Enable camera and send video" -msgstr "Activar cámara e enviar o vídeo" +msgid "Video On" +msgstr "Vídeo activado" -#: ../src/empathy-streamed-media-window.ui.h:8 -msgid "Enable camera but don't send video" -msgstr "Activar cámara pero non enviar o vídeo" +# rever +#: ../src/empathy-streamed-media-window.ui.h:10 +msgid "Call the contact again" +msgstr "Chamar ao contacto de novo" #: ../src/empathy-streamed-media-window.ui.h:13 -msgid "Preview" -msgstr "Previsualizar" +msgid "Camera Off" +msgstr "Cámara desactivada" #: ../src/empathy-streamed-media-window.ui.h:14 -msgid "Redial" -msgstr "Remarcación" +msgid "Disable camera and stop sending video" +msgstr "Desactivar cámara e deter o envío do vídeo" -#: ../src/empathy-streamed-media-window.ui.h:19 -msgid "V_ideo" -msgstr "V_ídeo" +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Preview" +msgstr "Previsualizar" -# rever -#: ../src/empathy-streamed-media-window.ui.h:21 -msgid "Video Off" -msgstr "Vídeo desactivado" +#: ../src/empathy-streamed-media-window.ui.h:16 +msgid "Enable camera but don't send video" +msgstr "Activar cámara pero non enviar o vídeo" -# rever -#: ../src/empathy-streamed-media-window.ui.h:22 -msgid "Video On" -msgstr "Vídeo activado" +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Camera On" +msgstr "Cámara activada" -#: ../src/empathy-streamed-media-window.ui.h:23 -msgid "Video Preview" -msgstr "Previsualizar o vídeo" +#: ../src/empathy-streamed-media-window.ui.h:18 +msgid "Enable camera and send video" +msgstr "Activar cámara e enviar o vídeo" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Vista de mapa de contactos" @@ -4940,16 +4932,16 @@ msgstr "" "O xestor de conexión seleccionado non é compatíbel coa extensión de " "depuración remota." -#: ../src/empathy-invite-participant-dialog.c:197 -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Invitar participante" -#: ../src/empathy-invite-participant-dialog.c:198 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Seleccione o contacto que quere invitar á conversa:" -#: ../src/empathy-invite-participant-dialog.c:221 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Invitar" @@ -5005,40 +4997,40 @@ msgstr "Depurador de Empathy" msgid "- Empathy Chat Client" msgstr "- Cliente de conversa Empathy" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Responder" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1563 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1572 msgid "Reject" msgstr "Rexeitar" # rever -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1564 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1573 msgid "Answer" msgstr "Responder" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Responder con vídeo" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Declinar" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 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:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Fornecer" @@ -5049,39 +5041,39 @@ msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada." #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196 +#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202 msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2880 +#: ../src/empathy-call-window.c:2936 msgid "On hold" msgstr "En espera" -#: ../src/empathy-call-window.c:2883 +#: ../src/empathy-call-window.c:2939 msgid "Mute" msgstr "Silenciar" -#: ../src/empathy-call-window.c:2885 +#: ../src/empathy-call-window.c:2941 msgid "Duration" msgstr "Duración" # rever #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2888 +#: ../src/empathy-call-window.c:2944 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:3158 +#: ../src/empathy-call-window.c:3214 #, c-format msgid "Your current balance is %s." msgstr "O seu balance actual é %s." -#: ../src/empathy-call-window.c:3162 +#: ../src/empathy-call-window.c:3218 msgid "Sorry, you don’t have enough credit for that call." msgstr "Non ten crédito dabondo para facer esta chamada." -#: ../src/empathy-call-window.c:3164 +#: ../src/empathy-call-window.c:3220 msgid "Top Up" msgstr "Recargar" @@ -5089,6 +5081,116 @@ msgstr "Recargar" msgid "_Match case" msgstr "_Coincidir con capitalización" +# rever +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Engadindo conta nova" + +# rever +#~ msgid "Linked Contacts" +#~ msgstr "Contactos ligados" + +# rever +#~ msgid "Select contacts to link" +#~ msgstr "Seleccione os contactos a ligar" + +#~ msgid "New contact preview" +#~ msgstr "Vista previa do contacto novo" + +#~ msgid "Contacts selected in the list on the left will be linked together." +#~ msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda" + +# rever +#~ msgctxt "Link individual (contextual menu)" +#~ msgid "_Link Contacts…" +#~ msgstr "_Ligar contactos…" + +# rever +#~ msgid "Link Contacts" +#~ msgstr "Ligar contactos" + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink…" +#~ msgstr "_Desligar…" + +#~ msgid "" +#~ "Completely split the displayed linked contacts into the separate contacts." +#~ msgstr "Separar por completo o contacto ligado nos contactos que contén." + +#~ msgid "_Link" +#~ msgstr "_Ligar" + +#~ msgid "Unlink linked contacts '%s'?" +#~ msgstr "Desexa desligar os contactos ligados «%s»?" + +#~ msgid "" +#~ "Are you sure you want to unlink these linked contacts? This will " +#~ "completely split the linked contacts into separate contacts." +#~ msgstr "" +#~ "Está seguro que quere desligar estes contactos ligados? Isto separará por " +#~ "completo os contactos ligados en contactos separados." + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink" +#~ msgstr "_Desligar" + +#~ msgid "Personal Information" +#~ msgstr "Información persoal" + +#~ msgid "_Personal Information" +#~ msgstr "Información _persoal" + +# rever +#~ msgid "_Open new chats in separate windows" +#~ msgstr "A_brir as conversas novas en xanelas separadas" + +#~ msgid "Call volume" +#~ msgstr "Volume da chamada" + +#~ msgid "Call volume, as a percentage." +#~ msgstr "Volume da chamada, como porcentaxe." + +#~ msgid "Socket type not supported" +#~ msgstr "O tipo de socket non é compatíbel" + +# rever +#~ msgid "My Web Accounts" +#~ msgstr "As miñas contas web" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "A conta %s edítase mediante %s." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "Non é posíbel editar a conta %s en Empathy." + +# rever +#~ msgid "Launch My Web Accounts" +#~ msgstr "Iniciar My Web Accounts" + +#~ msgid "Edit %s" +#~ msgstr "Editar %s" + +#~ msgid "Ca_ncel" +#~ msgstr "Ca_ncelar" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "_Editar" + +# rever +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "Vai crear unha conta nova, e descartaranse os seus cambios \n" +#~ "Está seguro de que quere proceder?" + +#~ msgid "Input level:" +#~ msgstr "Nivel de entrada:" + +#~ msgid "Input volume:" +#~ msgstr "Volume de entrada:" + # rever #~ msgid "Contact ID:" #~ msgstr "ID do contacto:" diff --git a/po/he.po b/po/he.po index 6c9ab792..6e0ec53b 100644 --- a/po/he.po +++ b/po/he.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-22 11:36+0200\n" -"PO-Revision-Date: 2011-10-22 11:50+0200\n" +"POT-Creation-Date: 2012-01-27 15:11+0200\n" +"PO-Revision-Date: 2012-01-27 15:12+0200\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: \n" "Language: \n" @@ -38,408 +38,400 @@ msgid "Always open a separate chat window for new chats." msgstr "Always open a separate chat window for new chats." #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "עצמת השמע של השיחה" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "עצמת שמע השיחה באחוזים." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "Camera device" msgstr "Camera device" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 msgid "Camera position" msgstr "מיקום המצלמה" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "Character to add after nickname when using nick completion (tab) in group chat." msgstr "Character to add after nickname when using nick completion (tab) in group chat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 msgid "Chat window theme" msgstr "Chat window theme" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "Chat window theme variant" msgstr "Chat window theme variant" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Compact contact list" msgstr "Compact contact list" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 msgid "Connection managers should be used" msgstr "Connection managers should be used" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Contact list sort criterion" msgstr "Contact list sort criterion" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 msgid "D-Bus object path of the last account selected to join a room." msgstr "D-Bus object path of the last account selected to join a room." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "Default camera device to use in video calls, e.g. /dev/video0." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Default directory to select an avatar image from" msgstr "Default directory to select an avatar image from" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Disable popup notifications when away" msgstr "Disable popup notifications when away" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Disable sounds when away" msgstr "Disable sounds when away" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Display incoming events in the status area" msgstr "Display incoming events in the status area" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "Display incoming events in the status area. If false, present them to the user immediately." msgstr "Display incoming events in the status area. If false, present them to the user immediately." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Echo cancellation support" msgstr "Echo cancellation support" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy can publish the user's location" msgstr "Empathy can publish the user's location" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy can use the GPS to guess the location" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy can use the cellular network to guess the location" msgstr "Empathy can use the cellular network to guess the location" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy can use the network to guess the location" msgstr "Empathy can use the network to guess the location" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Empathy default download folder" msgstr "Empathy default download folder" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Empathy should auto-away when idle" msgstr "Empathy should auto-away when idle" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Empathy should auto-connect on startup" msgstr "Empathy should auto-connect on startup" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Empathy should reduce the location's accuracy" msgstr "Empathy should reduce the location's accuracy" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "Empathy should use the avatar of the contact as the chat window icon" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Enable WebKit Developer Tools" msgstr "Enable WebKit Developer Tools" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Enable popup notifications for new messages" msgstr "Enable popup notifications for new messages" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Enable spell checker" msgstr "Enable spell checker" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Hide main window" msgstr "Hide main window" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Hide the main window." msgstr "Hide the main window." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Last account selected in Join Room dialog" msgstr "Last account selected in Join Room dialog" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Nick completed character" msgstr "Nick completed character" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Open new chats in separate windows" msgstr "Open new chats in separate windows" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Path of the Adium theme to use" msgstr "Path of the Adium theme to use" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "Path of the Adium theme to use if the theme used for chat is Adium." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound for incoming messages" msgstr "Play a sound for incoming messages" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for new conversations" msgstr "Play a sound for new conversations" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for outgoing messages" msgstr "Play a sound for outgoing messages" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Play a sound when a contact logs in" msgstr "Play a sound when a contact logs in" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound when a contact logs out" msgstr "Play a sound when a contact logs out" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when we log in" msgstr "Play a sound when we log in" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound when we log out" msgstr "Play a sound when we log out" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Pop up notifications if the chat isn't focused" msgstr "Pop up notifications if the chat isn't focused" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Pop up notifications when a contact logs in" msgstr "Pop up notifications when a contact logs in" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Pop up notifications when a contact logs out" msgstr "Pop up notifications when a contact logs out" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Position the camera preview should be during a call." msgstr "Position the camera preview should be during a call." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "Show Balance in contact list" msgstr "Show Balance in contact list" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Show avatars" msgstr "Show avatars" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Show contact list in rooms" msgstr "Show contact list in rooms" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Show hint about closing the main window" msgstr "Show hint about closing the main window" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Show offline contacts" msgstr "Show offline contacts" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Show protocols" msgstr "Show protocols" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Spell checking languages" msgstr "Spell checking languages" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "The default folder to save file transfers in." msgstr "The default folder to save file transfers in." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "The last directory that an avatar image was chosen from." msgstr "The last directory that an avatar image was chosen from." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "The position for the chat window side pane" msgstr "The position for the chat window side pane" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "The stored position (in pixels) of the chat window side pane." msgstr "The stored position (in pixels) of the chat window side pane." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "The theme that is used to display the conversation in chat windows." msgstr "The theme that is used to display the conversation in chat windows." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "The theme variant that is used to display the conversation in chat windows." msgstr "The theme variant that is used to display the conversation in chat windows." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "Use graphical smileys" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Use notification sounds" msgstr "Use notification sounds" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use theme for chat rooms" msgstr "Use theme for chat rooms" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "Whether Empathy can publish the user's location to their contacts." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Whether Empathy can use the GPS to guess the location." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "Whether Empathy can use the cellular network to guess the location." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether Empathy can use the network to guess the location." msgstr "Whether Empathy can use the network to guess the location." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "Whether Empathy should automatically log into your accounts on startup." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "Whether Empathy should go into away mode automatically if the user is idle." msgstr "Whether Empathy should go into away mode automatically if the user is idle." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "Whether Empathy should reduce the location's accuracy for privacy reasons." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "Whether Empathy should use the avatar of the contact as the chat window icon." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "Whether WebKit developer tools, such as the Web Inspector, should be enabled." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "Whether connectivity managers should be used to automatically disconnect/reconnect." msgstr "Whether connectivity managers should be used to automatically disconnect/reconnect." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "Whether to check words typed against the languages you want to check with." msgstr "Whether to check words typed against the languages you want to check with." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Whether to convert smileys into graphical images in conversations." msgstr "Whether to convert smileys into graphical images in conversations." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "Whether to enable Pulseaudio's echo cancellation filter." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "Whether to play a sound to notify of contacts logging into the network." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "Whether to play a sound to notify of contacts logging out of the network." msgstr "Whether to play a sound to notify of contacts logging out of the network." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Whether to play a sound to notify of events." msgstr "Whether to play a sound to notify of events." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to play a sound to notify of incoming messages." msgstr "Whether to play a sound to notify of incoming messages." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Whether to play a sound to notify of new conversations." msgstr "Whether to play a sound to notify of new conversations." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to play a sound to notify of outgoing messages." msgstr "Whether to play a sound to notify of outgoing messages." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Whether to play a sound when logging into a network." msgstr "Whether to play a sound when logging into a network." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to play a sound when logging out of a network." msgstr "Whether to play a sound when logging out of a network." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to play sound notifications when away or busy." msgstr "Whether to play sound notifications when away or busy." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to show a popup notification when a contact goes offline." msgstr "Whether to show a popup notification when a contact goes offline." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Whether to show a popup notification when a contact goes online." msgstr "Whether to show a popup notification when a contact goes online." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused." msgstr "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Whether to show a popup notification when receiving a new message." msgstr "Whether to show a popup notification when receiving a new message." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Whether to show account balances in the contact list." msgstr "Whether to show account balances in the contact list." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "Whether to show avatars for contacts in the contact list and chat windows." msgstr "Whether to show avatars for contacts in the contact list and chat windows." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Whether to show contacts that are offline in the contact list." msgstr "Whether to show contacts that are offline in the contact list." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Whether to show popup notifications when away or busy." msgstr "Whether to show popup notifications when away or busy." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to show protocols for contacts in the contact list." msgstr "Whether to show protocols for contacts in the contact list." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Whether to show the contact list in chat rooms." msgstr "Whether to show the contact list in chat rooms." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "Whether to show the contact list in compact mode." msgstr "Whether to show the contact list in compact mode." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar." msgstr "Whether to show the message dialog about closing the main window with the 'x' button in the title bar." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether to use the theme for chat rooms." msgstr "Whether to use the theme for chat rooms." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 -msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state." -msgstr "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name." +msgstr "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name." #: ../data/empathy-accounts.desktop.in.in.h:1 msgid "Manage Messaging and VoIP accounts" @@ -447,23 +439,52 @@ msgstr "ניהול חשבונות התכתבות ו־VoIP" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2324 +#: ../src/empathy-accounts-dialog.c:2327 msgid "Messaging and VoIP Accounts" msgstr "חשבונות התכתבות ו־VoIP" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "לא צוינה סיבה" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "התבקש שינוי המצב" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "ביטלת את ההעברה" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "המשתתף האחר ביטל את העברת הקובץ" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "התרחשה שגיאה בזמן ניסיון העברת הקובץ" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "המשתתף האחר לא יכול להעביר את הקובץ" + +#: ../libempathy/empathy-ft-handler.c:754 +#: ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "סיבה לא ידועה" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "העברת קובץ הושלמה, אך הקובץ היה פגום" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "העברת קבצים לא נתמכת על ידי איש הקשר המרוחק" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "הקובץ הנבחר אינו קובץ רגיל" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "הקובץ הנבחר ריק" @@ -484,344 +505,287 @@ msgstr "התקשרת ל%s" msgid "Call from %s" msgstr "שיחה מאת %s" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "סוג השקע אינו נתמך" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "לא צוינה סיבה" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "התבקש שינוי המצב" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "ביטלת את ההעברה" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "המשתתף האחר ביטל את העברת הקובץ" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "התרחשה שגיאה בזמן ניסיון העברת הקובץ" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "המשתתף האחר לא יכול להעביר את הקובץ" - -#: ../libempathy/empathy-tp-file.c:395 -#: ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "סיבה לא ידועה" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "זמין" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "עסוק" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "מרוחק" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "בלתי נראה" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "לא מחובר" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "לא ידוע" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "לא צויינה סיבה" -#: ../libempathy/empathy-utils.c:286 -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 +#: ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "המצב מוגדר כמנותק" -#: ../libempathy/empathy-utils.c:288 -#: ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 +#: ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "שגיאת רשת" -#: ../libempathy/empathy-utils.c:290 -#: ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 +#: ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "האימות נכשל" -#: ../libempathy/empathy-utils.c:292 -#: ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "שגיאת הצפנה" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "השם בשימוש" -#: ../libempathy/empathy-utils.c:296 -#: ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "לא סופקה תעודה" -#: ../libempathy/empathy-utils.c:298 -#: ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 +#: ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "התעודה אינה מאובטחת" -#: ../libempathy/empathy-utils.c:300 -#: ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 +#: ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "התעודה לא תקפה" -#: ../libempathy/empathy-utils.c:302 -#: ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 +#: ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "התעודה אינה פעילה" -#: ../libempathy/empathy-utils.c:304 -#: ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 +#: ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "שם המארח בתעודה לא תואם" -#: ../libempathy/empathy-utils.c:306 -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 +#: ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "טביעת האצבע של התעודה אינה תואמת" -#: ../libempathy/empathy-utils.c:308 -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 +#: ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "תעודה בחתימה עצמית" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "שגיאת תעודה" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "אין הצפנה זמינה" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "התעודה שגויה" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "החיבור נתקל בסירוב" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "לא ניתן לקיים את החיבור" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "החיבור נקטע" -#: ../libempathy/empathy-utils.c:354 +#: ../libempathy/empathy-utils.c:355 msgid "This resource is already connected to the server" msgstr "המשאב כבר מחובר לשרת" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 msgid "Connection has been replaced by a new connection using the same resource" msgstr "החיבור הוחלף בחיבור חדש באמצעות אותו המשאב" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "החשבון כבר קיים בשרת" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "השרת עסוק מכדי לטפל בחיבור" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "התעודה נשללה" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "התעודה משתמשת באלגוריתם הצפנה בלתי מאובטח או שהוא חלש מבחינה קריפטוגרפית" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:369 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library" msgstr "אורך אישור האבטחה של השרת או עומק מחרוזת אישור האבטחה של השרת חורגים מהמגבלות שהוצבו על ידי ספריית ההצפנה" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:373 msgid "Your software is too old" msgstr "התכנה שלך ישנה מדי" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "שגיאה פנימית" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "אנשים בקרבתי" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "‏Yahoo! יפן" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "צ׳אט Facebook" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "לפני שנייה" msgstr[1] "לפני %d שניות" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "לפני דקה" msgstr[1] "לפני %d דקות" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "לפני שעה" msgstr[1] "לפני %d שעות" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "לפני יום" msgstr[1] "לפני %d ימים" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "לפני שבוע" msgstr[1] "לפני %d שבועות" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "לפני חודש" msgstr[1] "לפני %d חודשים" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "בעתיד" -#: ../libempathy-gtk/empathy-account-chooser.c:540 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "כל החשבונות" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "חשבון" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "ססמה" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "שרת" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "פתחה" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:763 +#: ../libempathy-gtk/empathy-account-widget.c:815 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -msgid "My Web Accounts" -msgstr "החשבונות המקוונים שלי" - -#: ../libempathy-gtk/empathy-account-widget.c:1209 -#, c-format -msgid "The account %s is edited via %s." -msgstr "החשבון %s נערך דרך %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1215 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "לא ניתן לערוך את החשבון %s ב־Empathy." - -#: ../libempathy-gtk/empathy-account-widget.c:1234 -msgid "Launch My Web Accounts" -msgstr "טעינת החשבונות המקוונים שלי" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1242 -#, c-format -msgid "Edit %s" -msgstr "עריכת %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1592 +#: ../libempathy-gtk/empathy-account-widget.c:1396 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "ש_ם משתמש:" -#: ../libempathy-gtk/empathy-account-widget.c:1910 +#: ../libempathy-gtk/empathy-account-widget.c:1708 msgid "A_pply" msgstr "ה_חלה" -#: ../libempathy-gtk/empathy-account-widget.c:1940 +#: ../libempathy-gtk/empathy-account-widget.c:1737 msgid "L_og in" msgstr "_כניסה" -#: ../libempathy-gtk/empathy-account-widget.c:2014 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "חשבון זה כבר קיים על השרת" -#: ../libempathy-gtk/empathy-account-widget.c:2017 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "יצירת חשבון חדש על השרת" -#: ../libempathy-gtk/empathy-account-widget.c:2209 -msgid "Ca_ncel" -msgstr "_ביטול" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2487 +#: ../libempathy-gtk/empathy-account-widget.c:2239 #, c-format msgid "%1$s on %2$s" msgstr "‏%1$s על גבי %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2513 +#: ../libempathy-gtk/empathy-account-widget.c:2265 #, c-format msgid "%s Account" msgstr "חשבון %s" -#: ../libempathy-gtk/empathy-account-widget.c:2517 +#: ../libempathy-gtk/empathy-account-widget.c:2269 msgid "New account" msgstr "חשבון חדש" @@ -869,7 +833,7 @@ msgstr "שמירת הססמה" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 msgid "Remember password" msgstr "שמירת הססמה" @@ -1188,7 +1152,7 @@ msgid "STUN Server:" msgstr "שרת STUN:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 msgid "Server:" msgstr "שרת:" @@ -1294,188 +1258,189 @@ msgstr "אין תמיכה בשיחות חירום בפרוטוקול זה" msgid "You don't have enough credit in order to place this call" msgstr "אין לך די אשראי כדי לבצע שיחה זו" -#: ../libempathy-gtk/empathy-chat.c:706 +#: ../libempathy-gtk/empathy-chat.c:710 msgid "Failed to open private chat" msgstr "ארע כשל בפתיחת שיחה פרטית" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:768 msgid "Topic not supported on this conversation" msgstr "אין תמיכה בשימוש בנושא בדיון זה" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:774 msgid "You are not allowed to change the topic" msgstr "אין לך הרשאה לשנות את הנושא" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:973 #, c-format msgid "“%s” is not a valid contact ID" msgstr "\"%s\" אינו מזהה איש קשר לא תקין" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1068 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: פינוי כל ההודעות מהדיון הנוכחי" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/topic : set the topic of the current conversation" msgstr "/topic <נושא>:‎ הגדרת נושא השיחה הנוכחית" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1074 msgid "/join : join a new chat room" msgstr "/join <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1077 msgid "/j : join a new chat room" msgstr "/j <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "/part [] []: leave the chat room, by default the current one" msgstr "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ השיחה, הנוכחי הוא בררת המחדל" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/query []: open a private chat" msgstr "/query <זיהוי איש הקשר> ‎[<הודעה>]:‎ פתיחת צ׳אט אישי" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/msg : open a private chat" msgstr "/msg <זיהוי איש הקשר>‎ <הודעה>:‎ פתיחת צ׳אט פרטי" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/nick : change your nickname on the current server" msgstr "/nick <כינוי>:‎ שינוי הכינוי שלך בשרת הנוכחי" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/me : send an ACTION message to the current conversation" msgstr "/me <הודעה>:‎ שליחת הודעת ACTION לדיון הנוכחי" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1097 msgid "/say : send to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\"" msgstr "/say <הודעה>:‎ שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\"" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "/whois : display information about a contact" msgstr "/whois <מזהה המשתמש>:‎ הצגת פרטים על איש הקשר" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1105 msgid "/help []: show all supported commands. If is defined, show its usage." msgstr "/help [<פקודה>]:‎ הצגת כל הפקודות הנתמכות. אם יש הגדרה ל־<פקודה> יוצג אופן הפעלתה." -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1124 #, c-format msgid "Usage: %s" msgstr "שימוש: %s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1169 msgid "Unknown command" msgstr "פקודה לא ידועה" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1295 msgid "Unknown command; see /help for the available commands" msgstr "פקודה בלתי מוכרת; יש לעיין ב־‎/help לצפייה בפקודות הזמינות" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1541 msgid "insufficient balance to send message" msgstr "המאזן אינו מאפשר לשלוח הודעה" -#: ../libempathy-gtk/empathy-chat.c:1461 -#: ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1545 +#: ../libempathy-gtk/empathy-chat.c:1559 +#: ../libempathy-gtk/empathy-chat.c:1622 #, c-format msgid "Error sending message '%s': %s" msgstr "שגיאה בשליחת ההודעה '%s': ‏%s" -#: ../libempathy-gtk/empathy-chat.c:1463 -#: ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1547 +#: ../libempathy-gtk/empathy-chat.c:1564 +#: ../libempathy-gtk/empathy-chat.c:1626 #, c-format msgid "Error sending message: %s" msgstr "שגיאה בשליחת ההודעה: ‏%s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1469 +#: ../libempathy-gtk/empathy-chat.c:1553 #, c-format msgid "insufficient balance to send message. Top up." msgstr "המאזן אינו מאפשר לשלוח הודעה. Top up." -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1593 msgid "not capable" msgstr "ללא יכולת" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1600 msgid "offline" msgstr "לא מחובר" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1603 msgid "invalid contact" msgstr "איש קשר לא תקין" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1606 msgid "permission denied" msgstr "איש קשר לא תקין" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1609 msgid "too long message" msgstr "הודעה ארוכה מדי" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "not implemented" msgstr "לא ממומש" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "unknown" msgstr "לא ידוע" -#: ../libempathy-gtk/empathy-chat.c:1599 +#: ../libempathy-gtk/empathy-chat.c:1683 #: ../src/empathy-chat-window.c:761 msgid "Topic:" msgstr "נושא:" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1695 #, c-format msgid "Topic set to: %s" msgstr "הנושא הוגדר ל־: %s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1698 msgid "No topic defined" msgstr "לא נקבע נושא" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2214 msgid "(No Suggestions)" msgstr "(אין הצעות)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2282 #, c-format msgid "Add '%s' to Dictionary" msgstr "הוספת '%s' למילון" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2319 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "הוספת '%s' למילון %s" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2389 msgid "Insert Smiley" msgstr "הכנס סמיילי" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 -#: ../libempathy-gtk/empathy-ui-utils.c:1843 +#: ../libempathy-gtk/empathy-chat.c:2407 +#: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "_שלח" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2373 +#: ../libempathy-gtk/empathy-chat.c:2464 msgid "_Spelling Suggestions" msgstr "הצעות _איות" -#: ../libempathy-gtk/empathy-chat.c:2462 +#: ../libempathy-gtk/empathy-chat.c:2553 msgid "Failed to retrieve recent logs" msgstr "ארע כשל בקבלת הדוחות האחרונים" -#: ../libempathy-gtk/empathy-chat.c:2599 +#: ../libempathy-gtk/empathy-chat.c:2692 #, c-format msgid "%s has disconnected" msgstr "‏%s התנתק" @@ -1483,12 +1448,12 @@ msgstr "‏%s התנתק" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2606 +#: ../libempathy-gtk/empathy-chat.c:2699 #, c-format msgid "%1$s was kicked by %2$s" msgstr "‏%1$s סולק על ידי %2$s" -#: ../libempathy-gtk/empathy-chat.c:2609 +#: ../libempathy-gtk/empathy-chat.c:2702 #, c-format msgid "%s was kicked" msgstr "‏%s סולק" @@ -1496,17 +1461,17 @@ msgstr "‏%s סולק" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2617 +#: ../libempathy-gtk/empathy-chat.c:2710 #, c-format msgid "%1$s was banned by %2$s" msgstr "‏%1$s נחסם על ידי %2$s" -#: ../libempathy-gtk/empathy-chat.c:2620 +#: ../libempathy-gtk/empathy-chat.c:2713 #, c-format msgid "%s was banned" msgstr "‏%s נחסם" -#: ../libempathy-gtk/empathy-chat.c:2624 +#: ../libempathy-gtk/empathy-chat.c:2717 #, c-format msgid "%s has left the room" msgstr "‏%s עזב את החדר" @@ -1516,17 +1481,17 @@ msgstr "‏%s עזב את החדר" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2633 +#: ../libempathy-gtk/empathy-chat.c:2726 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2658 +#: ../libempathy-gtk/empathy-chat.c:2751 #, c-format msgid "%s has joined the room" msgstr "‏%s הצטרף לחדר" -#: ../libempathy-gtk/empathy-chat.c:2683 +#: ../libempathy-gtk/empathy-chat.c:2776 #, c-format msgid "%s is now known as %s" msgstr "‏%s נודע כעת בכינוי %s" @@ -1534,90 +1499,91 @@ msgstr "‏%s נודע כעת בכינוי %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2836 -#: ../src/empathy-streamed-media-window.c:1895 -#: ../src/empathy-event-manager.c:1260 -#: ../src/empathy-call-window.c:1535 -#: ../src/empathy-call-window.c:1585 +#: ../libempathy-gtk/empathy-chat.c:2963 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 +#: ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 #: ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "מנותק" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3482 +#: ../libempathy-gtk/empathy-chat.c:3627 msgid "Would you like to store this password?" msgstr "האם ברצונך לאחסן ססמה זו?" -#: ../libempathy-gtk/empathy-chat.c:3488 +#: ../libempathy-gtk/empathy-chat.c:3633 msgid "Remember" msgstr "שמירה" -#: ../libempathy-gtk/empathy-chat.c:3498 +#: ../libempathy-gtk/empathy-chat.c:3643 msgid "Not now" msgstr "לא כעת" -#: ../libempathy-gtk/empathy-chat.c:3542 +#: ../libempathy-gtk/empathy-chat.c:3687 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "ניסיון חוזר" -#: ../libempathy-gtk/empathy-chat.c:3546 +#: ../libempathy-gtk/empathy-chat.c:3691 msgid "Wrong password; please try again:" msgstr "ססמה שגויה; נא לנסות שוב:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3676 +#: ../libempathy-gtk/empathy-chat.c:3821 msgid "This room is protected by a password:" msgstr "חדר זה מוגן בססמה:" -#: ../libempathy-gtk/empathy-chat.c:3703 +#: ../libempathy-gtk/empathy-chat.c:3848 msgid "Join" msgstr "הצטרפות" -#: ../libempathy-gtk/empathy-chat.c:3891 -#: ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:4040 +#: ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "מחובר" -#: ../libempathy-gtk/empathy-chat.c:3946 +#: ../libempathy-gtk/empathy-chat.c:4095 msgid "Conversation" msgstr "שיחה" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3951 +#: ../libempathy-gtk/empathy-chat.c:4100 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "המזהה אינו ידוע או שגוי" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "חסימת אנשי קשר אינה זמינה כרגע" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "חסימת אנשי קשר אינה זמינה" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "ההרשאה נדחתה" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "לא ניתן לחסום את איש הקשר" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "עריכת אנשי הקשר החסומים" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1441 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" @@ -1635,416 +1601,306 @@ msgid "Remove" msgstr "הסרה" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "העתקת _מיקום הקישור" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 +#: ../libempathy-gtk/empathy-chat-text-view.c:329 #: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "_פתיחת קישור" -#. Translators: timestamp displayed between conversations in -#. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 -msgid "%A %B %d %Y" -msgstr "%A %d ב%B %Y" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "עריכת מידע איש קשר" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 -msgid "Personal Information" -msgstr "מידע אישי" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 -msgid "New Contact" -msgstr "איש קשר חדש" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 -#, c-format -msgid "Block %s?" -msgstr "האם לחסום את %s?" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 -#, c-format -msgid "Are you sure you want to block '%s' from contacting you again?" -msgstr "האם אכן ברצונך לחסום את אפשרות ההתקשרות של '%s' אליך?" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 -msgid "_Block" -msgstr "ח_סימה" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 -msgid "_Report this contact as abusive" -msgid_plural "_Report these contacts as abusive" -msgstr[0] "_דיווח על משתמש זה כמטרידן" -msgstr[1] "_דיווח על משתמשים אלה כמטרידנים" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "ה_חלטה מאוחר יותר" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 -msgid "Subscription Request" -msgstr "בקשת הצטרפות" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 -msgid "_Block User" -msgstr "_חסימת משתמש" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1935 -#: ../libempathy-gtk/empathy-individual-view.c:2375 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "האם להסיר את הקבוצה '%s'?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1937 -#: ../libempathy-gtk/empathy-individual-view.c:2378 -msgid "Removing group" -msgstr "הקבוצה מוסרת" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-contact-list-view.c:2063 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 -msgid "_Remove" -msgstr "ה_סרה" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2016 -#: ../libempathy-gtk/empathy-individual-view.c:2500 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "להסיר את איש הקשר '%s'?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2018 -#: ../libempathy-gtk/empathy-individual-view.c:2521 -msgid "Removing contact" -msgstr "איש קשר מוסר" - -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "הוספת _איש קשר…" - -#: ../libempathy-gtk/empathy-contact-menu.c:292 -msgid "_Block Contact" -msgstr "ח_סימת איש קשר" - -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:321 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../libempathy-gtk/empathy-new-message-dialog.c:320 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "_שיחה" - -#: ../libempathy-gtk/empathy-contact-menu.c:353 -#: ../libempathy-gtk/empathy-individual-menu.c:850 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "שיחה _קולית" - -#: ../libempathy-gtk/empathy-contact-menu.c:386 -#: ../libempathy-gtk/empathy-individual-menu.c:895 -msgctxt "menu item" -msgid "_Video Call" -msgstr "שיחת _וידאו" +#. Translators: timestamp displayed between conversations in +#. * chat windows (strftime format string) +#: ../libempathy-gtk/empathy-chat-text-view.c:417 +msgid "%A %B %d %Y" +msgstr "%A %d ב%B %Y" -#: ../libempathy-gtk/empathy-contact-menu.c:432 -#: ../libempathy-gtk/empathy-individual-menu.c:948 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "שיחות _קודמות" +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +msgid "New Contact" +msgstr "איש קשר חדש" -#: ../libempathy-gtk/empathy-contact-menu.c:454 -#: ../libempathy-gtk/empathy-individual-menu.c:989 -msgid "Send File" -msgstr "שליחת קובץ" +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 +#, c-format +msgid "Block %s?" +msgstr "האם לחסום את %s?" -#: ../libempathy-gtk/empathy-contact-menu.c:477 -#: ../libempathy-gtk/empathy-individual-menu.c:1031 -msgid "Share My Desktop" -msgstr "שיתוף שולחן העבודה שלי" +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#, c-format +msgid "Are you sure you want to block '%s' from contacting you again?" +msgstr "האם אכן ברצונך לחסום את אפשרות ההתקשרות של '%s' אליך?" -#: ../libempathy-gtk/empathy-contact-menu.c:506 -#: ../libempathy-gtk/empathy-individual-menu.c:1094 -msgid "Infor_mation" -msgstr "_מידע" +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +msgid "_Block" +msgstr "ח_סימה" -#: ../libempathy-gtk/empathy-contact-menu.c:552 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "ע_ריכה" +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +msgid "_Report this contact as abusive" +msgid_plural "_Report these contacts as abusive" +msgstr[0] "_דיווח על משתמש זה כמטרידן" +msgstr[1] "_דיווח על משתמשים אלה כמטרידנים" -#: ../libempathy-gtk/empathy-contact-menu.c:606 -#: ../libempathy-gtk/empathy-individual-menu.c:1285 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "מזמין/ה אותך לחדר זה" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 +msgid "Decide _Later" +msgstr "ה_חלטה מאוחר יותר" -#: ../libempathy-gtk/empathy-contact-menu.c:637 -#: ../libempathy-gtk/empathy-individual-menu.c:1331 -msgid "_Invite to Chat Room" -msgstr "ה_זמנה לחדר שיחה" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 +msgid "Subscription Request" +msgstr "בקשת הצטרפות" + +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "_Block User" +msgstr "_חסימת משתמש" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "חיפוש בין אנשי הקשר" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "חיפוש:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "הוספת _איש קשר" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "לא נמצאו אנשי קשר" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "ההודעה המציגה אותך:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "נא לאפשר לי לראות מתי מצבך הוא מחובר. תודה!" -#: ../libempathy-gtk/empathy-contact-widget.c:502 +#: ../libempathy-gtk/empathy-contact-widget.c:568 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "ערוצים:" -#: ../libempathy-gtk/empathy-contact-widget.c:797 -#: ../libempathy-gtk/empathy-individual-widget.c:421 +#: ../libempathy-gtk/empathy-contact-widget.c:748 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "קוד המדינה בתקן ISO:" -#: ../libempathy-gtk/empathy-contact-widget.c:799 -#: ../libempathy-gtk/empathy-individual-widget.c:423 +#: ../libempathy-gtk/empathy-contact-widget.c:750 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "ארץ:" -#: ../libempathy-gtk/empathy-contact-widget.c:801 -#: ../libempathy-gtk/empathy-individual-widget.c:425 +#: ../libempathy-gtk/empathy-contact-widget.c:752 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "מדינה:" -#: ../libempathy-gtk/empathy-contact-widget.c:803 -#: ../libempathy-gtk/empathy-individual-widget.c:427 +#: ../libempathy-gtk/empathy-contact-widget.c:754 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "עיר:" -#: ../libempathy-gtk/empathy-contact-widget.c:805 -#: ../libempathy-gtk/empathy-individual-widget.c:429 +#: ../libempathy-gtk/empathy-contact-widget.c:756 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "אזור:" -#: ../libempathy-gtk/empathy-contact-widget.c:807 -#: ../libempathy-gtk/empathy-individual-widget.c:431 +#: ../libempathy-gtk/empathy-contact-widget.c:758 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "מיקוד:" -#: ../libempathy-gtk/empathy-contact-widget.c:809 -#: ../libempathy-gtk/empathy-individual-widget.c:433 +#: ../libempathy-gtk/empathy-contact-widget.c:760 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "רחוב:" -#: ../libempathy-gtk/empathy-contact-widget.c:811 -#: ../libempathy-gtk/empathy-individual-widget.c:435 +#: ../libempathy-gtk/empathy-contact-widget.c:762 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "מבנה:" -#: ../libempathy-gtk/empathy-contact-widget.c:813 -#: ../libempathy-gtk/empathy-individual-widget.c:437 +#: ../libempathy-gtk/empathy-contact-widget.c:764 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "קומה:" -#: ../libempathy-gtk/empathy-contact-widget.c:815 -#: ../libempathy-gtk/empathy-individual-widget.c:439 +#: ../libempathy-gtk/empathy-contact-widget.c:766 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "חדר:" -#: ../libempathy-gtk/empathy-contact-widget.c:817 -#: ../libempathy-gtk/empathy-individual-widget.c:441 +#: ../libempathy-gtk/empathy-contact-widget.c:768 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "טקסט:" -#: ../libempathy-gtk/empathy-contact-widget.c:819 -#: ../libempathy-gtk/empathy-individual-widget.c:443 +#: ../libempathy-gtk/empathy-contact-widget.c:770 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "תיאור:" -#: ../libempathy-gtk/empathy-contact-widget.c:821 -#: ../libempathy-gtk/empathy-individual-widget.c:445 +#: ../libempathy-gtk/empathy-contact-widget.c:772 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "כתובת:" -#: ../libempathy-gtk/empathy-contact-widget.c:823 -#: ../libempathy-gtk/empathy-individual-widget.c:447 +#: ../libempathy-gtk/empathy-contact-widget.c:774 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "רמת דיוק:" -#: ../libempathy-gtk/empathy-contact-widget.c:825 -#: ../libempathy-gtk/empathy-individual-widget.c:449 +#: ../libempathy-gtk/empathy-contact-widget.c:776 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "שגיאה:" -#: ../libempathy-gtk/empathy-contact-widget.c:827 -#: ../libempathy-gtk/empathy-individual-widget.c:451 +#: ../libempathy-gtk/empathy-contact-widget.c:778 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "סטייה אנכית (מטרים):" -#: ../libempathy-gtk/empathy-contact-widget.c:829 -#: ../libempathy-gtk/empathy-individual-widget.c:453 +#: ../libempathy-gtk/empathy-contact-widget.c:780 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "סטייה אופקית (מטרים):" -#: ../libempathy-gtk/empathy-contact-widget.c:831 -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-contact-widget.c:782 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "מהירות:" -#: ../libempathy-gtk/empathy-contact-widget.c:833 -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-contact-widget.c:784 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "אזימוט:" -#: ../libempathy-gtk/empathy-contact-widget.c:835 -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-contact-widget.c:786 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "מהירות הטיפוס:" -#: ../libempathy-gtk/empathy-contact-widget.c:837 -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-contact-widget.c:788 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "עדכון אחרון ב־:" -#: ../libempathy-gtk/empathy-contact-widget.c:839 -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-contact-widget.c:790 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "קו אורך:" -#: ../libempathy-gtk/empathy-contact-widget.c:841 -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-contact-widget.c:792 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "קו רוחב:" -#: ../libempathy-gtk/empathy-contact-widget.c:843 -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-contact-widget.c:794 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "גובה:" -#: ../libempathy-gtk/empathy-contact-widget.c:896 -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:559 -#: ../libempathy-gtk/empathy-individual-widget.c:574 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:847 +#: ../libempathy-gtk/empathy-contact-widget.c:862 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:15 msgid "Location" msgstr "מיקום" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:576 +#: ../libempathy-gtk/empathy-contact-widget.c:864 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:965 -#: ../libempathy-gtk/empathy-individual-widget.c:625 +#: ../libempathy-gtk/empathy-contact-widget.c:916 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "‏%B %e, %Y ב־‏%R ‏UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1047 -#: ../libempathy-gtk/empathy-individual-widget.c:867 +#: ../libempathy-gtk/empathy-contact-widget.c:998 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "שמירת תמונה אישית" -#: ../libempathy-gtk/empathy-contact-widget.c:1103 -#: ../libempathy-gtk/empathy-individual-widget.c:925 +#: ../libempathy-gtk/empathy-contact-widget.c:1054 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "לא ניתן לשמור תמונה אישית" -#: ../libempathy-gtk/empathy-contact-widget.c:1787 -#: ../libempathy-gtk/empathy-individual-menu.c:1066 -#: ../libempathy-gtk/empathy-individual-widget.c:1324 -msgid "Favorite" -msgstr "מועדף" - -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 msgid "Full name" msgstr "שם מלא" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 msgid "Phone number" msgstr "מספר טלפון" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 msgid "E-mail address" msgstr "כתובת דוא״ל" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Website" msgstr "אתר אינטרנט" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Birthday" msgstr "יום הולדת" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Last seen:" msgstr "צפייה אחרונה:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 msgid "Connected from:" msgstr "מחובר דרך:" #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 msgid "Away message:" msgstr "הודעת התרחקות:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "work" msgstr "עבודה" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 msgid "home" msgstr "בית" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 msgid "mobile" msgstr "ֹסלולרי" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 msgid "voice" msgstr "קול" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 msgid "preferred" msgstr "מועדף" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 msgid "postal" msgstr "מיקוד" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 msgid "parcel" msgstr "כתובת למשלוחים" @@ -2054,7 +1910,7 @@ msgstr "מיקום ב(תאריך)\t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1260 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "כינוי:" @@ -2074,7 +1930,7 @@ msgstr "פרטי איש קשר" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1469 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "מזהה:" @@ -2091,118 +1947,203 @@ msgstr "מערכת הפעלה:" msgid "Version:" msgstr "גרסה:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "קבוצות" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups." msgstr "יש לבחור את הקבוצות בהן אתה מעוניין שאיש קשר זה יופיע. ניתן לבחור ביותר מקבוצה אחת או לא לבחור קבוצות בכלל." -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "הוס_פת קבוצה" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "בחירה" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1967 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1919 msgid "Group" msgstr "קבוצה" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "הזהות הבאה תיחסם:" msgstr[1] "בעלי הזהות הבאים ייחסמו:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "לא ניתן לחסום את הזהות הבאה:" msgstr[1] "לא ניתן לחסום את בעלי הזהות הבאים:" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "עריכת מידע איש קשר" + #. Translators: the heading at the top of the Information dialogue #: ../libempathy-gtk/empathy-individual-information-dialog.c:288 msgid "Linked Contacts" msgstr "אנשי קשר מקושרים" -#: ../libempathy-gtk/empathy-individual-linker.c:370 +#: ../libempathy-gtk/empathy-individual-linker.c:372 msgid "Select contacts to link" msgstr "בחירת אנשי קשר לקישור" -#: ../libempathy-gtk/empathy-individual-linker.c:444 +#: ../libempathy-gtk/empathy-individual-linker.c:447 msgid "New contact preview" msgstr "תצוגה מקדימה של איש קשר חדש" -#: ../libempathy-gtk/empathy-individual-linker.c:488 +#: ../libempathy-gtk/empathy-individual-linker.c:491 msgid "Contacts selected in the list on the left will be linked together." msgstr "אנשי הקשר שנבחרו ברשימה שמימין יקושרו זה לזה." #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:145 +#: ../libempathy-gtk/empathy-individual-menu.c:181 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:363 msgid "Select account to use to place the call" msgstr "נא לבחור את החשבון לשימוש לצורך ההתקשרות" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 +#: ../libempathy-gtk/empathy-individual-menu.c:367 #: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1300 +#: ../src/empathy-streamed-media-window.c:1288 #: ../src/empathy-call-window.ui.h:2 msgid "Call" msgstr "התקשרות" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:432 msgid "Mobile" msgstr "סלולרי" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:434 msgid "Work" msgstr "עבודה" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:436 msgid "HOME" msgstr "בית" +#: ../libempathy-gtk/empathy-individual-menu.c:677 +msgid "_Block Contact" +msgstr "ח_סימת איש קשר" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "_Chat" +msgstr "_שיחה" + #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:805 -#: ../libempathy-gtk/empathy-new-message-dialog.c:314 +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1143 +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "שיחה _קולית" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +msgctxt "menu item" +msgid "_Video Call" +msgstr "שיחת _וידאו" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "_Previous Conversations" +msgstr "שיחות _קודמות" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +msgid "Send File" +msgstr "שליחת קובץ" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "שיתוף שולחן העבודה שלי" + +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "מועדף" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "_מידע" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "ע_ריכה" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1169 +#: ../libempathy-gtk/empathy-individual-menu.c:1385 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "_קישור אנשי קשר…" -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1011 +msgid "Inviting you to this room" +msgstr "מזמין/ה אותך לחדר זה" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +msgid "_Invite to Chat Room" +msgstr "ה_זמנה לחדר שיחה" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Add Contact…" +msgstr "הוספת _איש קשר…" + +#: ../libempathy-gtk/empathy-individual-view.c:2301 msgid "Delete and _Block" msgstr "מחיקה ו_חסימה" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +#: ../libempathy-gtk/empathy-individual-view.c:2336 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "האם להסיר את הקבוצה '%s'?" + +#: ../libempathy-gtk/empathy-individual-view.c:2339 +msgid "Removing group" +msgstr "הקבוצה מוסרת" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2394 +#: ../libempathy-gtk/empathy-individual-view.c:2611 +msgid "_Remove" +msgstr "ה_סרה" + +#: ../libempathy-gtk/empathy-individual-view.c:2471 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "להסיר את איש הקשר '%s'?" + +#: ../libempathy-gtk/empathy-individual-view.c:2480 #, c-format msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact." msgstr "האם אכן ברצונך להסיר את איש הקשר המקושר '%s'? נא לשים לב שפעולה זו תסיר את כל אנשי הקשר המתאגדים לאיש קשר מקושר זה." -#: ../libempathy-gtk/empathy-individual-widget.c:1608 +#: ../libempathy-gtk/empathy-individual-view.c:2492 +msgid "Removing contact" +msgstr "איש קשר מוסר" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2217,19 +2158,19 @@ msgstr "מיקום ב(תאריך)" msgid "Online from a phone or mobile device" msgstr "בחיבור סלולרי או דרך התקן נייד" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "רשת חדשה" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "בחירת רשת IRC" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "_איפוס רשימת הרשתות" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "בחירה" @@ -2280,135 +2221,135 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "_ניתוק" -#: ../libempathy-gtk/empathy-log-window.c:634 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "היסטוריה" -#: ../libempathy-gtk/empathy-log-window.c:689 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "הצגה" -#: ../libempathy-gtk/empathy-log-window.c:711 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "חיפוש" -#: ../libempathy-gtk/empathy-log-window.c:1159 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "שיחה תחת %s" -#: ../libempathy-gtk/empathy-log-window.c:1161 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "שיחה עם %s" -#: ../libempathy-gtk/empathy-log-window.c:1211 -#: ../libempathy-gtk/empathy-log-window.c:1358 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 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:1300 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1306 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "שנייה אחת" msgstr[1] "%s שניות" -#: ../libempathy-gtk/empathy-log-window.c:1389 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "דקה אחת" msgstr[1] "%s דקות" -#: ../libempathy-gtk/empathy-log-window.c:1397 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "השיחה ארכה %s, הסתיימה ב־%s" -#: ../libempathy-gtk/empathy-log-window.c:1729 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "היום" -#: ../libempathy-gtk/empathy-log-window.c:1733 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "אתמול" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1748 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "ה־%e ב%B %Y" #: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3444 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "כל זמן שהוא" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2372 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "כל אחד" -#: ../libempathy-gtk/empathy-log-window.c:2685 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "מי" -#: ../libempathy-gtk/empathy-log-window.c:2889 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "מתי" -#: ../libempathy-gtk/empathy-log-window.c:3005 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "כל דבר" -#: ../libempathy-gtk/empathy-log-window.c:3007 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "מלל הצ׳אטים" -#: ../libempathy-gtk/empathy-log-window.c:3009 +#: ../libempathy-gtk/empathy-log-window.c:3044 #: ../src/empathy-preferences.ui.h:4 msgid "Calls" msgstr "שיחות" -#: ../libempathy-gtk/empathy-log-window.c:3014 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "שיחות נכנסות" -#: ../libempathy-gtk/empathy-log-window.c:3015 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "שיחות יוצאות" -#: ../libempathy-gtk/empathy-log-window.c:3016 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "שיחות שלא נענו" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "מה" -#: ../libempathy-gtk/empathy-log-window.c:3747 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "האם אכן ברצונך למחוק את כל היומנים של הדיונים האחרונים שלך?" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "מחיקת הכול" -#: ../libempathy-gtk/empathy-log-window.c:3758 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "מחיקה עד מ־:" @@ -2438,7 +2379,7 @@ msgstr "וידאו" #: ../libempathy-gtk/empathy-log-window.ui.h:7 #: ../src/empathy-call-window.ui.h:28 #: ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 +#: ../src/empathy-roster-window-menubar.ui.h:20 msgid "_Edit" msgstr "ע_ריכה" @@ -2450,76 +2391,82 @@ msgstr "_קובץ" msgid "page 2" msgstr "עמוד 2" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "איש קשר זה מנותק" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 msgid "The specified contact is either invalid or unknown" msgstr "איש הקשר המסוים הזה אינו תקני או שאינו מוכר" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" msgstr "איש הקשר אינו תומך בסוג כזה של דיון" -#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 msgid "The requested functionality is not implemented for this protocol" msgstr "התכונה המבוקשת אינה מיושמת בפרוטוקול זה" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 msgid "Could not start a conversation with the given contact" msgstr "לא ניתן להתחיל את הדיון עם איש הקשר הנבחר" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "גישתך נחסמה לערוץ זה" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "ערוץ זה מלא" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 msgid "You must be invited to join this channel" msgstr "עליך לקבל הזמנה כדי להצטרף לערוץ זה" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" msgstr "לא ניתן להמשיך בזמן ניתוק" -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "ההרשאה נדחתה" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "אירעה שגיאה בעת התחלת הדיון" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "יש להזין מזהה לאיש הקשר או מספר טלפון:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:334 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "שיחה חדשה" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:226 +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "_Video Call" msgstr "שיֹחת _וידאו" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:236 +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 msgid "_Audio Call" msgstr "ֹשיחה _קולית" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:246 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "שיחה חדשה" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "האימות עבור החשבון %s נכשל" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2556,12 +2503,8 @@ msgstr "יש ללחוץ כדי להוסיף מצב זה למועדפים" msgid "Set status" msgstr "הגדרת מצב" -#: ../libempathy-gtk/empathy-presence-chooser.c:943 -msgid "Set your presence and current status" -msgstr "הגדרת הנוכחות והמצב הנוכחיים שלך" - #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1131 +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 msgid "Custom messages…" msgstr "הודעות מותאמות אישית…" @@ -2638,12 +2581,12 @@ msgstr "שיחה קולית הסתיימה" msgid "Edit Custom Messages" msgstr "עריכת הודעה מותאמת" -#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "ההודעה נערכה ב־%s" -#: ../libempathy-gtk/empathy-theme-adium.c:1752 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "רגיל" @@ -2722,35 +2665,39 @@ msgid "Continue" msgstr "המשך" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "חיבור מפוקפק" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "חיבור זה אינו מהימן. האם ברצונך להמשיך בכל מקרה?" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "יש לזכור בחירה זו עבור חיבורים עתידיים" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "פרטי התעודה" -#: ../libempathy-gtk/empathy-ui-utils.c:1738 +#: ../libempathy-gtk/empathy-ui-utils.c:1741 msgid "Unable to open URI" msgstr "לא ניתן לפתוח את הכתובת" -#: ../libempathy-gtk/empathy-ui-utils.c:1835 +#: ../libempathy-gtk/empathy-ui-utils.c:1859 msgid "Select a file" msgstr "בחירת קובץ" -#: ../libempathy-gtk/empathy-ui-utils.c:1907 +#: ../libempathy-gtk/empathy-ui-utils.c:1934 msgid "Insufficient free space to save file" msgstr "אין די מקום פנוי לשמירת הקובץ" -#: ../libempathy-gtk/empathy-ui-utils.c:1915 +#: ../libempathy-gtk/empathy-ui-utils.c:1942 #, c-format msgid "%s of free space are required to save this file, but only %s is available. Please choose another location." msgstr "נדרשים %s של מקום פנוי כדי לשמור קובץ זה, אך ישנם רק %s פנויים. נא לבחור במיקום אחר." -#: ../libempathy-gtk/empathy-ui-utils.c:1959 +#: ../libempathy-gtk/empathy-ui-utils.c:1986 #, c-format msgid "Incoming file from %s" msgstr "קובץ נכנס מ־%s" @@ -2922,31 +2869,31 @@ msgstr "מערבי" msgid "Vietnamese" msgstr "וייטנאמית" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "אין הודעת שגיאה" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "הודעה מיידית (Empathy)" -#: ../src/empathy.c:434 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "לא להתחבר בהפעלה" -#: ../src/empathy.c:438 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "אין להציג את רשימת אנשי הקשר או כל דו־שיח אחר בהפעלה" -#: ../src/empathy.c:453 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "- לקוח המסרים המידיים Empathy" -#: ../src/empathy.c:640 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "שגיאה ביצירת קשר עם מנהל החשבונות" -#: ../src/empathy.c:642 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n" @@ -2969,11 +2916,11 @@ msgstr "Empathy is distributed in the hope that it will be useful, but WITHOUT A msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" msgstr "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "לקוח מסרים מיידיים עבור GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "מארק קרפיבנר \n" @@ -3008,168 +2955,177 @@ msgid "You can either go back and try to enter your accounts' details again or q msgstr "ניתן לחזור אחורה ולנסות להקליד את פרטי החשבון שוב או לצאת ממסייע זה ולהוסיף חשבונות מאוחר יותר מתפריט העריכה." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1274 msgid "An error occurred" msgstr "התרחשה שגיאה." -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "אילו חשבונות יש לך?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "האם יש לך חשבונות נוספים שברצונך להגדיר?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "נא להזין את פרטי החשבון שלך" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "איזה חשבון שיחות ברצונך ליצור?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "האם ברצונך ליצור חשבונות שיחה אחרים?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "נא להזין את הפרטים עבור החשבון החדש" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls." msgstr "בעזרת Empathy ניתן לשוחח עם אנשים קרובים המחוברים לרשת ועם חברים ועמיתים לעבודה המשתמשים ב־Google Talk, ‏AIM,‏ Windows Live ועוד תוכנות דומות רבות. בעזרת המיקרופון ומצלמת הרשת שלך ניתן גם לנהל שיחות קול ווידאו." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "יש לך חשבון שהשתמשת בו עם תוכנת שיחה אחרת?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "כן, נא לייבא את פרטי החשבון מ־" -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "כן, אני אזין את פרטי החשבון עכשיו" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "לא, אני רוצה חשבון חדש" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "לא, אני רק רוצה לראות אנשים המחוברים בקרבת מקום לעת עתה" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "נא לבחור את החשבון שברצונך לייבא:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "כן" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "לא, זה הכול לעכשיו" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog" msgstr "באפשרות Empathy לגלות ולנהל שיחות עם אנשים המחוברים לאותה הרשת כמוך. אם ברצונך להשתמש בתכונה זו, נא לבדוק שהפרטים שלהלן נכונים. ניתן לשנות פרטים אלה בקלות מאוחר יותר או לבטל תכונה זו באמצעות הדו־שיח 'חשבונות'" -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1150 msgid "Edit->Accounts" msgstr "עריכה->חשבונות" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "אין לי _כל עניין לאפשר את התכונה הזו כעת" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1146 msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog" msgstr "לא ניתן יהיה לשוחח עם אנשים המחוברים לרשת המקומית שלך כיוון ש־telepathy-salut אינה מותקנת, אם ברצונך להפעיל תכונה זו עליך להתקין את החבילה telepathy-salut וליצור חשבון ב'אנשים בקרבתי' מדו־שיח החשבונות" -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1152 msgid "telepathy-salut not installed" msgstr "telepathy-salut אינה מותקנת" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1198 msgid "Messaging and VoIP Accounts Assistant" msgstr "מסייע חשבונות ההתכתבות וה־VoIP" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1232 msgid "Welcome to Empathy" msgstr "ברוך בואך אל Empathy" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1241 msgid "Import your existing accounts" msgstr "ייבוא חשבונות קיימים" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1259 msgid "Please enter personal details" msgstr "נא להזין פרטים אישיים" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "ישנם שינויים שלא נשמרו בחשבון ה־%s שלך." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "החשבון החדש שלך לא נשמר עדיין." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:753 -#: ../src/empathy-call-window.c:1319 +#: ../src/empathy-accounts-dialog.c:344 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "בהתחברות…" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:385 #, c-format msgid "Offline — %s" msgstr "לא מחובר — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:397 #, c-format msgid "Disconnected — %s" msgstr "מנותק — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:408 msgid "Offline — No Network Connection" msgstr "מנותק — אין חיבור לרשת" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:415 msgid "Unknown Status" msgstr "מצב לא ידוע" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:427 msgid "Offline — Account Disabled" msgstr "מנותק — החשבון מנוטרל" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"עומד להיווצר חשבון חדש, מה שיבטל\n" -"את השינויים שלך. האם ברצונך להמשיך?" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "עריכת הגדרות החיבור" -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "אירע כשל בקבלת הפרטים האישיים שלך מהשרת." + +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "עליך להתחבר כדי לערוך את הפרטים האישיים שלך." + +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "ע_ריכת הגדרות החיבור..." + +#: ../src/empathy-accounts-dialog.c:1289 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "האם ברצונך להסיר את החשבון '%s' ממחשבך?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1293 msgid "This will not remove your account on the server." msgstr "פעולה זו לא תסיר את חשבונך מהשרת." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1529 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3178,15 +3134,15 @@ msgstr "" "את השינויים שלך. האת אתה בטוח שברצונך להמשיך?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1705 msgid "_Enable" msgstr "ה_פעלה" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1706 msgid "_Disable" msgstr "נ_טרול" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2176 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3218,11 +3174,11 @@ msgstr "על מנת להוסיף חשבון חדש עליך להתקין מנו msgid "_Import…" msgstr "י_בוא…" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr "- לקוח האימות של Empathy" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "לקוח האימות של Empathy" @@ -3240,150 +3196,150 @@ msgstr "- לקוח השמע/הווידאו Empathy" msgid "Empathy Audio/Video Client" msgstr "לקוח השמע/הווידאו Empathy" -#: ../src/empathy-streamed-media-window.c:430 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "ניגוד" -#: ../src/empathy-streamed-media-window.c:433 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "בהירות" -#: ../src/empathy-streamed-media-window.c:436 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "גאמה" -#: ../src/empathy-streamed-media-window.c:541 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "עצמה" -#: ../src/empathy-streamed-media-window.c:1109 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "_סרגל צד" -#: ../src/empathy-streamed-media-window.c:1129 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "קלט שמע" -#: ../src/empathy-streamed-media-window.c:1133 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "קלט וידאו" -#: ../src/empathy-streamed-media-window.c:1141 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "מקשי חיוג" -#: ../src/empathy-streamed-media-window.c:1152 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "פרטים" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1221 -#: ../src/empathy-call-window.c:1928 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format msgid "Call with %s" msgstr "שיחה עם %s" -#: ../src/empathy-streamed-media-window.c:1454 -#: ../src/empathy-call-window.c:2172 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 msgid "The IP address as seen by the machine" msgstr "כתובת ה־IP כפי שנראית על ידי המחשב" -#: ../src/empathy-streamed-media-window.c:1456 -#: ../src/empathy-call-window.c:2174 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 msgid "The IP address as seen by a server on the Internet" msgstr "כתובת ה־IP כפי שנראית על ידי שרת באינטרנט" -#: ../src/empathy-streamed-media-window.c:1458 -#: ../src/empathy-call-window.c:2176 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 msgid "The IP address of the peer as seen by the other side" msgstr "כתובת ה־IP כדי שנראית על ידי עמית מהצד השני" -#: ../src/empathy-streamed-media-window.c:1460 -#: ../src/empathy-call-window.c:2178 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 msgid "The IP address of a relay server" msgstr "כתובת ה־IP של שרת הממסר" -#: ../src/empathy-streamed-media-window.c:1462 -#: ../src/empathy-call-window.c:2180 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 msgid "The IP address of the multicast group" msgstr "כתובת ה־IP של קבוצת התשדורת" +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 #: ../src/empathy-streamed-media-window.c:1844 #: ../src/empathy-streamed-media-window.c:1847 -#: ../src/empathy-streamed-media-window.c:1850 -#: ../src/empathy-streamed-media-window.c:1853 msgctxt "codec" msgid "Unknown" msgstr "ֹלא ידוע" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2145 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "מחובר — %d:%02d דק׳" -#: ../src/empathy-streamed-media-window.c:2206 -#: ../src/empathy-call-window.c:2983 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 msgid "Technical Details" msgstr "פרטים טכניים" -#: ../src/empathy-streamed-media-window.c:2244 -#: ../src/empathy-call-window.c:3022 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 #, c-format msgid "%s's software does not understand any of the audio formats supported by your computer" msgstr "התכנה של %s אינה מבינה את מבני השמע הנתמכים על ידי המחשב שלך" -#: ../src/empathy-streamed-media-window.c:2249 -#: ../src/empathy-call-window.c:3027 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format msgid "%s's software does not understand any of the video formats supported by your computer" msgstr "התכנה של %s אינה מבינה את מבני הווידאו הנתמכים על ידי המחשב שלך" -#: ../src/empathy-streamed-media-window.c:2255 -#: ../src/empathy-call-window.c:3033 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 #, c-format msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections." msgstr "לא ניתן להפעיל את החיבור אל %s. כנראה אחד ממשתתפי השיחה מחובר לרשת שאינה מאפשרת חיבורים ישירים." -#: ../src/empathy-streamed-media-window.c:2261 -#: ../src/empathy-call-window.c:3039 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 msgid "There was a failure on the network" msgstr "אירעה שגיאה ברשת" -#: ../src/empathy-streamed-media-window.c:2265 -#: ../src/empathy-call-window.c:3043 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 msgid "The audio formats necessary for this call are not installed on your computer" msgstr "מבני השמע הדרושים לקיום שיחה זו אינם מותקנים במחשבך" -#: ../src/empathy-streamed-media-window.c:2268 -#: ../src/empathy-call-window.c:3046 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 msgid "The video formats necessary for this call are not installed on your computer" msgstr "מבני הווידאו הדרושים לקיום שיחה זו אינם מותקנים במחשבך" -#: ../src/empathy-streamed-media-window.c:2278 -#: ../src/empathy-call-window.c:3058 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 #, c-format msgid "Something unexpected happened in a Telepathy component. Please report this bug and attach logs gathered from the 'Debug' window in the Help menu." msgstr "משהו בלתי צפוי ארע ברכיב של Telepathy. נא לדווח על באג זה ולהוסיף דוחות שנאספו מחלון 'ניפוי השגיאות' שבתפריט העזרה." -#: ../src/empathy-streamed-media-window.c:2286 -#: ../src/empathy-call-window.c:3067 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 msgid "There was a failure in the call engine" msgstr "אירעה שגיאה במנוע הקריאה" -#: ../src/empathy-streamed-media-window.c:2289 -#: ../src/empathy-call-window.c:3070 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 msgid "The end of the stream was reached" msgstr "התזרים הגיע לסיומו" -#: ../src/empathy-streamed-media-window.c:2329 -#: ../src/empathy-call-window.c:3110 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 msgid "Can't establish audio stream" msgstr "לא ניתן לקיים תזרים שמע" -#: ../src/empathy-streamed-media-window.c:2339 -#: ../src/empathy-call-window.c:3120 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 msgid "Can't establish video stream" msgstr "לא ניתן לקיים תזרים וידאו" @@ -3497,18 +3453,18 @@ msgstr "מ_צלמה" #: ../src/empathy-call-window.ui.h:26 #: ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "_Contents" msgstr "_תכנים" #: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "_Debug" msgstr "_ניפוי שגיאות" #: ../src/empathy-call-window.ui.h:29 #: ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Help" msgstr "ע_זרה" @@ -3521,7 +3477,7 @@ msgid "_Settings" msgstr "ה_גדרות" #: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 +#: ../src/empathy-roster-window-menubar.ui.h:29 #: ../src/empathy-streamed-media-window.ui.h:25 msgid "_View" msgstr "_תצוגה" @@ -3647,102 +3603,102 @@ msgstr "חיבור אוטומטי" msgid "Manage Favorite Rooms" msgstr "ניהול חדרי שיחה מועדפים" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "שיחה קולית נכנסת" -#: ../src/empathy-event-manager.c:521 -#: ../src/empathy-call-window.c:1552 +#: ../src/empathy-event-manager.c:523 +#: ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "שיחה נכנסת" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "‏%s מתקשר אליך עם וידאו, האם ברצונך לענות?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "‏%s מתקשר אליך, האם ברצונך לענות?" -#: ../src/empathy-event-manager.c:529 -#: ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1558 +#: ../src/empathy-event-manager.c:531 +#: ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "שיחה נכנסת מ־%s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "_דחייה" -#: ../src/empathy-event-manager.c:562 -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 +#: ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_מענה" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "מ_ענה עם וידאו" -#: ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1558 +#: ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" msgstr "שיחת וידאו נכנסת מ־%s" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "הזמנה לחדר" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "הזמנה להצטרף ל־%s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "‏%s מזמין/ה אותך להצטרף אל %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_סירוב" -#: ../src/empathy-event-manager.c:858 +#: ../src/empathy-event-manager.c:860 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "ה_צטרפות" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "‏%s הזמין/ה אותך להצטרף אל %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "הוזמנת להצטרף אל %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "העברת קבצים נכנסת מ־%s" -#: ../src/empathy-event-manager.c:1145 -#: ../src/empathy-main-window.c:378 +#: ../src/empathy-event-manager.c:1147 +#: ../src/empathy-roster-window.c:371 msgid "Password required" msgstr "נדרשת ססמה" -#: ../src/empathy-event-manager.c:1210 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s רוצה הרשאות לצפייה מתי המשתמש שלך מחובר" -#: ../src/empathy-event-manager.c:1214 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3752,108 +3708,108 @@ msgstr "" "הודעה: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "לא ידוע" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "‏%s מתוך %s ב־%s/ש׳" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s מתוך %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "מתקבל הקובץ \"%s\" מ־%s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "‏\"%s\" נשלח אל \"%s\"" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "ארעה שגיאה בקבלת הקובץ \"%s\" מ־%s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "שגיאה בקבלת קובץ" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "שגיאה בשליחת הקובץ \"%s\" אל %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "שגיאה בשליחת קובץ" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "הקובץ \"%s\" התקבל מאת %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "הקובץ \"%s\" נשלח אל %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "העברת קובץ הושלמה" -#: ../src/empathy-ft-manager.c:616 -#: ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 +#: ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "בהמתנה לתגובה של משתתפים נוספים" -#: ../src/empathy-ft-manager.c:642 -#: ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 +#: ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "נבדקת השלמות של \"%s\"" -#: ../src/empathy-ft-manager.c:645 -#: ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 +#: ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "מתבצע גיבוב ל־\"%s\"" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "קובץ" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "נותר" @@ -3874,163 +3830,159 @@ msgid "Import Accounts" msgstr "יבוא חשבונות" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "יבוא" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "פרוטוקול" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "מקור" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-roster-window.c:388 msgid "Provide Password" msgstr "הזנת ססמה" -#: ../src/empathy-main-window.c:401 +#: ../src/empathy-roster-window.c:394 msgid "Disconnect" msgstr "ניתוק" -#: ../src/empathy-main-window.c:642 +#: ../src/empathy-roster-window.c:626 msgid "No match found" msgstr "לא נמצאה התאמה" -#: ../src/empathy-main-window.c:750 +#: ../src/empathy-roster-window.c:733 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "לא ניתן להשתמש בחשבונות %s עד שהתכנה %s תעודכן, עמך הסליחה." -#: ../src/empathy-main-window.c:818 +#: ../src/empathy-roster-window.c:799 msgid "Update software..." msgstr "עדכון התכנה..." -#: ../src/empathy-main-window.c:824 -#: ../src/empathy-main-window.c:949 +#: ../src/empathy-roster-window.c:805 +#: ../src/empathy-roster-window.c:922 msgid "Close" msgstr "סגירה" -#: ../src/empathy-main-window.c:937 +#: ../src/empathy-roster-window.c:910 msgid "Reconnect" msgstr "התחברות מחדש" -#: ../src/empathy-main-window.c:943 +#: ../src/empathy-roster-window.c:916 msgid "Edit Account" msgstr "עריכת חשבון" #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:1088 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1060 #, c-format msgid "Top up %s (%s)..." msgstr "Top up %s (%s)..." -#: ../src/empathy-main-window.c:1135 +#: ../src/empathy-roster-window.c:1106 msgid "Top up account credit" msgstr "אשראי חשבון ה־Top up" #. top up button -#: ../src/empathy-main-window.c:1206 +#: ../src/empathy-roster-window.c:1178 msgid "Top Up..." msgstr "Top Up..." -#: ../src/empathy-main-window.c:1949 +#: ../src/empathy-roster-window.c:1901 msgid "Contact" msgstr "איש קשר" -#: ../src/empathy-main-window.c:2324 +#: ../src/empathy-roster-window.c:2288 msgid "Contact List" msgstr "רשימת אנשי קשר" -#: ../src/empathy-main-window-menubar.ui.h:1 +#: ../src/empathy-roster-window-menubar.ui.h:1 msgid "Contacts on a _Map" msgstr "אנשי קשר על ה_מפה" -#: ../src/empathy-main-window-menubar.ui.h:2 +#: ../src/empathy-roster-window-menubar.ui.h:2 msgid "Credit Balance" msgstr "מאזן האשראי" -#: ../src/empathy-main-window-menubar.ui.h:3 +#: ../src/empathy-roster-window-menubar.ui.h:3 msgid "Find in Contact _List" msgstr "_חיפוש ברשימת אנשי הקשר" -#: ../src/empathy-main-window-menubar.ui.h:4 +#: ../src/empathy-roster-window-menubar.ui.h:4 msgid "Join _Favorites" msgstr "_צירוף למועדפים" -#: ../src/empathy-main-window-menubar.ui.h:5 +#: ../src/empathy-roster-window-menubar.ui.h:5 msgid "Manage Favorites" msgstr "ניהול מועדפים" -#: ../src/empathy-main-window-menubar.ui.h:6 +#: ../src/empathy-roster-window-menubar.ui.h:6 msgid "N_ormal Size" msgstr "גודל _רגיל" -#: ../src/empathy-main-window-menubar.ui.h:7 +#: ../src/empathy-roster-window-menubar.ui.h:7 #: ../src/empathy-status-icon.ui.h:1 msgid "New _Call…" msgstr "_שיחה חדשה…" -#: ../src/empathy-main-window-menubar.ui.h:8 +#: ../src/empathy-roster-window-menubar.ui.h:8 msgid "Normal Size With _Avatars" msgstr "גודל רגיל עם _תמונות אישיות" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:9 msgid "P_references" msgstr "העד_פות" -#: ../src/empathy-main-window-menubar.ui.h:10 +#: ../src/empathy-roster-window-menubar.ui.h:10 msgid "Show P_rotocols" msgstr "הצגת פ_רוטוקולים" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:11 msgid "Sort by _Name" msgstr "מיון לפי _שם" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:12 msgid "Sort by _Status" msgstr "מיון לפי _מצב" -#: ../src/empathy-main-window-menubar.ui.h:13 +#: ../src/empathy-roster-window-menubar.ui.h:13 msgid "_Accounts" msgstr "_חשבונות" -#: ../src/empathy-main-window-menubar.ui.h:15 +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "_Blocked Contacts" msgstr "אנשי קשר _חסומים" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:17 msgid "_Compact Size" msgstr "גודל _קומפקטי" -#: ../src/empathy-main-window-menubar.ui.h:21 +#: ../src/empathy-roster-window-menubar.ui.h:21 msgid "_File Transfers" msgstr "העברות _קבצים" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:23 msgid "_Join…" msgstr "ה_צטרפות…" -#: ../src/empathy-main-window-menubar.ui.h:24 +#: ../src/empathy-roster-window-menubar.ui.h:24 #: ../src/empathy-status-icon.ui.h:3 msgid "_New Conversation…" msgstr "_שיחה חדשה…" -#: ../src/empathy-main-window-menubar.ui.h:25 +#: ../src/empathy-roster-window-menubar.ui.h:25 msgid "_Offline Contacts" msgstr "אנשי קשר _לא מחוברים" -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "מידע _אישי" - -#: ../src/empathy-main-window-menubar.ui.h:28 +#: ../src/empathy-roster-window-menubar.ui.h:27 msgid "_Room" msgstr "_חדר" -#: ../src/empathy-main-window-menubar.ui.h:29 +#: ../src/empathy-roster-window-menubar.ui.h:28 msgid "_Search for Contacts…" msgstr "_חיפוש אחר אנשי קשר…" @@ -4044,7 +3996,7 @@ msgstr "חברים" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:623 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4057,16 +4009,16 @@ msgstr "" "נדרשת ססמה: %s\n" "חברים: %s" -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "לא" -#: ../src/empathy-new-chatroom-dialog.c:654 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "לא ניתן להתחיל את הצגת החדרים" -#: ../src/empathy-new-chatroom-dialog.c:664 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "לא ניתן לעצור את הצגת החדרים" @@ -4094,79 +4046,79 @@ msgstr "רשימת חדרים" msgid "_Room:" msgstr "_חדר:" -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "התקבלה הודעה" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "הודעה נשלחה" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "שיחה חדשה" -#: ../src/empathy-preferences.c:172 +#: ../src/empathy-preferences.c:169 msgid "Contact goes online" msgstr "איש קשר מתחבר" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "איש קשר מתנתק" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "חשבון מחובר" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "חשבון נותק" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "שפה" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:726 msgid "Juliet" msgstr "יוליה" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:733 msgid "Romeo" msgstr "רומיאו" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:739 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "הו רומיאו, רומיאו, מן אין שבת רומיאו?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:743 msgid "Deny thy father and refuse thy name;" msgstr "התכחש לאביך וסרב לשמו;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:746 msgid "Or if thou wilt not, be but sworn my love" msgstr "או אם לא תסכים, אשבע לך באהבתי" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:749 msgid "And I'll no longer be a Capulet." msgstr "ולא אהיה עוד בת קפולט." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:752 msgid "Shall I hear more, or shall I speak at this?" msgstr "האם דיברתי די או שמא אוסיף לדבר?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" msgstr "יוליה התנתקה" -#: ../src/empathy-preferences.c:1175 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "העדפות" @@ -4218,107 +4170,107 @@ msgstr "הפעלת בדיקת איות עבור השפות:" msgid "General" msgstr "כללי" -#: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "רמת הקלט:" - #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "עצמת הקלט:" - -#: ../src/empathy-preferences.ui.h:18 msgid "Location sources:" msgstr "מקורות המיקומים:" -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:17 msgid "Log conversations" msgstr "רישום השיחות" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:18 msgid "Notifications" msgstr "התרעות" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:19 msgid "Play sound for events" msgstr "השמעת צליל עבור אירועים" -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:20 msgid "Privacy" msgstr "פרטיות" -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:21 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 "הפחתת רמת הדיוק של המיקום אומרת שהמידע המדויק ביותר שיפורסם הוא העיר, המדינה והארץ שלך. הדיוק של נקודות ציון מ־GPS יהיו עם מספר עשרוני 1." -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:22 msgid "Show _smileys as images" msgstr "הצגת _סמיילים כתמונות" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:23 msgid "Show contact _list in rooms" msgstr "הצגת _רשימת אנשי קשר בחדרים" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:24 msgid "Sounds" msgstr "צלילים" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:25 msgid "Spell Checking" msgstr "בדיקת איות" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:26 +msgid "Start chats in:" +msgstr "הפעלת צ׳אטים ב־:" + +#: ../src/empathy-preferences.ui.h:27 msgid "The list of languages reflects only the languages for which you have a dictionary installed." msgstr "ברשימת השפות מוצגות שפות שעבורן מותקנים אצלך מילונים." -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:28 msgid "Themes" msgstr "ערכות נושא" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:29 msgid "Use _echo cancellation to improve call quality" msgstr "שימוש ב_ביטול הד כדי לשפר את איכות השיחה" -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:30 msgid "Variant:" msgstr "הגוון:" -#: ../src/empathy-preferences.ui.h:32 +#: ../src/empathy-preferences.ui.h:31 msgid "_Automatically connect on startup" msgstr "התחברות _אוטומטית עם ההפעלה" -#: ../src/empathy-preferences.ui.h:33 +#: ../src/empathy-preferences.ui.h:32 msgid "_Cellphone" msgstr "טלפון _סלולרי" -#: ../src/empathy-preferences.ui.h:34 +#: ../src/empathy-preferences.ui.h:33 msgid "_Enable bubble notifications" msgstr "ה_פעלת התרעות בתוך בועה" -#: ../src/empathy-preferences.ui.h:35 +#: ../src/empathy-preferences.ui.h:34 msgid "_Enable sound notifications" msgstr "ה_פעלת התרעות קוליות" -#: ../src/empathy-preferences.ui.h:36 +#: ../src/empathy-preferences.ui.h:35 msgid "_GPS" msgstr "_GPS" -#: ../src/empathy-preferences.ui.h:37 +#: ../src/empathy-preferences.ui.h:36 msgid "_Network (IP, Wi-Fi)" msgstr "_רשת (IP, אלחוטית)" -#: ../src/empathy-preferences.ui.h:38 -msgid "_Open new chats in separate windows" -msgstr "_פתיחת שיחות חדשות בחלונות נפרדים" - -#: ../src/empathy-preferences.ui.h:39 +#: ../src/empathy-preferences.ui.h:37 msgid "_Publish location to my contacts" msgstr "_פרסום המיקום שלי לאנשי הקשר שלי" #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees. -#: ../src/empathy-preferences.ui.h:41 +#: ../src/empathy-preferences.ui.h:39 msgid "_Reduce location accuracy" msgstr "ה_פחתת דיוק המיקום" +#: ../src/empathy-preferences.ui.h:40 +msgid "new _windows" +msgstr "_חלונות חדשים" + +#: ../src/empathy-preferences.ui.h:41 +msgid "new ta_bs" +msgstr "_לשוניות חדשות" + #: ../src/empathy-status-icon.ui.h:2 msgid "Status" msgstr "מצב" @@ -4375,7 +4327,7 @@ msgstr "וידאו מופעל" msgid "Video Preview" msgstr "תצוגה מקדימה לווידאו" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "מפת אנשי קשר" @@ -4440,56 +4392,56 @@ msgstr "רמה" msgid "The selected connection manager does not support the remote debugging extension." msgstr "מנהל החיבורים שנבחר אינו תומך בהרחבת ניפוי שגיאות מרחוק." -#: ../src/empathy-invite-participant-dialog.c:186 -#: ../src/empathy-invite-participant-dialog.c:214 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "הזמנת משתתפים" -#: ../src/empathy-invite-participant-dialog.c:187 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "נא לבחור אנשי קשר להזמנה לדיון:" -#: ../src/empathy-invite-participant-dialog.c:210 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "הזמנה" -#: ../src/empathy-accounts.c:184 +#: ../src/empathy-accounts.c:183 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "אין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבוא) ולאחריה התכנית תסגר" -#: ../src/empathy-accounts.c:188 +#: ../src/empathy-accounts.c:187 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "אין להציג תיבות דו־שיח כלשהן אלא אם כן ישנן חשבונות \"אנשים בקרבתי\"" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:191 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "בחירת החשבון הנתון כבר בהתחלה (לדוגמה gabble/jabber/foo_40example_2eorg0)" -#: ../src/empathy-accounts.c:194 +#: ../src/empathy-accounts.c:193 msgid "" msgstr "" -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:196 msgid "Show account assistant" msgstr "הצגת מסייע החשבונות" -#: ../src/empathy-accounts.c:203 +#: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" msgstr "- חשבונות Empathy" -#: ../src/empathy-accounts.c:242 +#: ../src/empathy-accounts.c:238 msgid "Empathy Accounts" msgstr "חשבונות Empathy" -#: ../src/empathy-debugger.c:70 +#: ../src/empathy-debugger.c:69 msgid "Show a particular service" msgstr "הצגת שירות מסוים" -#: ../src/empathy-debugger.c:75 +#: ../src/empathy-debugger.c:74 msgid "- Empathy Debugger" msgstr "- מנפה השגיאות של Empathy" -#: ../src/empathy-debugger.c:114 +#: ../src/empathy-debugger.c:113 msgid "Empathy Debugger" msgstr "מנפה השגיאות של Empathy" @@ -4497,39 +4449,39 @@ msgstr "מנפה השגיאות של Empathy" msgid "- Empathy Chat Client" msgstr "- לקוח הצ׳אטים Empathy" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "תגובה" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1562 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 msgid "Reject" msgstr "דחייה" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1563 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 msgid "Answer" msgstr "מענה" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "מענה עם וידאו" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "סירוב" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "אישור" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "הזנה" @@ -4545,34 +4497,34 @@ msgstr "התקבלה בקשת שיחה מאת %s, אך באותו הזמן כב msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2879 +#: ../src/empathy-call-window.c:2929 msgid "On hold" msgstr "בהמתנה" -#: ../src/empathy-call-window.c:2882 +#: ../src/empathy-call-window.c:2932 msgid "Mute" msgstr "השתק" -#: ../src/empathy-call-window.c:2884 +#: ../src/empathy-call-window.c:2934 msgid "Duration" msgstr "משך" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2887 +#: ../src/empathy-call-window.c:2937 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02d דק׳" -#: ../src/empathy-call-window.c:3157 +#: ../src/empathy-call-window.c:3207 #, c-format msgid "Your current balance is %s." msgstr "המאזן הנוכחי שלך הוא %s." -#: ../src/empathy-call-window.c:3161 +#: ../src/empathy-call-window.c:3211 msgid "Sorry, you don’t have enough credit for that call." msgstr "אין לך מספיק אשראי כדי לבצע שיחה זו." -#: ../src/empathy-call-window.c:3163 +#: ../src/empathy-call-window.c:3213 msgid "Top Up" msgstr "Top Up" @@ -4580,6 +4532,66 @@ msgstr "Top Up" msgid "_Match case" msgstr "התאמת _רישיות" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "נוסף חשבון חדש" + +#~ msgid "Personal Information" +#~ msgstr "מידע אישי" + +#~ msgid "_Personal Information" +#~ msgstr "מידע _אישי" + +#~ msgid "_Open new chats in separate windows" +#~ msgstr "_פתיחת שיחות חדשות בחלונות נפרדים" + +#~ msgid "My Web Accounts" +#~ msgstr "החשבונות המקוונים שלי" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "החשבון %s נערך דרך %s." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "לא ניתן לערוך את החשבון %s ב־Empathy." + +#~ msgid "Launch My Web Accounts" +#~ msgstr "טעינת החשבונות המקוונים שלי" + +#~ msgid "Edit %s" +#~ msgstr "עריכת %s" + +#~ msgid "Ca_ncel" +#~ msgstr "_ביטול" +#~ msgctxt "Edit contact (contextual menu)" + +#~ msgid "_Edit" +#~ msgstr "ע_ריכה" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "עומד להיווצר חשבון חדש, מה שיבטל\n" +#~ "את השינויים שלך. האם ברצונך להמשיך?" + +#~ msgid "Call volume" +#~ msgstr "עצמת השמע של השיחה" + +#~ msgid "Call volume, as a percentage." +#~ msgstr "עצמת שמע השיחה באחוזים." + +#~ msgid "Socket type not supported" +#~ msgstr "סוג השקע אינו נתמך" + +#~ msgid "Set your presence and current status" +#~ msgstr "הגדרת הנוכחות והמצב הנוכחיים שלך" + +#~ msgid "Input level:" +#~ msgstr "רמת הקלט:" + +#~ msgid "Input volume:" +#~ msgstr "עצמת הקלט:" + #~ msgid "Empathy has migrated butterfly logs" #~ msgstr "Empathy has migrated butterfly logs" diff --git a/po/hu.po b/po/hu.po index cf61f80d..b9e36f16 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,15 +1,15 @@ # Hungarian translation of empathy # This file is distributed under the same license as the empathy package. -# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, Free Software Foundation, Inc. # -# Gabor Kelemen , 2005, 2006, 2007, 2008, 2009, 2010, 2011. +# Gabor Kelemen , 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. # Balázs Meskó , 2011. msgid "" msgstr "" "Project-Id-Version: empathy master\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-10-14 20:14+0200\n" -"PO-Revision-Date: 2011-10-14 20:17+0200\n" +"PO-Revision-Date: 2012-01-09 12:41+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "Language: \n" @@ -169,7 +169,7 @@ msgstr "WebKit fejlesztőeszközök engedélyezése" #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Enable popup notifications for new messages" -msgstr "Felugró értesítések értesítések engedélyezése új üzenetekre" +msgstr "Felugró értesítések engedélyezése új üzenetekre" #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Enable spell checker" diff --git a/po/ja.po b/po/ja.po index 6da82ec7..51752cf9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,5 +1,5 @@ # empathy ja.po. -# Copyright (C) 2007-2011 empathy's COPYRIGHT HOLDER +# Copyright (C) 2007-2012 empathy's COPYRIGHT HOLDER # This file is distributed under the same license as the empathy package. # Takeshi AIHANA , 2007-2009. # Kentaro Kazuhama , 2009. @@ -7,26 +7,41 @@ # (Contributed to Moblin by Intel GLS) # Takayuki KUSANO , 2010. # Kiyotaka NISHIBORI , 2010. +# Mako N , 2012. # # GLOSSARIES: -# contact list: 仲間リスト -# contact: 仲間 -# away: 離席 -# log(s) in: サインイン -# log(s) out: サインアウト -# chat room: チャット部屋 -# chat window: チャットウィンドウ -# nick: ニックネーム -# nickname: ニックネーム +# call 通話、呼び出し、呼び出す +# choose 選ぶ +# select 指定する +# contact 相手先 +# contact list 相手先の一覧 +# metacontact メタ相手先 +# chat チャット +# conversation 会話 +# chat room 談話室 +# room 談話室 +# text 文字 +# audio 音声 +# video ビデオ、映像 +# identifier 名称 +# status 在席状況 +# People Nearby (訳さない) +# geolocation 位置情報 +# location 場所 +# +# nick: ニックネーム +# nickname: ニックネーム +# log(s) in: サインイン +# log(s) out: サインアウト # 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: 2011-09-16 12:29+0000\n" -"PO-Revision-Date: 2011-09-11 00:28+0900\n" -"Last-Translator: Jiro Matsuzawa \n" +"POT-Creation-Date: 2012-02-08 14:20+0000\n" +"PO-Revision-Date: 2012-02-08 20:43+0900\n" +"Last-Translator: Mako N \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,698 +50,680 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "Googleトーク、Facebook、MSN や他の多くのチャットサービスでチャット" - -#: ../data/empathy.desktop.in.in.h:2 msgid "Empathy" msgstr "Empathy" +#: ../data/empathy.desktop.in.in.h:2 +msgid "IM Client" +msgstr "インスタントメッセンジャー・クライアント" + #: ../data/empathy.desktop.in.in.h:3 msgid "Empathy Internet Messaging" -msgstr "Empathy インスタント・メッセンジャー" +msgstr "Empathy インスタントメッセージング" #: ../data/empathy.desktop.in.in.h:4 -msgid "IM Client" -msgstr "インスタント・メッセンジャー クライアント" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "Googleトーク、Facebook、MSN や他の多くのチャットサービスでチャット" #: ../data/org.gnome.Empathy.gschema.xml.in.h:1 -msgid "Always open a separate chat window for new chats." -msgstr "新しいチャット用に別のチャットウィンドウを常に開きます。" +msgid "Connection managers should be used" +msgstr "接続マネージャーを利用するかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." msgstr "" +"自動的に切断/再接続するのに接続マネージャーを利用すべきかどうかを設定します。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "" +msgid "Empathy should auto-connect on startup" +msgstr "起動時に自動接続するかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -#, fuzzy -#| msgid "Camera On" -msgid "Camera device" -msgstr "カメラ入" +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "" +"Empathy を起動したら自動的に自分のアカウントにサインインするかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:5 -#, fuzzy -#| msgid "Camera On" -msgid "Camera position" -msgstr "カメラ入" +msgid "Empathy should auto-away when idle" +msgstr "アイドル時に自動的に離席中にするかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." +"Whether Empathy should go into away mode automatically if the user is idle." msgstr "" -"グループ・チャットでニックネームを補完(tab)した際に、ニックネームの後ろに追加" -"する文字です。" +"ユーザーがアイドル状態になったら、Empathy が自動的に離席中のモードにするかど" +"うかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:7 -msgid "Chat window theme" -msgstr "チャットウィンドウのテーマ" +msgid "Empathy default download folder" +msgstr "Empathy が使うデフォルトのダウンロード・フォルダー" #: ../data/org.gnome.Empathy.gschema.xml.in.h:8 -#, fuzzy -#| msgid "Chat window theme" -msgid "Chat window theme variant" -msgstr "チャットウィンドウのテーマ" +msgid "The default folder to save file transfers in." +msgstr "転送したファイルを保存するデフォルトのフォルダーです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:9 -msgid "" -"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "" -"スペルをチェックする言語をコンマで区切って指定します (例: \"en, fr, nl\")。" +msgid "Show offline contacts" +msgstr "オフラインの相手先を表示するかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:10 -msgid "Compact contact list" -msgstr "仲間リストを小さくするかどうか" +msgid "Whether to show contacts that are offline in the contact list." +msgstr "相手先の一覧の中でオフラインの相手先を表示するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:11 -msgid "Connection managers should be used" -msgstr "接続マネージャーを利用するかどうか" +msgid "Show avatars" +msgstr "アバターを表示するかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:12 -msgid "Contact list sort criterion" -msgstr "仲間リストを並び替える際の条件" +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "" +"相手先の一覧とチャットウィンドウの中に相手先のアバターを表示するかどうかで" +"す。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:13 -msgid "Default camera device to use in video calls, e.g. /dev/video0." -msgstr "" +msgid "Show protocols" +msgstr "プロトコルを表示" #: ../data/org.gnome.Empathy.gschema.xml.in.h:14 -msgid "Default directory to select an avatar image from" -msgstr "アバターの画像が格納されたデフォルトのフォルダー" +msgid "Whether to show protocols for contacts in the contact list." +msgstr "相手先の一覧の中の相手先にプロトコルを表示するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:15 -msgid "Disable popup notifications when away" -msgstr "離席中になってもポップアップ通知しないかどうか" +#, fuzzy +msgid "Show Balance in contact list" +msgstr "相手先の一覧をコンパクトにする(_M)" #: ../data/org.gnome.Empathy.gschema.xml.in.h:16 -msgid "Disable sounds when away" -msgstr "離席中になったらサウンドの演奏を無効にするかどうか" +#, fuzzy +msgid "Whether to show account balances in the contact list." +msgstr "相手先の一覧の中の相手先にプロトコルを表示するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:17 -msgid "Display incoming events in the status area" -msgstr "受信したイベントを表示" +msgid "Compact contact list" +msgstr "相手先の一覧を小さくするかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:18 -msgid "" -"Display incoming events in the status area. If false, present them to the " -"user immediately." -msgstr "" -"受信したイベントを通知領域に表示します。もし false なら、ユーザーにすぐに通知" -"します。" +msgid "Whether to show the contact list in compact mode." +msgstr "相手先の一覧を小さく表示するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:19 -msgid "Echo cancellation support" -msgstr "" +msgid "Hide main window" +msgstr "メインウィンドウを隠すかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:20 -msgid "Empathy can publish the user's location" -msgstr "Empathyでユーザーの場所の公開を可能にする" +msgid "Hide the main window." +msgstr "メインウィンドウを隠すかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:21 -msgid "Empathy can use the GPS to guess the location" -msgstr "Empathyで場所の推測にGPSを利用することを可能にする" +msgid "Default directory to select an avatar image from" +msgstr "アバターの画像が格納されたデフォルトのフォルダー" #: ../data/org.gnome.Empathy.gschema.xml.in.h:22 -msgid "Empathy can use the cellular network to guess the location" -msgstr "Empathyで場所の推測にセルラーネットワークを利用することを可能にする" +msgid "The last directory that an avatar image was chosen from." +msgstr "最後にアバターを選択した時に使用したフォルダーです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:23 -msgid "Empathy can use the network to guess the location" -msgstr "Empathyで場所の推測にネットワークを利用することを可能にする" +msgid "Open new chats in separate windows" +msgstr "新しいチャットごとにウィンドウを開くかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:24 -msgid "Empathy default download folder" -msgstr "Empathy が使うデフォルトのダウンロード・フォルダー" +msgid "Always open a separate chat window for new chats." +msgstr "常に新しいチャットごとに別のチャットウィンドウを開きます。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:25 -msgid "Empathy has migrated butterfly logs" -msgstr "Empathy は butterfly のログを移行しました" +msgid "Display incoming events in the status area" +msgstr "受信したイベントを表示" #: ../data/org.gnome.Empathy.gschema.xml.in.h:26 -msgid "Empathy should auto-away when idle" -msgstr "アイドル時に自動的に離席するかどうか" +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." +msgstr "" +"受信したイベントを通知領域に表示します。もし false なら、ユーザーにすぐに通知" +"します。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:27 -msgid "Empathy should auto-connect on startup" -msgstr "起動時に自動接続するかどうか" +msgid "The position for the chat window side pane" +msgstr "チャットウィンドウの横のペインの位置" #: ../data/org.gnome.Empathy.gschema.xml.in.h:28 -msgid "Empathy should reduce the location's accuracy" -msgstr "Empathyは場所の精度を下げるかどうか" +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "保存されたチャットウィンドウの横のペインの位置 (ピクセル単位)" #: ../data/org.gnome.Empathy.gschema.xml.in.h:29 -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "仲間リストのアバターをチャットウィンドウのアイコンにするかどうか" +msgid "Contact list sort criterion" +msgstr "相手先の一覧を並び替える際の条件" #: ../data/org.gnome.Empathy.gschema.xml.in.h:30 -msgid "Enable WebKit Developer Tools" -msgstr "WebKit Developer Toolsを有効にする" +#, fuzzy +#| msgid "" +#| "Which criterion to use when sorting the contact list. Default is to sort " +#| "by the contact's name with the value \"name\". A value of \"state\" will " +#| "sort the contact list by state." +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." +msgstr "" +"相手先の一覧の中で相手先を並び替える際にどの条件を使用するか。デフォルトは相" +"手先の名前 (\"name\") です。\"state\" だと相手先の状態で相手先の一覧を並び替" +"えます。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 -msgid "Enable popup notifications for new messages" -msgstr "メッセージを受信したらポップアップで通知するかどうか" +msgid "Use notification sounds" +msgstr "通知のサウンドを使うかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 -msgid "Enable spell checker" -msgstr "スペルをチェックするかどうか" +msgid "Whether to play a sound to notify of events." +msgstr "イベントが発生したらサウンドを再生して通知するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:33 -msgid "Hide main window" -msgstr "メイン・ウィンドウを隠すかどうか" +msgid "Disable sounds when away" +msgstr "離席中のときはサウンドを鳴らさない" #: ../data/org.gnome.Empathy.gschema.xml.in.h:34 -msgid "Hide the main window." -msgstr "メイン・ウィンドウを隠すかどうかです。" +msgid "Whether to play sound notifications when away or busy." +msgstr "離席中または取り込み中のとき、サウンド通知を行うかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:35 -msgid "Nick completed character" -msgstr "ニックを補完する文字" +msgid "Play a sound for incoming messages" +msgstr "メッセージを受信したらサウンドを鳴らすかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:36 -msgid "Open new chats in separate windows" -msgstr "新しい会話毎にウィンドウを開くかどうか" +msgid "Whether to play a sound to notify of incoming messages." +msgstr "メッセージを受け取ったらサウンドを再生して通知するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:37 -msgid "Path of the Adium theme to use" -msgstr "使用する Adium テーマのパス" +msgid "Play a sound for outgoing messages" +msgstr "メッセージを送信したらサウンドを鳴らすかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:38 -msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "" -"会話で使用するテーマが Adium の場合に使用する Adium テーマのパスを指定しま" -"す。" +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "メッセージを送信したらサウンドを再生して通知するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:39 -msgid "Play a sound for incoming messages" -msgstr "メッセージを受信したらサウンドを演奏するかどうか" +msgid "Play a sound for new conversations" +msgstr "チャットで新しい会話をしたらサウンドを鳴らすかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:40 -msgid "Play a sound for new conversations" -msgstr "チャットで新しい会話をしたらサウンドを演奏するかどうか" +msgid "Whether to play a sound to notify of new conversations." +msgstr "新しい会話を開始したらサウンドを再生して通知するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:41 -msgid "Play a sound for outgoing messages" -msgstr "メッセージを送信したらサウンドを演奏するかどうか" +msgid "Play a sound when a contact logs in" +msgstr "相手先がサインインしたらサウンドを鳴らすかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:42 -msgid "Play a sound when a contact logs in" -msgstr "仲間がサインインしたらサウンドを演奏するかどうか" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "" +"相手先がサインインしたことを通知するためにサウンドを再生するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when a contact logs out" -msgstr "仲間がサインアウトしたらサウンドを演奏するかどうか" +msgstr "相手先がサインアウトしたらサウンドを鳴らすかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:44 -msgid "Play a sound when we log in" -msgstr "サインインしたらサウンドを演奏するかどうか" +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "" +"相手先がサインアウトしたことを通知するためにサウンドを再生するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:45 -msgid "Play a sound when we log out" -msgstr "サインアウトしたらサウンドを演奏するかどうか" +msgid "Play a sound when we log in" +msgstr "サインインしたらサウンドを鳴らすかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:46 -msgid "Pop up notifications if the chat isn't focused" -msgstr "" -"チャット・ウィンドウにフォーカスが当たっていない場合にポップアップ通知する" +msgid "Whether to play a sound when logging into a network." +msgstr "ネットワークにサインインしたらサウンドを再生するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:47 -msgid "Pop up notifications when a contact logs in" -msgstr "仲間がサインインした際にポップアップ通知" +msgid "Play a sound when we log out" +msgstr "サインアウトしたらサウンドを鳴らすかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:48 -msgid "Pop up notifications when a contact logs out" -msgstr "仲間がサインアウトした際にポップアップ通知" +msgid "Whether to play a sound when logging out of a network." +msgstr "ネットワークからサインアウトしたらサウンドを再生するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:49 -msgid "Position the camera preview should be during a call." -msgstr "" +msgid "Enable popup notifications for new messages" +msgstr "メッセージを受信したらポップアップで通知するかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:50 -#, fuzzy -#| msgid "Show co_mpact contact list" -msgid "Show Balance in contact list" -msgstr "仲間リストをコンパクトにする(_M)" +msgid "Whether to show a popup notification when receiving a new message." +msgstr "新しいメッセージを受信する際に、ポップアップ通知するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:51 -msgid "Show avatars" -msgstr "アバターを表示するかどうか" +msgid "Disable popup notifications when away" +msgstr "離席中のときはポップアップ通知しない" #: ../data/org.gnome.Empathy.gschema.xml.in.h:52 -msgid "Show contact list in rooms" -msgstr "部屋に仲間の一覧を表示するかどうか" +msgid "Whether to show popup notifications when away or busy." +msgstr "離席中または取り込み中のとき、ポップアップ通知を表示するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:53 -msgid "Show hint about closing the main window" -msgstr "メイン・ウィンドウを閉じる際のヒントを表示するかどうか" +msgid "Pop up notifications if the chat isn't focused" +msgstr "" +"チャットウィンドウにフォーカスが当たっていない場合にポップアップ通知する" #: ../data/org.gnome.Empathy.gschema.xml.in.h:54 -msgid "Show offline contacts" -msgstr "オフラインな仲間を表示するかどうか" +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" +"チャットウィンドウが開いていてもフォーカスが当たっていない場合、新しいメッ" +"セージを受信する際にポップアップ通知を行うかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -msgid "Show protocols" -msgstr "プロトコルを表示" +msgid "Pop up notifications when a contact logs in" +msgstr "相手先がサインインした際にポップアップ通知" #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 -msgid "Spell checking languages" -msgstr "スペルをチェックする言語" +msgid "Whether to show a popup notification when a contact goes online." +msgstr "相手先がオンラインになった際にポップアップ通知を表示するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:57 -msgid "The default folder to save file transfers in." -msgstr "転送したファイルを保存するデフォルトのフォルダーです。" +msgid "Pop up notifications when a contact logs out" +msgstr "相手先がサインアウトした際にポップアップ通知" #: ../data/org.gnome.Empathy.gschema.xml.in.h:58 -msgid "The last directory that an avatar image was chosen from." -msgstr "最後にアバターを選択した時に使用したフォルダーです。" +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "相手先がオフラインになった際にポップアップ通知を表示するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:59 -msgid "The position for the chat window side pane" -msgstr "チャットウィンドウの横のペインの位置" +msgid "Use graphical smileys" +msgstr "スマイリー・アイコンを使うかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:60 -msgid "The stored position (in pixels) of the chat window side pane." -msgstr "保存されたチャットウィンドウの横のペインの位置 (ピクセル単位)" +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "会話中のスマイリーをグラフィカルな画像に変換するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:61 -msgid "The theme that is used to display the conversation in chat windows." -msgstr "チャットウィンドウで使用するテーマです。" +msgid "Show contact list in rooms" +msgstr "談話室に相手先の一覧を表示するかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:62 -#, fuzzy -#| msgid "The theme that is used to display the conversation in chat windows." -msgid "" -"The theme variant that is used to display the conversation in chat windows." -msgstr "チャットウィンドウで使用するテーマです。" +msgid "Whether to show the contact list in chat rooms." +msgstr "談話室で相手先の一覧を表示するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:63 -msgid "Use graphical smileys" -msgstr "スマイリー・アイコンを使うかどうか" +msgid "Chat window theme" +msgstr "チャットウィンドウのテーマ" #: ../data/org.gnome.Empathy.gschema.xml.in.h:64 -msgid "Use notification sounds" -msgstr "状態をサウンドの演奏で通知するかどうか" +msgid "The theme that is used to display the conversation in chat windows." +msgstr "チャットウィンドウで使用するテーマです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "Use theme for chat rooms" -msgstr "チャットルームにテーマを適用するかどうか" +#, fuzzy +msgid "Chat window theme variant" +msgstr "チャットウィンドウのテーマ" #: ../data/org.gnome.Empathy.gschema.xml.in.h:66 -msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "Empathyが仲間に場所を公開するかどうかを設定します。" +#, fuzzy +msgid "" +"The theme variant that is used to display the conversation in chat windows." +msgstr "チャットウィンドウで使用するテーマです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:67 -msgid "Whether Empathy can use the GPS to guess the location." -msgstr "EmpathyがGPSで場所を推測するかどうかを設定します。" +msgid "Path of the Adium theme to use" +msgstr "使用する Adium テーマのパス" #: ../data/org.gnome.Empathy.gschema.xml.in.h:68 -msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "Empathyがセルラーネットワークで場所を推測するかどうかを設定します。" +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "" +"チャットで使用するテーマが Adium の場合に使用する Adium テーマのパスを指定し" +"ます。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:69 -msgid "Whether Empathy can use the network to guess the location." -msgstr "Empathyがネットワークで場所を推測するかどうかを設定します。" +msgid "Enable WebKit Developer Tools" +msgstr "WebKit Developer Tools を有効にする" #: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "Whether Empathy has migrated butterfly logs." -msgstr "Empathy が butterfly のログを移行したかどうか。" +msgid "" +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." +msgstr "Web Inspector のような WebKit developer tools を有効にするかどうか。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:71 -msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "" -"Empathy を起動したら自動的に自分のアカウントにサインインするかどうかです。" +msgid "Use theme for chat rooms" +msgstr "談話室にテーマを適用するかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:72 -msgid "" -"Whether Empathy should go into away mode automatically if the user is idle." -msgstr "アイドル状態になったら、Empathy が自動的に離席するかどうかです。" +msgid "Whether to use the theme for chat rooms." +msgstr "談話室でテーマを使用するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:73 -msgid "" -"Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "Empathyがプライバシーの理由で場所の精度を下げるかどうかを設定します。" +msgid "Spell checking languages" +msgstr "スペルをチェックする言語" #: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" -"Whether Empathy should use the avatar of the contact as the chat window icon." +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" -"Empathy が仲間のアバターをチャットウィンドウのアイコンとして利用するかどうか" -"です。" +"スペルをチェックする言語をコンマで区切って指定します (例: \"en, fr, nl\")。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:75 -msgid "" -"Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "Web InspectorのようなWebKit developer toolsを有効にするかどうか。" +msgid "Enable spell checker" +msgstr "スペルをチェックするかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "" -"Whether connectivity managers should be used to automatically disconnect/" -"reconnect." -msgstr "" -"自動的に切断/再接続するのに接続マネージャーを利用すべきかどうかを設定します。" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 -msgid "" "Whether to check words typed against the languages you want to check with." msgstr "指定した言語で入力した単語をチェックするかどうかです。" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +msgid "Nick completed character" +msgstr "ニックネームを補完する文字" + #: ../data/org.gnome.Empathy.gschema.xml.in.h:78 -msgid "Whether to convert smileys into graphical images in conversations." -msgstr "会話中のスマイリーをグラフィカルな画像に変換するかどうかです。" +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "" +"グループチャットでニックネームを補完(tab)した際に、ニックネームの後ろに追加す" +"る文字です。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:79 -msgid "Whether to enable Pulseaudio's echo cancellation filter." -msgstr "" +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "相手先の一覧のアバターをチャットウィンドウのアイコンにするかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:80 -msgid "Whether to play a sound to notify of contacts logging into the network." +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" -"仲間がサインインしたことを通知するためにサウンドを再生するかどうかです。" +"Empathy が相手先のアバターをチャットウィンドウのアイコンとして利用するかどう" +"かです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:81 -msgid "" -"Whether to play a sound to notify of contacts logging out of the network." +msgid "Last account selected in Join Room dialog" msgstr "" -"仲間がサインアウトしたことを通知するためにサウンドを再生するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:82 -msgid "Whether to play a sound to notify of events." -msgstr "イベントが発生したらサウンドを再生して通知するかどうかです。" +msgid "D-Bus object path of the last account selected to join a room." +msgstr "" #: ../data/org.gnome.Empathy.gschema.xml.in.h:83 -msgid "Whether to play a sound to notify of incoming messages." -msgstr "メッセージを受け取ったらサウンドを再生して通知するかどうかです。" +msgid "Camera device" +msgstr "カメラデバイス" #: ../data/org.gnome.Empathy.gschema.xml.in.h:84 -msgid "Whether to play a sound to notify of new conversations." -msgstr "新しい会話を開始したらサウンドを再生して通知するかどうかです。" +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "ビデオ通話に使用するデフォルトのカメラデバイス。たとえば /dev/video0" #: ../data/org.gnome.Empathy.gschema.xml.in.h:85 -msgid "Whether to play a sound to notify of outgoing messages." -msgstr "メッセージを送信したらサウンドを再生して通知するかどうかです。" +msgid "Camera position" +msgstr "カメラの位置" #: ../data/org.gnome.Empathy.gschema.xml.in.h:86 -msgid "Whether to play a sound when logging into a network." -msgstr "ネットワークにサインインしたらサウンドを再生するかどうかです。" +msgid "Position the camera preview should be during a call." +msgstr "" #: ../data/org.gnome.Empathy.gschema.xml.in.h:87 -msgid "Whether to play a sound when logging out of a network." -msgstr "ネットワークからサインアウトしたらサウンドを再生するかどうかです。" +msgid "Echo cancellation support" +msgstr "エコー除去のサポート" #: ../data/org.gnome.Empathy.gschema.xml.in.h:88 -msgid "Whether to play sound notifications when away or busy." -msgstr "離席中または多忙になったらサウンドの再生による通知を行うかどうかです。" +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "Pulseaudio のエコー除去フィルターを有効にするかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:89 -msgid "Whether to show a popup notification when a contact goes offline." -msgstr "" -"仲間がオフラインになった際にポップアップでの通知を表示するかどうかです。" +msgid "Show hint about closing the main window" +msgstr "メインウィンドウを閉じる際のヒントを表示するかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:90 -msgid "Whether to show a popup notification when a contact goes online." +msgid "" +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." msgstr "" -"仲間がオンラインになった際にポップアップでの通知を表示するかどうかです。" +"タイトルバーにある 'x' ボタンをクリックしてメインウィンドウを閉じたらメッセー" +"ジ・ダイアログを表示するかどうかです。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:91 -msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." -msgstr "" -"チャット・ウィンドウが開いていてもフォーカスが当たっていなければ、新しいメッ" -"セージを受信する度にポップアップ通知を行うかどうかです。" +msgid "Empathy can publish the user's location" +msgstr "Empathy でユーザーの場所の公開を可能にする" #: ../data/org.gnome.Empathy.gschema.xml.in.h:92 -msgid "Whether to show a popup notification when receiving a new message." -msgstr "新しいメッセージを受信する度にポップアップ通知するかどうかです。" +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "Empathy が相手先に場所を公開するかどうかを設定します。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:93 -#, fuzzy -#| msgid "Whether to show protocols for contacts in the contact list." -msgid "Whether to show account balances in the contact list." -msgstr "仲間リストの中の仲間にプロトコルを表示するかどうかです。" +msgid "Empathy can use the network to guess the location" +msgstr "Empathy で場所の推測にネットワークを利用することを可能にする" #: ../data/org.gnome.Empathy.gschema.xml.in.h:94 -msgid "" -"Whether to show avatars for contacts in the contact list and chat windows." -msgstr "" -"仲間リストとチャットウィンドウの中に仲間のアバターを表示するかどうかです。" +msgid "Whether Empathy can use the network to guess the location." +msgstr "Empathy がネットワークで場所を推測するかどうかを設定します。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:95 -msgid "Whether to show contacts that are offline in the contact list." -msgstr "仲間リストの中でオフラインの仲間を表示するかどうかです。" +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy で場所の推測にセルラーネットワークを利用することを可能にする" #: ../data/org.gnome.Empathy.gschema.xml.in.h:96 -msgid "Whether to show popup notifications when away or busy." -msgstr "" -"状態が離席中または多忙になってもポップアップ通知を表示するかどうかです。" +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "Empathy がセルラーネットワークで場所を推測するかどうかを設定します。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:97 -msgid "Whether to show protocols for contacts in the contact list." -msgstr "仲間リストの中の仲間にプロトコルを表示するかどうかです。" +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy で場所の推測に GPS を利用することを可能にする" #: ../data/org.gnome.Empathy.gschema.xml.in.h:98 -msgid "Whether to show the contact list in chat rooms." -msgstr "チャットルームで仲間リストを表示するかどうかです。" +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Empathy が GPS で場所を推測するかどうかを設定します。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:99 -msgid "Whether to show the contact list in compact mode." -msgstr "仲間リストを小さく表示するかどうかです。" +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy は場所の精度を下げるかどうか" #: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." -msgstr "" -"タイトルバーにある 'x' ボタンをクリックしてメインウィンドウを閉じたらメッセー" -"ジ・ダイアログを表示するかどうかです。" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 -msgid "Whether to use the theme for chat rooms." -msgstr "チャットルームでテーマを使用するかどうかです。" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 -msgid "" -"Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." -msgstr "" -"仲間リストの中で仲間を並び替える際にどの条件を使用するか。デフォルトは仲間の" -"名前 (\"name\") です。\"state\" だと仲間の状態で仲間リストを並び替えます。" +"Whether Empathy should reduce the location's accuracy for privacy reasons." +msgstr "Empathy がプライバシーの理由で場所の精度を下げるかどうかを設定します。" +#. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2327 +msgid "Messaging and VoIP Accounts" +msgstr "メッセージングと VoIP のアカウント" + +#: ../data/empathy-accounts.desktop.in.in.h:2 msgid "Manage Messaging and VoIP accounts" msgstr "メッセージングと VoIP のアカウントの管理" -#. Tweak the dialog -#: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2324 -msgid "Messaging and VoIP Accounts" -msgstr "メッセージングと VoIP のアカウント" +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "原因が特定されていません" -#: ../libempathy/empathy-ft-handler.c:825 -#, fuzzy -#| msgid "File transfer completed" +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "状態の変更を要求されました" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "ファイル転送をキャンセルしました" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "他の相手先がファイル転送をキャンセルしました" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "ファイルの転送中にエラーが発生しました" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "他の相手先がファイル転送できませんでした" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "原因不明です" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" -msgstr "ファイルの転送が完了しました" +msgstr "ファイルの転送が完了しました。しかしファイルは壊れています" -#: ../libempathy/empathy-ft-handler.c:1111 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "リモート側の相手はファイル転送をサポートしていません。" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "選択したファイルは一般的なファイルではありません" -#: ../libempathy/empathy-ft-handler.c:1176 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "選択されたファイルは空です" #: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131 -#, fuzzy, c-format -#| msgid "Incoming call from %s" +#, c-format msgid "Missed call from %s" -msgstr "%s さんからの呼び出しです" +msgstr "%s さんからの失敗した通話" #. Translators: this is an outgoing call, e.g. 'Called Alice' #: ../libempathy/empathy-message.c:419 #, fuzzy, c-format -#| msgid "Call with %s" msgid "Called %s" -msgstr "%sで発信" +msgstr "%s さんへの通話" #: ../libempathy/empathy-message.c:422 -#, fuzzy, c-format -#| msgid "Incoming call from %s" +#, c-format msgid "Call from %s" -msgstr "%s さんからの呼び出しです" +msgstr "%s さんからの通話" -#: ../libempathy/empathy-tp-file.c:268 -msgid "Socket type not supported" -msgstr "サポートされていないソケットタイプです" - -#: ../libempathy/empathy-tp-file.c:387 -msgid "No reason was specified" -msgstr "原因が特定されていません" - -#: ../libempathy/empathy-tp-file.c:390 -msgid "The change in state was requested" -msgstr "状態の変更を要求されました" - -#: ../libempathy/empathy-tp-file.c:393 -msgid "You canceled the file transfer" -msgstr "ファイル転送をキャンセルしました" - -#: ../libempathy/empathy-tp-file.c:396 -msgid "The other participant canceled the file transfer" -msgstr "他の仲間がファイル転送をキャンセルしました" - -#: ../libempathy/empathy-tp-file.c:399 -msgid "Error while trying to transfer the file" -msgstr "ファイルの転送中にエラーが発生しました" - -#: ../libempathy/empathy-tp-file.c:402 -msgid "The other participant is unable to transfer the file" -msgstr "他の仲間がファイル転送できませんでした" - -#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302 -msgid "Unknown reason" -msgstr "原因不明です" - -#: ../libempathy/empathy-utils.c:222 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "在席中" -#: ../libempathy/empathy-utils.c:224 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "取り込み中" -#: ../libempathy/empathy-utils.c:227 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "離席中" -#: ../libempathy/empathy-utils.c:229 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" -msgstr "非表示" +msgstr "隠れ中" -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "オフライン" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:234 -#, fuzzy -#| msgid "Unknown" +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "不明" -#: ../libempathy/empathy-utils.c:274 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "原因が特定されていません" -#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" -msgstr "状態はオフラインに設定されています" +msgstr "在席状況はオフラインに設定されています" -#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "ネットワークのエラーです" -#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "認証に失敗しました" -#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316 +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "暗号化のエラーです" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" -msgstr "使用中の名前" +msgstr "名前は使用中です" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "証明書がありません" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "信用のない証明書です" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "証明書の有効期限が切れています" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "証明書は利用できません" -#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "証明書のホスト名が一致しません" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "証明書の指紋が一致しません" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "証明書自身の署名です" -#: ../libempathy/empathy-utils.c:300 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "証明書に関連するエラーです" -#: ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "暗号が利用できません" -#: ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "証明書が正しくありません" -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "接続が拒否されました" -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "接続を確立できませんでした" -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "接続が失われました" -#: ../libempathy/empathy-utils.c:344 -msgid "This resource is already connected to the server" -msgstr "このリソースは既にサーバーに接続済みです" +#: ../libempathy/empathy-utils.c:355 +#, fuzzy +#| msgid "This resource is already connected to the server" +msgid "This account is already connected to the server" +msgstr "このリソースはすでにサーバーに接続済みです" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:357 msgid "" "Connection has been replaced by a new connection using the same resource" -msgstr "接続は同じリソースを使って新しい接続で置き換わりました" +msgstr "接続は同じリソースを使う新しい接続で置き換わりました" -#: ../libempathy/empathy-utils.c:349 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" -msgstr "アカウントがサーバーに既に存在しています" +msgstr "アカウントがサーバーにすでに存在しています" -#: ../libempathy/empathy-utils.c:351 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "サーバーがこの接続を処理できないくらいに忙しい状態にあります" -#: ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "証明書が無効化されました" -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:366 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "証明書が安全でない暗号のアルゴリズムを使っているか、暗号的に弱いです" -#: ../libempathy/empathy-utils.c:358 +#: ../libempathy/empathy-utils.c:369 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -734,288 +731,260 @@ msgstr "" "サーバー証明書の長さや、サーバー証明書のチェインの深さが暗号ライブラリで規定" "されている長さを越えています" -#: ../libempathy/empathy-utils.c:519 -#: ../libempathy-gtk/empathy-contact-list-store.h:73 +#: ../libempathy/empathy-utils.c:373 +msgid "Your software is too old" +msgstr "ソフトウェアが古すぎます" + +#: ../libempathy/empathy-utils.c:375 +#, fuzzy +#| msgid "Interval (seconds)" +msgid "Internal error" +msgstr "間隔 (秒)" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" -msgstr "すぐ近くにいる人達" +msgstr "People Nearby" -#: ../libempathy/empathy-utils.c:524 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:553 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" -msgstr "" +msgstr "Google トーク" -#: ../libempathy/empathy-utils.c:554 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Facebook Chat" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "%d 秒前" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "%d 分前" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "%d 時間前" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 日前" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d 週間前" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d ヶ月前" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "未来に" -#: ../libempathy-gtk/empathy-account-chooser.c:540 -#, fuzzy -#| msgid "Accounts" +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" -msgstr "アカウント" +msgstr "すべてのアカウント" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "アカウント" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "パスワード" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "サーバー" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "ポート番号" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:765 +#: ../libempathy-gtk/empathy-account-widget.c:817 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -#, fuzzy -#| msgid "Empathy Accounts" -msgid "My Web Accounts" -msgstr "Empathy のアカウント" - -#: ../libempathy-gtk/empathy-account-widget.c:1208 -#, c-format -msgid "The account %s is edited via %s." -msgstr "" - -#: ../libempathy-gtk/empathy-account-widget.c:1214 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "" - -#: ../libempathy-gtk/empathy-account-widget.c:1233 -#, fuzzy -#| msgid "Empathy Accounts" -msgid "Launch My Web Accounts" -msgstr "Empathy のアカウント" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1241 -#, fuzzy, c-format -#| msgid "_Edit" -msgid "Edit %s" -msgstr "編集(_E)" - -#: ../libempathy-gtk/empathy-account-widget.c:1591 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget.c:1398 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Username:" msgstr "ユーザー名:" -#: ../libempathy-gtk/empathy-account-widget.c:1909 +#: ../libempathy-gtk/empathy-account-widget.c:1710 msgid "A_pply" msgstr "適用(_P)" -#: ../libempathy-gtk/empathy-account-widget.c:1939 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "L_og in" msgstr "ログイン(_O)" -#: ../libempathy-gtk/empathy-account-widget.c:2013 +#: ../libempathy-gtk/empathy-account-widget.c:1812 msgid "This account already exists on the server" msgstr "このアカウントはすでにサーバーに存在します" -#: ../libempathy-gtk/empathy-account-widget.c:2016 +#: ../libempathy-gtk/empathy-account-widget.c:1816 msgid "Create a new account on the server" msgstr "サーバーで新しいアカウントを作る" -#: ../libempathy-gtk/empathy-account-widget.c:2208 -msgid "Ca_ncel" -msgstr "中止(_N)" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2486 +#: ../libempathy-gtk/empathy-account-widget.c:2241 #, c-format msgid "%1$s on %2$s" msgstr "%2$s にある %1$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2512 +#: ../libempathy-gtk/empathy-account-widget.c:2267 #, c-format msgid "%s Account" msgstr "%s アカウント" -#: ../libempathy-gtk/empathy-account-widget.c:2516 +#: ../libempathy-gtk/empathy-account-widget.c:2271 msgid "New account" msgstr "新しいアカウント" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 -msgid "Example: MyScreenName" -msgstr "例: MyScreenName" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Pass_word:" +msgstr "パスワード(_W):" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 -msgid "Advanced" -msgstr "詳細" +msgid "Screen _Name:" +msgstr "スクリーン名(_N):" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +msgid "Example: MyScreenName" +msgstr "例: MyScreenName" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 -msgid "Pass_word:" -msgstr "パスワード(_W):" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "パスワードを記憶する" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -#, fuzzy -#| msgid "Password" -msgid "Remember Password" -msgstr "パスワード" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Port:" +msgstr "ポート番号(_P):" -#. remember password ticky box -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 -msgid "Remember password" -msgstr "" - -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 -msgid "Screen _Name:" -msgstr "スクリーン名(_N):" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "_Server:" +msgstr "サーバー(_S):" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 -msgid "What is your AIM password?" -msgstr "AIMのパスワードを入力してください" +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Advanced" +msgstr "詳細" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 msgid "What is your AIM screen name?" -msgstr "AIMのスクリーンネームを入力してください" +msgstr "AIM のスクリーンネームを入力してください" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 -msgid "_Port:" -msgstr "ポート番号(_P):" +msgid "What is your AIM password?" +msgstr "AIMのパスワードを入力してください" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../src/empathy-new-chatroom-dialog.ui.h:9 -msgid "_Server:" -msgstr "サーバー(_S):" - -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "Example: username" -msgstr "例: username" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "Remember Password" +msgstr "パスワードを記憶する" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "ログイン名(_D):" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 -msgid "What is your GroupWise User ID?" -msgstr "GroupWiseのUser IDを入力してください" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Example: username" +msgstr "例: username" #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +msgid "What is your GroupWise User ID?" +msgstr "GroupWise の User ID を入力してください" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 msgid "What is your GroupWise password?" -msgstr "GroupWiseのパスワードを入力してください" +msgstr "GroupWise のパスワードを入力してください" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "ICQ UIN(_U):" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "Example: 123456789" msgstr "例: 123456789" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "Ch_aracter set:" msgstr "文字集合(_A):" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 -msgid "ICQ _UIN:" -msgstr "ICQ UIN(_U):" - -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 msgid "What is your ICQ UIN?" -msgstr "ICQ UINを入力してください" +msgstr "ICQ UIN を入力してください" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 msgid "What is your ICQ password?" -msgstr "ICQのパスワードを入力してください" +msgstr "ICQ のパスワードを入力してください" #: ../libempathy-gtk/empathy-account-widget-sip.c:206 #: ../libempathy-gtk/empathy-account-widget-sip.c:239 @@ -1050,23 +1019,30 @@ msgstr "Options" msgid "None" msgstr "なし" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Network" +msgstr "ネットワーク" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 -msgid "Character set:" -msgstr "文字集合:" +msgid "Network:" +msgstr "ネットワーク:" +# 元の語によらず、「文字エンコーディング」と訳す(ヘルプの対応する項も参照)。 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 -msgid "" -"Most IRC servers don't need a password, so if you're not sure, don't enter a " -"password." -msgstr "" +msgid "Character set:" +msgstr "文字エンコーディング:" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 -msgid "Network" -msgstr "ネットワーク" +msgid "Servers" +msgstr "サーバー" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 -msgid "Network:" -msgstr "ネットワーク:" +msgid "" +"Most IRC servers don't need a password, so if you're not sure, don't enter a " +"password." +msgstr "" +"たいていの IRC サーバーでは、パスワードは不要です。わからなければ、パスワード" +"を入力しないでください。" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" @@ -1084,48 +1060,20 @@ msgstr "終了時のメッセージ:" msgid "Real name:" msgstr "氏名:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 -msgid "Servers" -msgstr "サーバー" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 -msgid "What is your IRC nickname?" -msgstr "IRC のニックネームは何ですか?" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Which IRC network?" msgstr "どの IRC ネットワークですか?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "Example: user@gmail.com" -msgstr "例: user@gmail.com" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "Example: user@jabber.org" -msgstr "例: user@jabber.org" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 -msgid "Encr_yption required (TLS/SSL)" -msgstr "TLS/SSL での暗号化が必要(_Y)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 -msgid "I_gnore SSL certificate errors" -msgstr "SSLの証明書に関連するエラーは無視(_G)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 -msgid "Override server settings" -msgstr "サーバーの設定を上書きする" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 -msgid "Priori_ty:" -msgstr "優先度(_T):" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "What is your IRC nickname?" +msgstr "IRC のニックネームは何ですか?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 -msgid "Reso_urce:" -msgstr "リソース(_U):" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "What is your Facebook username?" +msgstr "あなたの Facebook のユーザー名は何ですか?" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/badger, enter badger.\n" @@ -1139,178 +1087,202 @@ msgstr "" "まだ持っていないのであれば、こ" "のページを使って Facebook のユーザー名を選択してください。" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 -msgid "Use old SS_L" -msgstr "古い SSL を使う(_L)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "What is your Facebook password?" msgstr "あなたの Facebook のパスワードは何ですか?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 -msgid "What is your Facebook username?" -msgstr "あなたの Facebook のユーザー名は何ですか?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "What is your Google ID?" -msgstr "Google IDを入力してください" +msgstr "Google ID を入力してください" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Example: user@gmail.com" +msgstr "例: user@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "What is your Google password?" -msgstr "Googleのパスワードを入力してください" +msgstr "Google のパスワードを入力してください" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 -msgid "What is your Jabber ID?" -msgstr "Jabber IDを入力してください" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +msgid "Example: user@jabber.org" +msgstr "例: user@jabber.org" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 -msgid "What is your Jabber password?" -msgstr "Jabberパスワードを入力してください" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "I_gnore SSL certificate errors" +msgstr "SSL の証明書に関連するエラーは無視(_G)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +msgid "Priori_ty:" +msgstr "優先度(_T):" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +msgid "Reso_urce:" +msgstr "リソース(_U):" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "Encr_yption required (TLS/SSL)" +msgstr "TLS/SSL での暗号化が必要(_Y)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "Use old SS_L" +msgstr "古い SSL を使う(_L)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "Override server settings" +msgstr "サーバーの設定を上書き" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 -msgid "What is your desired Jabber ID?" -msgstr "希望するJabber IDを入力してください" +msgid "What is your Jabber ID?" +msgstr "Jabber ID を入力してください" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +msgid "What is your desired Jabber ID?" +msgstr "希望する Jabber ID を入力してください" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +msgid "What is your Jabber password?" +msgstr "Jabber パスワードを入力してください" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 msgid "What is your desired Jabber password?" -msgstr "希望するJabberパスワードを入力してください" +msgstr "希望する Jabber パスワードを入力してください" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 msgid "Example: user@hotmail.com" msgstr "例: user@hotmail.com" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 msgid "What is your Windows Live ID?" -msgstr "あなたの Windows Live ID は何ですか?" +msgstr "Windows Live ID を入力してください" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 msgid "What is your Windows Live password?" msgstr "Windows Live のパスワードを入力してください" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "E-_mail address:" -msgstr "E-メールアドレス(_M):" - -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 msgid "Nic_kname:" msgstr "ニックネーム(_K):" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "_Last Name:" +msgstr "姓(_L):" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 msgid "_First Name:" msgstr "名前(_F):" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +msgid "_Published Name:" +msgstr "公称(_P):" + #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Jabber ID:" msgstr "Jabber ID(_J):" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 -msgid "_Last Name:" -msgstr "名字(_L):" +msgid "E-_mail address:" +msgstr "E-メールアドレス(_M):" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -msgid "_Published Name:" -msgstr "公称(_P):" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "_Username:" +msgstr "ユーザー名(_U):" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Example: user@my.sip.server" msgstr "例: user@my.sip.server" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "Authentication username:" -msgstr "認証用ユーザー名:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover Binding" -msgstr "バインディングの探索" - #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "Discover the STUN server automatically" -msgstr "STUN サーバーを自動的に探索する" +msgid "Use this account to call _landlines and mobile phones" +msgstr "" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 -msgid "Ignore TLS Errors" -msgstr "" +msgid "NAT Traversal Options" +msgstr "NAT 超えオプション" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "Interval (seconds)" -msgstr "間隔 (秒)" +msgid "Proxy Options" +msgstr "プロキシのオプション" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -msgid "Keep-Alive Options" -msgstr "Keep-Alive オプション" +msgid "Miscellaneous Options" +msgstr "その他のオプション" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 -msgid "Loose Routing" -msgstr "緩いルーティング" +msgid "STUN Server:" +msgstr "STUN サーバー:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 -msgid "Mechanism:" -msgstr "メカニズム:" +msgid "Discover the STUN server automatically" +msgstr "STUN サーバーを自動的に探索する" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 -msgid "Miscellaneous Options" -msgstr "その他のオプション" +msgid "Discover Binding" +msgstr "バインディングの探索" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -msgid "NAT Traversal Options" -msgstr "NAT 超えオプション" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "サーバー:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Keep-Alive Options" +msgstr "Keep-Alive オプション" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 -msgid "Port:" -msgstr "ポート番号:" +msgid "Mechanism:" +msgstr "メカニズム:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 -msgid "Proxy Options" -msgstr "プロキシのオプション" +msgid "Interval (seconds)" +msgstr "間隔 (秒)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Authentication username:" +msgstr "認証用ユーザー名:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Transport:" +msgstr "トランスポート:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -msgid "STUN Server:" -msgstr "STUN サーバー:" +msgid "Loose Routing" +msgstr "緩いルーティング" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contact-widget.c:347 -msgid "Server:" -msgstr "サーバー:" +msgid "Ignore TLS Errors" +msgstr "TLS エラーを無視する" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -msgid "Transport:" -msgstr "トランスポート:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -msgid "Use this account to call _landlines and mobile phones" -msgstr "" +msgid "Port:" +msgstr "ポート番号:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 -msgid "What is your SIP account password?" -msgstr "SIPアカウントのパスワードを入力してください" +msgid "What is your SIP login ID?" +msgstr "SIP のログイン ID を入力してください" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 -msgid "What is your SIP login ID?" -msgstr "SIPのログインIDを入力してください" +msgid "What is your SIP account password?" +msgstr "SIP アカウントのパスワードを入力してください" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 -msgid "_Username:" -msgstr "ユーザー名(_U):" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Yahoo! I_D:" +msgstr "Yahoo! の ID(_D):" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "I_gnore conference and chat room invitations" -msgstr "会議とチャットルームへの勧誘を無視(_G)" - -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 -msgid "What is your Yahoo! ID?" -msgstr "Yahoo! IDを入力してください" +msgstr "会議と談話室への招待を無視(_G)" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 -msgid "What is your Yahoo! password?" -msgstr "Yahoo!のパスワードを入力してください" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Room List locale:" +msgstr "談話室の一覧がある場所(_R):" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "Yahoo! I_D:" -msgstr "Yahoo! の ID(_D):" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 +msgid "What is your Yahoo! ID?" +msgstr "Yahoo! ID を入力してください" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 -msgid "_Room List locale:" -msgstr "部屋の一覧がある場所(_R):" +msgid "What is your Yahoo! password?" +msgstr "Yahoo! のパスワードを入力してください" #: ../libempathy-gtk/empathy-avatar-chooser.c:471 #: ../libempathy-gtk/empathy-avatar-chooser.c:556 @@ -1322,10 +1294,8 @@ msgid "None of the accepted image formats are supported on your system" msgstr "受付られた画像の形式が、お使いのシステムでサポートされていません" #: ../libempathy-gtk/empathy-avatar-chooser.c:819 -#, fuzzy -#| msgid "Couldn't convert image" msgid "Couldn't save picture to file" -msgstr "画像を変換できませんでした" +msgstr "画像をファイルに保存できませんでした" #: ../libempathy-gtk/empathy-avatar-chooser.c:939 msgid "Select Your Avatar Image" @@ -1352,105 +1322,100 @@ msgid "Click to enlarge" msgstr "クリックすると大きくなります" #: ../libempathy-gtk/empathy-call-utils.c:44 -#: ../libempathy-gtk/empathy-call-utils.c:60 -#, fuzzy -#| msgid "There was an error while creating the account." +#: ../libempathy-gtk/empathy-call-utils.c:62 msgid "There was an error starting the call" -msgstr "アカウントの作成中にエラーが発生しました。" +msgstr "呼び出し中にエラーが発生しました。" #: ../libempathy-gtk/empathy-call-utils.c:51 msgid "The specified contact doesn't support calls" -msgstr "" +msgstr "選択した相手先は通話をサポートしていません" #: ../libempathy-gtk/empathy-call-utils.c:53 -#, fuzzy -#| msgid "The selected contact is offline." msgid "The specified contact is offline" -msgstr "選択した仲間はオフラインです。" +msgstr "選択した相手先はオフラインです" #: ../libempathy-gtk/empathy-call-utils.c:55 -#, fuzzy -#| msgid "The selected contact is offline." msgid "The specified contact is not valid" -msgstr "選択した仲間はオフラインです。" +msgstr "選択した相手先は有効ではありません" #: ../libempathy-gtk/empathy-call-utils.c:57 -#, fuzzy -#| msgid "Topic not supported on this conversation" msgid "Emergency calls are not supported on this protocol" -msgstr "この会話ではトピックはサポートされていません" +msgstr "このプロトコルは緊急呼び出しをサポートしていません" + +#: ../libempathy-gtk/empathy-call-utils.c:59 +msgid "You don't have enough credit in order to place this call" +msgstr "この通話を行うにはクレジットが不足しています" -#: ../libempathy-gtk/empathy-chat.c:702 +#: ../libempathy-gtk/empathy-chat.c:710 msgid "Failed to open private chat" msgstr "プライベートなチャットを開けませんでした" -#: ../libempathy-gtk/empathy-chat.c:763 +#: ../libempathy-gtk/empathy-chat.c:768 msgid "Topic not supported on this conversation" msgstr "この会話ではトピックはサポートされていません" -#: ../libempathy-gtk/empathy-chat.c:769 +#: ../libempathy-gtk/empathy-chat.c:774 msgid "You are not allowed to change the topic" msgstr "トピックの変更は許可されていません" #: ../libempathy-gtk/empathy-chat.c:973 -#, fuzzy, c-format -#| msgid "invalid contact" +#, c-format msgid "“%s” is not a valid contact ID" -msgstr "無効な仲間です" +msgstr "“%s” は無効な相手先 ID です" -#: ../libempathy-gtk/empathy-chat.c:1058 +#: ../libempathy-gtk/empathy-chat.c:1068 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: 現在の会話からすべてのメッセージをクリア" -#: ../libempathy-gtk/empathy-chat.c:1061 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/topic : set the topic of the current conversation" msgstr "/topic <トピック>: 現在の会話のトピックを設定" -#: ../libempathy-gtk/empathy-chat.c:1064 +#: ../libempathy-gtk/empathy-chat.c:1074 msgid "/join : join a new chat room" -msgstr "/join <チャットルームID>: 新しくチャットルームに参加" +msgstr "/join <談話室ID>: 新しく談話室に参加" -#: ../libempathy-gtk/empathy-chat.c:1067 +#: ../libempathy-gtk/empathy-chat.c:1077 msgid "/j : join a new chat room" -msgstr "/j <チャットルームID>: 新しくチャットルームに参加" +msgstr "/j <談話室ID>: 新しく談話室に参加" -#: ../libempathy-gtk/empathy-chat.c:1071 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "" "/part [] []: leave the chat room, by default the " "current one" -msgstr "" +msgstr "/part [<談話室ID>] [<理由>]: 談話室(デフォルトでは現在の談話室)を退出" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/query []: open a private chat" msgstr "/query <コンタクトID> [<メッセージ>]: プライベートなチャットを開始" -#: ../libempathy-gtk/empathy-chat.c:1078 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/msg : open a private chat" msgstr "/msg <コンタクトID> <メッセージ>: プライベートなチャットを開始" -#: ../libempathy-gtk/empathy-chat.c:1081 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/nick : change your nickname on the current server" msgstr "/nick <ニックネーム>: 現在のサーバーでのあなたのニックネームを変更" -#: ../libempathy-gtk/empathy-chat.c:1084 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/me : send an ACTION message to the current conversation" msgstr "/me <メッセージ>: ACTION メッセージを現在の会話に送る" -#: ../libempathy-gtk/empathy-chat.c:1087 +#: ../libempathy-gtk/empathy-chat.c:1097 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " "join a new chat room\"" msgstr "" "/say <メッセージ>: <メッセージ> を現在の会話に送り込む。これは '/' で始まる" -"メッセージを送信する時に使われます。例: \"/say /join は新しくチャットルームに" -"参加するのに使います\"" +"メッセージを送信する時に使われます。例: \"/say /join は新しく談話室に参加する" +"のに使います\"" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "/whois : display information about a contact" -msgstr "" +msgstr "/whois <相手先ID>: 相手先についての情報を表示" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1105 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1458,165 +1423,178 @@ msgstr "" "/help [<コマンド>]: サポートされているコマンドすべてを表示。<コマンド> を指定" "したら、その使用方法を表示" -#: ../libempathy-gtk/empathy-chat.c:1112 +#: ../libempathy-gtk/empathy-chat.c:1124 #, c-format msgid "Usage: %s" msgstr "使い方: %s" -#: ../libempathy-gtk/empathy-chat.c:1157 +#: ../libempathy-gtk/empathy-chat.c:1169 msgid "Unknown command" msgstr "不明なコマンド" -#: ../libempathy-gtk/empathy-chat.c:1283 +#: ../libempathy-gtk/empathy-chat.c:1295 msgid "Unknown command; see /help for the available commands" msgstr "不明なコマンドです、/help で利用可能なコマンドを表示してください" +#: ../libempathy-gtk/empathy-chat.c:1541 +msgid "insufficient balance to send message" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559 +#: ../libempathy-gtk/empathy-chat.c:1622 +#, c-format +msgid "Error sending message '%s': %s" +msgstr "'%s' というメッセージを送信する際にエラー: %s" + +#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564 +#: ../libempathy-gtk/empathy-chat.c:1626 +#, c-format +msgid "Error sending message: %s" +msgstr "メッセージを送信する際にエラー: %s" + #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1453 -msgid "insufficient balance to send message" +#: ../libempathy-gtk/empathy-chat.c:1553 +#, c-format +msgid "insufficient balance to send message. Top up." msgstr "" -#: ../libempathy-gtk/empathy-chat.c:1455 +#: ../libempathy-gtk/empathy-chat.c:1593 msgid "not capable" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:1462 +#: ../libempathy-gtk/empathy-chat.c:1600 msgid "offline" msgstr "オフライン" -#: ../libempathy-gtk/empathy-chat.c:1465 +#: ../libempathy-gtk/empathy-chat.c:1603 msgid "invalid contact" -msgstr "無効な仲間です" +msgstr "無効な相手先です" -#: ../libempathy-gtk/empathy-chat.c:1468 +#: ../libempathy-gtk/empathy-chat.c:1606 msgid "permission denied" msgstr "権限がありません" -#: ../libempathy-gtk/empathy-chat.c:1471 +#: ../libempathy-gtk/empathy-chat.c:1609 msgid "too long message" msgstr "メッセージが長すぎます" -#: ../libempathy-gtk/empathy-chat.c:1474 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "not implemented" msgstr "未実装です" -#: ../libempathy-gtk/empathy-chat.c:1478 +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "unknown" msgstr "原因不明です" -#: ../libempathy-gtk/empathy-chat.c:1484 -#, c-format -msgid "Error sending message '%s': %s" -msgstr "'%s' というメッセージを送信する際にエラー: %s" - -#: ../libempathy-gtk/empathy-chat.c:1488 -#, fuzzy, c-format -#| msgid "Error sending message '%s': %s" -msgid "Error sending message: %s" -msgstr "'%s' というメッセージを送信する際にエラー: %s" - -#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "トピック:" -#: ../libempathy-gtk/empathy-chat.c:1561 +#: ../libempathy-gtk/empathy-chat.c:1698 #, c-format msgid "Topic set to: %s" msgstr "新しいトピック: %s" -#: ../libempathy-gtk/empathy-chat.c:1563 +#: ../libempathy-gtk/empathy-chat.c:1700 +#, fuzzy, c-format +#| msgid "Topic set to: %s" +msgid "Topic set by %s to: %s" +msgstr "新しいトピック: %s" + +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1705 msgid "No topic defined" msgstr "トピックはありません" -#: ../libempathy-gtk/empathy-chat.c:2072 +#: ../libempathy-gtk/empathy-chat.c:2221 msgid "(No Suggestions)" msgstr "(提案なし)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2140 +#: ../libempathy-gtk/empathy-chat.c:2289 #, c-format msgid "Add '%s' to Dictionary" -msgstr "" +msgstr "'%s' を辞書に追加する" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2177 +#: ../libempathy-gtk/empathy-chat.c:2326 #, c-format msgid "Add '%s' to %s Dictionary" -msgstr "" +msgstr "'%s' を %s の辞書に追加する" -#: ../libempathy-gtk/empathy-chat.c:2247 +#: ../libempathy-gtk/empathy-chat.c:2396 msgid "Insert Smiley" msgstr "スマイリーの挿入" #. send button -#: ../libempathy-gtk/empathy-chat.c:2265 -#: ../libempathy-gtk/empathy-ui-utils.c:1839 +#: ../libempathy-gtk/empathy-chat.c:2414 +#: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "送信(_S)" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2319 +#: ../libempathy-gtk/empathy-chat.c:2471 msgid "_Spelling Suggestions" msgstr "スペルの提案(_S)" -#: ../libempathy-gtk/empathy-chat.c:2408 +#: ../libempathy-gtk/empathy-chat.c:2560 msgid "Failed to retrieve recent logs" msgstr "最近のログの取得に失敗しました" -#: ../libempathy-gtk/empathy-chat.c:2545 +#: ../libempathy-gtk/empathy-chat.c:2699 #, c-format msgid "%s has disconnected" -msgstr "%s は切断されました" +msgstr "%s は切断しました" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2552 +#: ../libempathy-gtk/empathy-chat.c:2706 #, c-format msgid "%1$s was kicked by %2$s" -msgstr "%1$s は %2$s にkickされました" +msgstr "%1$s は %2$s に kick されました" -#: ../libempathy-gtk/empathy-chat.c:2555 +#: ../libempathy-gtk/empathy-chat.c:2709 #, c-format msgid "%s was kicked" -msgstr "%s はkickされました" +msgstr "%s は kick されました" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2563 +#: ../libempathy-gtk/empathy-chat.c:2717 #, c-format msgid "%1$s was banned by %2$s" -msgstr "%1$s が %2$s にBANされました" +msgstr "%1$s が %2$s に BAN されました" -#: ../libempathy-gtk/empathy-chat.c:2566 +#: ../libempathy-gtk/empathy-chat.c:2720 #, c-format msgid "%s was banned" -msgstr "%s はBANされました" +msgstr "%s は BAN されました" -#: ../libempathy-gtk/empathy-chat.c:2570 +#: ../libempathy-gtk/empathy-chat.c:2724 #, c-format msgid "%s has left the room" -msgstr "%s さんが部屋から退室しました" +msgstr "%s さんが談話室から退出しました" #. Note to translators: this string is appended to #. * notifications like "foo has left the room", with the message #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2579 +#: ../libempathy-gtk/empathy-chat.c:2733 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2604 +#: ../libempathy-gtk/empathy-chat.c:2758 #, c-format msgid "%s has joined the room" -msgstr "%s さんが部屋に入室しました" +msgstr "%s さんが談話室に参加しました" -#: ../libempathy-gtk/empathy-chat.c:2629 +#: ../libempathy-gtk/empathy-chat.c:2783 #, c-format msgid "%s is now known as %s" msgstr "%s は %s になりました" @@ -1624,731 +1602,676 @@ msgstr "%s は %s になりました" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2768 -#: ../src/empathy-streamed-media-window.c:1894 -#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391 -#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479 +#: ../libempathy-gtk/empathy-chat.c:2970 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "不通" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3415 +#: ../libempathy-gtk/empathy-chat.c:3634 msgid "Would you like to store this password?" -msgstr "" +msgstr "パスワードを保存しますか?" -#: ../libempathy-gtk/empathy-chat.c:3421 -#, fuzzy -#| msgid "Members" +#: ../libempathy-gtk/empathy-chat.c:3640 msgid "Remember" -msgstr "メンバー" +msgstr "記憶する" -#: ../libempathy-gtk/empathy-chat.c:3431 +#: ../libempathy-gtk/empathy-chat.c:3650 msgid "Not now" -msgstr "" +msgstr "今はしない" -#: ../libempathy-gtk/empathy-chat.c:3475 +#: ../libempathy-gtk/empathy-chat.c:3694 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "再挑戦" -#: ../libempathy-gtk/empathy-chat.c:3479 +#: ../libempathy-gtk/empathy-chat.c:3698 msgid "Wrong password; please try again:" msgstr "パスワードが間違っています、再度挑戦してください:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3609 +#: ../libempathy-gtk/empathy-chat.c:3828 msgid "This room is protected by a password:" -msgstr "この部屋はパスワードで保護されています:" +msgstr "この談話室はパスワードで保護されています:" -#: ../libempathy-gtk/empathy-chat.c:3636 +#: ../libempathy-gtk/empathy-chat.c:3855 msgid "Join" -msgstr "入室する" +msgstr "参加する" -#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261 +#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "オンライン" -#: ../libempathy-gtk/empathy-chat.c:3893 +#: ../libempathy-gtk/empathy-chat.c:4102 msgid "Conversation" msgstr "会話" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3898 -#, fuzzy, c-format -#| msgid "%s (%s)" +#: ../libempathy-gtk/empathy-chat.c:4107 +#, c-format msgid "%s (SMS)" -msgstr "%s (%s)" +msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 -#, fuzzy -#| msgid "permission denied" +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "権限がありません" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" -msgstr "" +msgstr "相手先をブロックできません" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774 -#, fuzzy -#| msgid "Linked Contacts" +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" -msgstr "リンク中の仲間" +msgstr "ブロックする相手先の編集" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1489 -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "Account:" msgstr "アカウント:" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2 -#, fuzzy -#| msgid "Linked Contacts" msgid "Blocked Contacts" -msgstr "リンク中の仲間" +msgstr "ブロック中の相手先" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:2 #: ../src/empathy-chatrooms-window.ui.h:3 -#, fuzzy -#| msgid "_Remove" msgid "Remove" -msgstr "削除(_R)" +msgstr "削除" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "リンク先のコピー(_C)" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 +#: ../libempathy-gtk/empathy-chat-text-view.c:329 #: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "リンクを開く(_O)" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:417 msgid "%A %B %d %Y" -msgstr "%Y年%B%e日 %A" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "仲間情報の編集" +msgstr "%Y年%b%e日 %A" -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 -msgid "Personal Information" -msgstr "個人の情報" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" -msgstr "新しい仲間" +msgstr "新しい相手先" -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" -msgstr "" +msgstr "%s をブロックしますか?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" -msgstr "" +msgstr "ほんとうに今後 '%s' からの連絡をブロックしますか?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 msgid "_Block" -msgstr "" +msgstr "ブロック(_B)" -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" -msgstr[0] "" +msgstr[0] "この相手先を不快・不適切として通報する(_R)" #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "あとで決める(_L)" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "登録のリクエスト" -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "_Block User" -msgstr "" - -#: ../libempathy-gtk/empathy-contact-list-store.h:71 -msgid "Ungrouped" -msgstr "グループ無所属" - -#: ../libempathy-gtk/empathy-contact-list-store.h:72 -msgid "Favorite People" -msgstr "お気に入りの人達" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-individual-view.c:2376 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "本当に '%s' というグループを削除しますか?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1988 -#: ../libempathy-gtk/empathy-individual-view.c:2379 -msgid "Removing group" -msgstr "グループの削除" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:2037 -#: ../libempathy-gtk/empathy-contact-list-view.c:2114 -#: ../libempathy-gtk/empathy-individual-view.c:2434 -#: ../libempathy-gtk/empathy-individual-view.c:2637 -msgid "_Remove" -msgstr "削除(_R)" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2067 -#: ../libempathy-gtk/empathy-individual-view.c:2501 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "本当に '%s' という仲間を削除しますか?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2069 -#: ../libempathy-gtk/empathy-individual-view.c:2522 -msgid "Removing contact" -msgstr "仲間の削除" - -#: ../libempathy-gtk/empathy-contact-menu.c:220 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "仲間の追加(_A)…" - -#: ../libempathy-gtk/empathy-contact-menu.c:300 -#, fuzzy -#| msgid "_Contact" -msgid "_Block Contact" -msgstr "仲間(_C)" - -#: ../libempathy-gtk/empathy-contact-menu.c:329 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "会話(_C)" - -#: ../libempathy-gtk/empathy-contact-menu.c:361 -#: ../libempathy-gtk/empathy-individual-menu.c:849 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "音声で会話(_A)" - -#: ../libempathy-gtk/empathy-contact-menu.c:394 -#: ../libempathy-gtk/empathy-individual-menu.c:894 -msgctxt "menu item" -msgid "_Video Call" -msgstr "映像で会話(_V)" - -#: ../libempathy-gtk/empathy-contact-menu.c:440 -#: ../libempathy-gtk/empathy-individual-menu.c:947 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "会話の履歴(_P)" - -#: ../libempathy-gtk/empathy-contact-menu.c:462 -#: ../libempathy-gtk/empathy-individual-menu.c:988 -msgid "Send File" -msgstr "ファイルの送信" +msgstr "相手先のブロック(_B)" -#: ../libempathy-gtk/empathy-contact-menu.c:485 -#: ../libempathy-gtk/empathy-individual-menu.c:1030 -msgid "Share My Desktop" -msgstr "デスクトップを共有する" - -#: ../libempathy-gtk/empathy-contact-menu.c:525 -#: ../libempathy-gtk/empathy-contact-widget.c:1886 -#: ../libempathy-gtk/empathy-individual-menu.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:1372 -msgid "Favorite" -msgstr "お気に入り" - -#: ../libempathy-gtk/empathy-contact-menu.c:554 -#: ../libempathy-gtk/empathy-individual-menu.c:1093 -msgid "Infor_mation" -msgstr "情報(_M)" - -#: ../libempathy-gtk/empathy-contact-menu.c:600 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "編集(_E)" - -#: ../libempathy-gtk/empathy-contact-menu.c:654 -#: ../libempathy-gtk/empathy-individual-menu.c:1283 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "この部屋に招待します" - -#: ../libempathy-gtk/empathy-contact-menu.c:685 -#: ../libempathy-gtk/empathy-individual-menu.c:1329 -msgid "_Invite to Chat Room" -msgstr "チャットルームに招待する(_I)" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "Decide _Later" +msgstr "あとで決める(_L)" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 -#, fuzzy -#| msgid "Select a contact" +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" -msgstr "連絡先の選択" +msgstr "相手先の検索" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 -#, fuzzy -#| msgid "Search" +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " -msgstr "検索" +msgstr "検索:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 -#, fuzzy -#| msgid "_Add Contact…" +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" -msgstr "仲間の追加(_A)…" +msgstr "相手先を追加(_A)" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 -#, fuzzy -#| msgid "No match found" +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" -msgstr "見つかりませんでした" +msgstr "相手先が見つかりませんでした" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" -msgstr "" +msgstr "自己紹介のメッセージ:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "" -#: ../libempathy-gtk/empathy-contact-selector.c:129 -msgid "Select a contact" -msgstr "連絡先の選択" - -#: ../libempathy-gtk/empathy-contact-widget.c:336 -#: ../libempathy-gtk/empathy-individual-widget.c:153 -msgid "Full name:" -msgstr "氏名:" - -#: ../libempathy-gtk/empathy-contact-widget.c:337 -#: ../libempathy-gtk/empathy-individual-widget.c:154 -msgid "Phone number:" -msgstr "電話番号:" - -#: ../libempathy-gtk/empathy-contact-widget.c:338 -#: ../libempathy-gtk/empathy-individual-widget.c:155 -msgid "E-mail address:" -msgstr "E-メールアドレス:" - -#: ../libempathy-gtk/empathy-contact-widget.c:339 -#: ../libempathy-gtk/empathy-individual-widget.c:156 -msgid "Website:" -msgstr "ウェブサイト:" - -#: ../libempathy-gtk/empathy-contact-widget.c:340 -#: ../libempathy-gtk/empathy-individual-widget.c:157 -msgid "Birthday:" -msgstr "誕生日:" - -#. Note to translators: this is the caption for a string of the form "5 -#. * minutes ago", and refers to the time since the contact last interacted -#. * with their IM client. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:346 -#, fuzzy -#| msgid "_Last Name:" -msgid "Last seen:" -msgstr "名字(_L):" - -#: ../libempathy-gtk/empathy-contact-widget.c:348 -#, fuzzy -#| msgid "Connected" -msgid "Connected from:" -msgstr "オンライン" - -#. FIXME: once Idle implements SimplePresence using this information, we can -#. * and should bin this. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:353 -#, fuzzy -#| msgid "Quit message:" -msgid "Away message:" -msgstr "終了時のメッセージ:" - -#: ../libempathy-gtk/empathy-contact-widget.c:606 +#: ../libempathy-gtk/empathy-contact-widget.c:568 +#: ../libempathy-gtk/empathy-individual-widget.c:304 #, fuzzy -#| msgid "Ca_ncel" msgid "Channels:" msgstr "中止(_N)" -#: ../libempathy-gtk/empathy-contact-widget.c:897 -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-contact-widget.c:748 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" -msgstr "ISOによる国コード:" +msgstr "ISO による国コード:" -#: ../libempathy-gtk/empathy-contact-widget.c:899 -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-contact-widget.c:750 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "国:" -#: ../libempathy-gtk/empathy-contact-widget.c:901 -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-contact-widget.c:752 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "連邦・州:" -#: ../libempathy-gtk/empathy-contact-widget.c:903 -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-contact-widget.c:754 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "都市:" -#: ../libempathy-gtk/empathy-contact-widget.c:905 -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-contact-widget.c:756 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "地域:" -#: ../libempathy-gtk/empathy-contact-widget.c:907 -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-contact-widget.c:758 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "郵便番号:" -#: ../libempathy-gtk/empathy-contact-widget.c:909 -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-contact-widget.c:760 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "通り:" -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-contact-widget.c:762 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "ビル:" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-contact-widget.c:764 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "階:" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-contact-widget.c:766 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "部屋番号:" -#: ../libempathy-gtk/empathy-contact-widget.c:917 -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-contact-widget.c:768 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "テキスト:" -#: ../libempathy-gtk/empathy-contact-widget.c:919 -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-contact-widget.c:770 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "説明:" -#: ../libempathy-gtk/empathy-contact-widget.c:921 -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-contact-widget.c:772 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:923 -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-contact-widget.c:774 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "精度のレベル:" -#: ../libempathy-gtk/empathy-contact-widget.c:925 -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-contact-widget.c:776 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "エラー:" -#: ../libempathy-gtk/empathy-contact-widget.c:927 -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-contact-widget.c:778 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "垂直誤差 (メートル):" -#: ../libempathy-gtk/empathy-contact-widget.c:929 -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-contact-widget.c:780 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "水平誤差 (メートル):" -#: ../libempathy-gtk/empathy-contact-widget.c:931 -#: ../libempathy-gtk/empathy-individual-widget.c:503 +#: ../libempathy-gtk/empathy-contact-widget.c:782 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "速度:" -#: ../libempathy-gtk/empathy-contact-widget.c:933 -#: ../libempathy-gtk/empathy-individual-widget.c:505 +#: ../libempathy-gtk/empathy-contact-widget.c:784 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "方位:" -#: ../libempathy-gtk/empathy-contact-widget.c:935 -#: ../libempathy-gtk/empathy-individual-widget.c:507 +#: ../libempathy-gtk/empathy-contact-widget.c:786 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "上昇速度:" -#: ../libempathy-gtk/empathy-contact-widget.c:937 -#: ../libempathy-gtk/empathy-individual-widget.c:509 +#: ../libempathy-gtk/empathy-contact-widget.c:788 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "最後のアップデートは:" -#: ../libempathy-gtk/empathy-contact-widget.c:939 -#: ../libempathy-gtk/empathy-individual-widget.c:511 +#: ../libempathy-gtk/empathy-contact-widget.c:790 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "経度:" -#: ../libempathy-gtk/empathy-contact-widget.c:941 -#: ../libempathy-gtk/empathy-individual-widget.c:513 +#: ../libempathy-gtk/empathy-contact-widget.c:792 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "緯度:" -#: ../libempathy-gtk/empathy-contact-widget.c:943 -#: ../libempathy-gtk/empathy-individual-widget.c:515 +#: ../libempathy-gtk/empathy-contact-widget.c:794 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "高度:" -#: ../libempathy-gtk/empathy-contact-widget.c:996 -#: ../libempathy-gtk/empathy-contact-widget.c:1011 -#: ../libempathy-gtk/empathy-individual-widget.c:607 -#: ../libempathy-gtk/empathy-individual-widget.c:622 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:847 +#: ../libempathy-gtk/empathy-contact-widget.c:862 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:35 msgid "Location" msgstr "場所" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:1013 -#: ../libempathy-gtk/empathy-individual-widget.c:624 +#: ../libempathy-gtk/empathy-contact-widget.c:864 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:673 +#: ../libempathy-gtk/empathy-contact-widget.c:916 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" -msgstr "%Y年%B%e日 %R UTC" +msgstr "%Y年%b%e日 %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1147 -#: ../libempathy-gtk/empathy-individual-widget.c:915 +#: ../libempathy-gtk/empathy-contact-widget.c:998 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "アバターの保存" -#: ../libempathy-gtk/empathy-contact-widget.c:1203 -#: ../libempathy-gtk/empathy-individual-widget.c:973 +#: ../libempathy-gtk/empathy-contact-widget.c:1054 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "アバターを保存できません" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -msgid "Location at (date)\t" -msgstr "場所 で (date)\t" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +msgid "Full name" +msgstr "氏名:" -#. Alias -#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1308 -msgid "Alias:" -msgstr "別名:" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "電話番号" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "Client Information" -msgstr "クライアント情報" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "E-メールアドレス" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 -msgid "Client:" -msgstr "クライアント:" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +msgid "Website" +msgstr "ウェブサイト" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 -msgid "Contact Details" -msgstr "仲間の詳細" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +msgid "Birthday" +msgstr "誕生日" + +#. Note to translators: this is the caption for a string of the form "5 +#. * minutes ago", and refers to the time since the contact last interacted +#. * with their IM client. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#, fuzzy +msgid "Last seen:" +msgstr "名字(_L):" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +#, fuzzy +msgid "Connected from:" +msgstr "オンライン" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +msgid "Away message:" +msgstr "離席時のメッセージ:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#, fuzzy +msgid "work" +msgstr "仕事" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#, fuzzy +msgid "home" +msgstr "自宅" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#, fuzzy +msgid "mobile" +msgstr "モバイル" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#, fuzzy +msgid "voice" +msgstr "音声" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#, fuzzy +msgid "preferred" +msgstr "設定" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +#, fuzzy +msgid "parcel" +msgstr "外観" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1517 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" -msgstr "スクリーン名:" +msgstr "名称:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 +#. Alias +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 +msgid "Alias:" +msgstr "別名:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Location at (date)\t" +msgstr "場所 で (date)\t" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +msgid "Contact Details" +msgstr "相手先の詳細" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 msgid "Information requested…" msgstr "情報の取得中…" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Client Information" +msgstr "クライアント情報" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "OS:" msgstr "OS:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Version:" msgstr "バージョン:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Client:" +msgstr "クライアント:" + +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "グループ" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." msgstr "" -"この仲間を登録するグループを選択してください (1つ以上のグループを選択したり、" -"あるいは全く選択しなくても構いません)" +"この相手先を登録するグループを選択してください (2つ以上のグループを選択した" +"り、あるいは全く選択しなくても構いません)" -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "グループの追加(_A)" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 #, fuzzy -#| msgid "Select" msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "選択" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1807 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1951 msgid "Group" msgstr "グループ" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" -msgstr[0] "" +msgstr[0] "以下の ID をブロックします:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" -msgstr[0] "" - -#. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 -msgid "Linked Contacts" -msgstr "リンク中の仲間" +msgstr[0] "以下の ID はブロックできません:" -#: ../libempathy-gtk/empathy-individual-linker.c:370 -msgid "Select contacts to link" -msgstr "リンクする連絡先の選択" - -#: ../libempathy-gtk/empathy-individual-linker.c:444 -msgid "New contact preview" -msgstr "新しい仲間をプレビュー" - -#: ../libempathy-gtk/empathy-individual-linker.c:488 -msgid "Contacts selected in the list on the left will be linked together." -msgstr "左の一覧で選択した仲間は互いにリンクしています" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "相手先情報の編集" #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:145 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 -#: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1299 -#: ../src/empathy-call-window.ui.h:2 +#: ../libempathy-gtk/empathy-individual-menu.c:348 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "発信" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:413 #, fuzzy -#| msgid "File" msgid "Mobile" -msgstr "ファイル" +msgstr "モバイル" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:415 #, fuzzy -#| msgid "Word" msgid "Work" -msgstr "単語" +msgstr "仕事" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" -msgstr "" +msgstr "自宅" + +#: ../libempathy-gtk/empathy-individual-menu.c:658 +msgid "_Block Contact" +msgstr "相手先をブロック(_B)" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1017 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:1 +msgid "_Chat" +msgstr "チャット(_C)" -#. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:804 -#: ../libempathy-gtk/empathy-new-message-dialog.c:215 +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:1052 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" +msgstr "_SMS" + +#: ../libempathy-gtk/empathy-individual-menu.c:1085 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "音声通話(_A)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1118 +msgctxt "menu item" +msgid "_Video Call" +msgstr "ビデオ通話(_V)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1159 +#: ../src/empathy-roster-window-menubar.ui.h:4 +msgid "_Previous Conversations" +msgstr "会話の履歴(_P)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1188 +msgid "Send File" +msgstr "ファイルの送信" + +#: ../libempathy-gtk/empathy-individual-menu.c:1218 +msgid "Share My Desktop" +msgstr "デスクトップを共有する" + +#: ../libempathy-gtk/empathy-individual-menu.c:1244 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "お気に入り" + +#: ../libempathy-gtk/empathy-individual-menu.c:1263 +#, fuzzy +#| msgid "telepathy-salut not installed" +msgid "gnome-contacts not installed" +msgstr "telepathy-salut がインストールされていません" + +#: ../libempathy-gtk/empathy-individual-menu.c:1266 +msgid "Please install gnome-contacts to access contacts details." msgstr "" -#: ../libempathy-gtk/empathy-individual-menu.c:1141 +#: ../libempathy-gtk/empathy-individual-menu.c:1377 +msgid "Infor_mation" +msgstr "情報(_M)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1426 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "編集(_E)" -#. Translators: this is a verb meaning "to connect two contacts together -#. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1167 -msgctxt "Link individual (contextual menu)" -msgid "_Link Contacts…" -msgstr "仲間をリンク(_L)…" +#: ../libempathy-gtk/empathy-individual-menu.c:1543 +#: ../src/empathy-chat-window.c:1166 +msgid "Inviting you to this room" +msgstr "この談話室に招待します" + +#: ../libempathy-gtk/empathy-individual-menu.c:1589 +msgid "_Invite to Chat Room" +msgstr "談話室に招待する(_I)" -#: ../libempathy-gtk/empathy-individual-view.c:2341 +#: ../libempathy-gtk/empathy-individual-menu.c:1785 +#: ../src/empathy-roster-window-menubar.ui.h:5 +msgid "_Add Contact…" +msgstr "相手先を追加(_A)…" + +#: ../libempathy-gtk/empathy-individual-view.c:2306 msgid "Delete and _Block" -msgstr "" +msgstr "削除してブロック(_B)" + +#: ../libempathy-gtk/empathy-individual-view.c:2341 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "本当に '%s' というグループを削除しますか?" + +#: ../libempathy-gtk/empathy-individual-view.c:2344 +msgid "Removing group" +msgstr "グループの削除" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2399 +#: ../libempathy-gtk/empathy-individual-view.c:2603 +msgid "_Remove" +msgstr "削除(_R)" + +#: ../libempathy-gtk/empathy-individual-view.c:2476 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "本当に '%s' という相手先を削除しますか?" -#: ../libempathy-gtk/empathy-individual-view.c:2510 +#: ../libempathy-gtk/empathy-individual-view.c:2485 #, 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 "" -#: ../libempathy-gtk/empathy-individual-widget.c:1656 -#, fuzzy, c-format -#| msgid "Meta-contact containing %u contact" -#| msgid_plural "Meta-contact containing %u contacts" +#: ../libempathy-gtk/empathy-individual-view.c:2497 +msgid "Removing contact" +msgstr "相手先の削除" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 +#, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" -msgstr[0] "%u 人の仲間を含むメタコンタクト" +msgstr[0] "%u 人の相手先を含むメタ相手先" #: ../libempathy-gtk/empathy-individual-widget.ui.h:1 msgid "Location at (date)" msgstr "(date) に 場所" -#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 msgid "Online from a phone or mobile device" msgstr "" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "新しいネットワーク" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "IRC ネットワークを選択" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" -msgstr "" +msgstr "ネットワークの一覧をリセット(_N)" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 #, fuzzy -#| msgid "Select" msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "選択" @@ -2361,290 +2284,258 @@ msgstr "新しいサーバー" msgid "SSL" msgstr "SSL" -#. Translators: this is the title of the linking dialogue (reached by -#. * right-clicking on a contact and selecting "Link…"). "Link" in this title -#. * is a verb. -#: ../libempathy-gtk/empathy-linking-dialog.c:115 -msgid "Link Contacts" -msgstr "仲間に接続" - -#: ../libempathy-gtk/empathy-linking-dialog.c:120 -msgctxt "Unlink individual (button)" -msgid "_Unlink…" -msgstr "リンクを外す(_U)…" - -#: ../libempathy-gtk/empathy-linking-dialog.c:121 -#, fuzzy -#| msgid "" -#| "Completely split the displayed meta-contact into the contacts it contains." -msgid "" -"Completely split the displayed linked contacts into the separate contacts." -msgstr "メタコンタクトをメタコンタクトが含んでいる仲間に完全に分割します。" - -#. Add button -#. Translators: this is an action button in the linking dialogue. "Link" is -#. * used here as a verb meaning "to connect two contacts to form a -#. * meta-contact". -#: ../libempathy-gtk/empathy-linking-dialog.c:136 -msgid "_Link" -msgstr "リンク(_L)" - -#: ../libempathy-gtk/empathy-linking-dialog.c:183 -#, fuzzy, c-format -#| msgid "Unlink meta-contact '%s'?" -msgid "Unlink linked contacts '%s'?" -msgstr "メタコンタクト '%s' のリンクを外しますか?" - -#: ../libempathy-gtk/empathy-linking-dialog.c:186 -#, fuzzy -#| msgid "" -#| "Are you sure you want to unlink this meta-contact? This will completely " -#| "split the meta-contact into the contacts it contains." -msgid "" -"Are you sure you want to unlink these linked contacts? This will completely " -"split the linked contacts into separate contacts." -msgstr "" -"このメタコンタクトのリンクを外したいですか? メタコンタクトを、それが含んでる" -"仲間に完全に分割することになります。" - -#: ../libempathy-gtk/empathy-linking-dialog.c:190 -msgctxt "Unlink individual (button)" -msgid "_Unlink" -msgstr "リンクを外す(_U)" - -#: ../libempathy-gtk/empathy-log-window.c:634 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" -msgstr "" +msgstr "履歴" -#: ../libempathy-gtk/empathy-log-window.c:689 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" -msgstr "" +msgstr "表示" -#: ../libempathy-gtk/empathy-log-window.c:711 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "検索" -#: ../libempathy-gtk/empathy-log-window.c:1159 -#, fuzzy, c-format -#| msgid "Call with %s" +#: ../libempathy-gtk/empathy-log-window.c:1150 +#, c-format msgid "Chat in %s" -msgstr "%sで発信" +msgstr "%s でチャット" -#: ../libempathy-gtk/empathy-log-window.c:1161 -#, fuzzy, c-format -#| msgid "Call with %s" +#: ../libempathy-gtk/empathy-log-window.c:1152 +#, c-format msgid "Chat with %s" -msgstr "%sで発信" +msgstr "%s とチャット" -#: ../libempathy-gtk/empathy-log-window.c:1211 -#: ../libempathy-gtk/empathy-log-window.c:1358 -#, fuzzy -#| msgid "%A %B %d %Y" +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" -msgstr "%Y年%B%e日 %A" +msgstr "%Y年%b%e日 %A %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1300 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1306 -#, fuzzy, c-format -#| msgid "Topic:" +#: ../libempathy-gtk/empathy-log-window.c:1297 +#, c-format msgid "%s: %s" -msgstr "トピック:" +msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1382 -#, fuzzy, c-format -#| msgid "%d second ago" -#| msgid_plural "%d seconds ago" +#: ../libempathy-gtk/empathy-log-window.c:1373 +#, c-format msgid "%s second" msgid_plural "%s seconds" -msgstr[0] "%d 秒前" +msgstr[0] "%s 秒" -#: ../libempathy-gtk/empathy-log-window.c:1389 -#, fuzzy, c-format -#| msgid "%d minute ago" -#| msgid_plural "%d minutes ago" +#: ../libempathy-gtk/empathy-log-window.c:1380 +#, c-format msgid "%s minute" msgid_plural "%s minutes" -msgstr[0] "%d 分前" +msgstr[0] "%s 分" -#: ../libempathy-gtk/empathy-log-window.c:1397 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "" -#: ../libempathy-gtk/empathy-log-window.c:1729 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" -msgstr "" +msgstr "今日" -#: ../libempathy-gtk/empathy-log-window.c:1733 -#, fuzzy -#| msgid "Western" +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" -msgstr "西欧" +msgstr "昨日" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1748 -#, fuzzy -#| msgid "%A %B %d %Y" +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" -msgstr "%Y年%B%e日 %A" +msgstr "%Y年%b%e日" #: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3425 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" -msgstr "" +msgstr "すべて" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2353 -#, fuzzy -#| msgid "None" +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" -msgstr "なし" +msgstr "すべて" -#: ../libempathy-gtk/empathy-log-window.c:2666 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" -msgstr "" +msgstr "相手先または談話室" -#: ../libempathy-gtk/empathy-log-window.c:2870 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" -msgstr "" +msgstr "日付" -#: ../libempathy-gtk/empathy-log-window.c:2986 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" -msgstr "" +msgstr "すべて" -#: ../libempathy-gtk/empathy-log-window.c:2988 -#, fuzzy -#| msgid "Set status" +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" -msgstr "状態を設定" +msgstr "文字チャット" -#: ../libempathy-gtk/empathy-log-window.c:2990 -#: ../src/empathy-preferences.ui.h:4 -#, fuzzy -#| msgid "Call" +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:25 msgid "Calls" -msgstr "発信" +msgstr "通話" -#: ../libempathy-gtk/empathy-log-window.c:2995 -#, fuzzy -#| msgid "Incoming call" +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" -msgstr "着信があります" +msgstr "着信" -#: ../libempathy-gtk/empathy-log-window.c:2996 -#, fuzzy -#| msgid "Outgoing voice call" +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" -msgstr "音声で呼びかけた" +msgstr "発信" -#: ../libempathy-gtk/empathy-log-window.c:2997 -#, fuzzy -#| msgid "Incoming call from %s" +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" -msgstr "%s さんからの呼び出しです" +msgstr "失敗した通話" -#: ../libempathy-gtk/empathy-log-window.c:3019 -#, fuzzy -#| msgid "Chat" +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" -msgstr "チャット" +msgstr "種類" -#: ../libempathy-gtk/empathy-log-window.c:3728 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" -msgstr "" +msgstr "会話の履歴のすべてを消去してもいいですか?" -#: ../libempathy-gtk/empathy-log-window.c:3732 -#, fuzzy -#| msgid "C_lear" +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" -msgstr "クリア(_L)" +msgstr "すべて消去" -#: ../libempathy-gtk/empathy-log-window.c:3739 +# 日本語の語順からして、しかたなく「アカウント:」とする +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" -msgstr "" +msgstr "アカウント:" #: ../libempathy-gtk/empathy-log-window.ui.h:1 -msgid "Loading..." -msgstr "" +msgid "_File" +msgstr "ファイル(_F)" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 -#: ../src/empathy-chat-window.ui.h:3 -msgid "Chat" -msgstr "チャット" +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:12 +msgid "_Edit" +msgstr "編集(_E)" -#: ../libempathy-gtk/empathy-log-window.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Delete All History..." -msgstr "" +msgstr "すべての履歴を消去..." -#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "Profile" -msgstr "" +msgstr "相手先の情報" -#: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:20 -msgid "Video" -msgstr "映像" +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:19 +msgid "Chat" +msgstr "チャット" #: ../libempathy-gtk/empathy-log-window.ui.h:7 -#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 -msgid "_Edit" -msgstr "編集(_E)" +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "Video" +msgstr "ビデオ" #: ../libempathy-gtk/empathy-log-window.ui.h:8 -#, fuzzy -#| msgid "File" -msgid "_File" -msgstr "ファイル" - -#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "" -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 -msgid "Contact ID:" -msgstr "仲間の ID:" +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "Loading..." +msgstr "読み込み中..." -#. add chat button -#: ../libempathy-gtk/empathy-new-message-dialog.c:225 -msgid "C_hat" -msgstr "チャット(_H)" +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 +msgid "The contact is offline" +msgstr "相手先はオフラインです" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 +msgid "The specified contact is either invalid or unknown" +msgstr "選択した相手先は有効でないか不明です" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 +msgid "The contact does not support this kind of conversation" +msgstr "この相手先はこの種類の会話をサポートしていません" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 +msgid "The requested functionality is not implemented for this protocol" +msgstr "この機能は、このプロトコルでは実装されていません" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 +msgid "Could not start a conversation with the given contact" +msgstr "この相手先と会話を始めることができませんでした" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 +msgid "You are banned from this channel" +msgstr "このチャンネルから締め出されています" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 +msgid "This channel is full" +msgstr "このチャンネルは満員です" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 +msgid "You must be invited to join this channel" +msgstr "このチャンネルに参加するには招待される必要があります" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 +#, fuzzy +msgid "Can't proceed while disconnected" +msgstr "相手先がサインアウトした" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 +msgid "Permission denied" +msgstr "権限がありません" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 +msgid "There was an error starting the conversation" +msgstr "会話を開始する際にエラーが起こりました" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 +msgid "Enter a contact identifier or phone number:" +msgstr "相手先の ID か電話番号を入力:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:244 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "新しい会話" -#. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:204 -msgid "Send _Video" -msgstr "映像の送信(_V)" +#. add video button +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +msgid "_Video Call" +msgstr "ビデオ通話(_V)" -#. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:215 -msgid "C_all" -msgstr "呼び出す(_A)" +#. add audio button +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 +msgid "_Audio Call" +msgstr "音声通話(_A)" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" -msgstr "新規呼出" +msgstr "新しい通話" + +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "アカウント %s の認証に失敗しました" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" "%s" msgstr "" +"次のアカウントのパスワードを入力してください\n" +"%s" #. COL_STATUS_TEXT #. COL_STATE_ICON_NAME @@ -2664,22 +2555,18 @@ msgstr "独自のメッセージを編集…" #: ../libempathy-gtk/empathy-presence-chooser.c:345 msgid "Click to remove this status as a favorite" -msgstr "お気に入りの状態から解除するにはクリックします" +msgstr "クリックすると、この状況メッセージをお気に入りから削除します" #: ../libempathy-gtk/empathy-presence-chooser.c:354 msgid "Click to make this status a favorite" -msgstr "この状態をお気に入りにするにはクリックします" +msgstr "クリックすると、この状況メッセージをお気に入りとして保存します" #: ../libempathy-gtk/empathy-presence-chooser.c:388 msgid "Set status" -msgstr "状態を設定" - -#: ../libempathy-gtk/empathy-presence-chooser.c:943 -msgid "Set your presence and current status" -msgstr "在席中にし現在の状態を設定する" +msgstr "在席状況を設定" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1131 +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 msgid "Custom messages…" msgstr "独自のメッセージ…" @@ -2697,24 +2584,20 @@ msgid "Find:" msgstr "検索:" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -#, fuzzy -#| msgid "Match case" -msgid "Mat_ch case" -msgstr "大文字小文字を区別して一致" +msgid "_Previous" +msgstr "前へ(_P)" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Phrase not found" -msgstr "フレーズが見つかりませんでした" - -#: ../libempathy-gtk/empathy-search-bar.ui.h:4 msgid "_Next" msgstr "次へ(_N)" +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "Mat_ch case" +msgstr "大文字小文字を区別する(_C)" + #: ../libempathy-gtk/empathy-search-bar.ui.h:5 -#, fuzzy -#| msgid "_Previous Tab" -msgid "_Previous" -msgstr "前のタブへ(_P)" +msgid "Phrase not found" +msgstr "フレーズが見つかりませんでした" #: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" @@ -2726,15 +2609,15 @@ msgstr "インスタント・メッセージを送信した" #: ../libempathy-gtk/empathy-sound-manager.c:55 msgid "Incoming chat request" -msgstr "チャット参加の要求がきた" +msgstr "チャットの要求がきた" #: ../libempathy-gtk/empathy-sound-manager.c:57 msgid "Contact connected" -msgstr "仲間がサインインした" +msgstr "相手先がサインインした" #: ../libempathy-gtk/empathy-sound-manager.c:59 msgid "Contact disconnected" -msgstr "仲間がサインアウトした" +msgstr "相手先がサインアウトした" #: ../libempathy-gtk/empathy-sound-manager.c:61 msgid "Connected to server" @@ -2746,31 +2629,28 @@ msgstr "サーバーの接続を断した" #: ../libempathy-gtk/empathy-sound-manager.c:65 msgid "Incoming voice call" -msgstr "音声で呼びかけられた" +msgstr "音声通話が着信した" #: ../libempathy-gtk/empathy-sound-manager.c:67 msgid "Outgoing voice call" -msgstr "音声で呼びかけた" +msgstr "音声通話で発信した" #: ../libempathy-gtk/empathy-sound-manager.c:69 msgid "Voice call ended" -msgstr "音声の会話が終了した" +msgstr "音声通話が終了した" #: ../libempathy-gtk/empathy-status-preset-dialog.c:296 msgid "Edit Custom Messages" msgstr "独自のメッセージを編集" -#: ../libempathy-gtk/empathy-theme-adium.c:1036 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, fuzzy, c-format -#| msgid "Message received" msgid "Message edited at %s" msgstr "メッセージを受信した" -#: ../libempathy-gtk/empathy-theme-adium.c:1726 -#, fuzzy -#| msgid "N_ormal Size" +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" -msgstr "アバターなしの通常サイズ(_O)" +msgstr "通常サイズ" #: ../libempathy-gtk/empathy-theme-manager.c:70 msgid "Classic" @@ -2789,73 +2669,49 @@ msgid "Blue" msgstr "ブルー" #: ../libempathy-gtk/empathy-tls-dialog.c:150 -#, fuzzy -#| msgid "The identity provided by the chat server cannot be verified.\n" msgid "The identity provided by the chat server cannot be verified." -msgstr "チャットサーバーから提供されるアイデンティティを検証できません。\n" +msgstr "チャットサーバーから提供される ID を検証できません。" #: ../libempathy-gtk/empathy-tls-dialog.c:157 -#, fuzzy -#| msgid "The certificate is not signed by a Certification Authority" msgid "The certificate is not signed by a Certification Authority." -msgstr "証明書が認証局によって署名されていません" +msgstr "証明書が認証局によって署名されていません。" #: ../libempathy-gtk/empathy-tls-dialog.c:161 -#, fuzzy -#| msgid "The certificate has expired" msgid "The certificate has expired." -msgstr "証明書の有効期限が切れています" +msgstr "証明書の有効期限が切れています。" #: ../libempathy-gtk/empathy-tls-dialog.c:164 -#, fuzzy -#| msgid "The certificate hasn't yet been activated" msgid "The certificate hasn't yet been activated." -msgstr "証明書がまだ有効ではありません" +msgstr "証明書がまだ有効ではありません。" #: ../libempathy-gtk/empathy-tls-dialog.c:167 -#, fuzzy -#| msgid "The certificate does not have the expected fingerprint" msgid "The certificate does not have the expected fingerprint." -msgstr "証明書が期待したフィンガープリントではありません" +msgstr "証明書が期待したフィンガープリントではありません。" #: ../libempathy-gtk/empathy-tls-dialog.c:170 -#, fuzzy -#| msgid "" -#| "The hostname verified by the certificate doesn't match the server name" msgid "The hostname verified by the certificate doesn't match the server name." -msgstr "証明書で検証されたホスト名がサーバーの名と一致しません" +msgstr "証明書で検証されたホスト名がサーバーの名と一致しません。" #: ../libempathy-gtk/empathy-tls-dialog.c:174 -#, fuzzy -#| msgid "The certificate is self-signed" msgid "The certificate is self-signed." -msgstr "証明書は自己署名されています" +msgstr "証明書は自己署名されています。" #: ../libempathy-gtk/empathy-tls-dialog.c:177 -#, fuzzy -#| msgid "" -#| "The certificate has been revoked by the issuing Certification Authority" msgid "" "The certificate has been revoked by the issuing Certification Authority." -msgstr "証明書が発行者である認証局によって取り消されています" +msgstr "証明書が発行者である認証局によって失効しています。" #: ../libempathy-gtk/empathy-tls-dialog.c:181 -#, fuzzy -#| msgid "The certificate is cryptographically weak" msgid "The certificate is cryptographically weak." -msgstr "証明書が暗号的に弱いです" +msgstr "証明書が暗号的に弱いです。" #: ../libempathy-gtk/empathy-tls-dialog.c:184 -#, fuzzy -#| msgid "The certificate length exceeds verifiable limits" msgid "The certificate length exceeds verifiable limits." -msgstr "証明書が検証可能な長さを越えています" +msgstr "証明書が検証可能な長さを越えています。" #: ../libempathy-gtk/empathy-tls-dialog.c:188 -#, fuzzy -#| msgid "The certificate is malformed" msgid "The certificate is malformed." -msgstr "証明書に異常があります" +msgstr "証明書に異常があります。" #: ../libempathy-gtk/empathy-tls-dialog.c:206 #, c-format @@ -2872,37 +2728,43 @@ msgid "Continue" msgstr "続行" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "この接続は信用できません。無視して続けますか?" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "この選択を将来の接続でも記憶する" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "証明書の詳細" -#: ../libempathy-gtk/empathy-ui-utils.c:1735 +#: ../libempathy-gtk/empathy-ui-utils.c:1741 msgid "Unable to open URI" msgstr "URI を開けません" -#: ../libempathy-gtk/empathy-ui-utils.c:1831 +#: ../libempathy-gtk/empathy-ui-utils.c:1859 msgid "Select a file" msgstr "ファイルの選択" -#: ../libempathy-gtk/empathy-ui-utils.c:1903 +#: ../libempathy-gtk/empathy-ui-utils.c:1934 msgid "Insufficient free space to save file" -msgstr "" +msgstr "ファイルを保存するには空き容量が不足しています" -#: ../libempathy-gtk/empathy-ui-utils.c:1911 +#: ../libempathy-gtk/empathy-ui-utils.c:1942 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " "Please choose another location." msgstr "" +"このファイルを保存するには %s の空き容量が必要ですが、%s しかありません。別の" +"場所を選んでください。" -#: ../libempathy-gtk/empathy-ui-utils.c:1955 +#: ../libempathy-gtk/empathy-ui-utils.c:1986 #, c-format msgid "Incoming file from %s" msgstr "%s さんから送られてきたファイル" @@ -3074,41 +2936,32 @@ msgstr "西欧" msgid "Vietnamese" msgstr "ベトナム語" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 -msgid "The selected contact cannot receive files." -msgstr "選択した仲間はファイルを受信できません。" - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 -msgid "The selected contact is offline." -msgstr "選択した仲間はオフラインです。" - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "エラーメッセージなし" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" -msgstr "インスタント メッセージ (Empathy)" +msgstr "インスタントメッセージ (Empathy)" -#: ../src/empathy.c:431 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "起動したら自動的にサインインしない" -#: ../src/empathy.c:435 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" -msgstr "起動時に仲間リストや他のダイアログを表示しない" +msgstr "起動時に相手先の一覧や他のダイアログを表示しない" -#: ../src/empathy.c:450 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" -msgstr "- Empathy インスタント・メッセンジャー" +msgstr "- Empathy インスタントメッセンジャー" -#: ../src/empathy.c:637 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "" -#: ../src/empathy.c:639 +#: ../src/empathy.c:645 #, fuzzy, c-format -#| msgid "There was an error while parsing the account details." msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " "The error was:\n" @@ -3123,7 +2976,7 @@ msgid "" "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" -"Empathy はフリーソフトウェアです;フリーソフトウェア財団が提供する GNU 一般公" +"Empathy はフリーソフトウェアです; フリーソフトウェア財団が発行する GNU 一般公" "衆利用許諾契約書の第二版、あるいはそれ以降の版が定める条項の下で本プログラム" "を再頒布または変更することができます。" @@ -3134,9 +2987,9 @@ msgid "" "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." msgstr "" -"Empathy は有用とは思いますが、その頒布にあたっては市場性及び特定の目的、その" -"適合性についての暗黙の保証を含めて、いかなる保証も行ないません。詳細について" -"は GNU 一般公衆利用許諾契約書をご覧ください。" +"Empathy は役立つものであることを期待して配布されていますが、完全に無保証で" +"す。商用利用または特定の目的における適合性の保証はありません。詳細は GNU 一般" +"公衆利用許諾契約書をご覧ください。" #: ../src/empathy-about-dialog.c:89 msgid "" @@ -3148,11 +3001,11 @@ msgstr "" "るはずです。そうでない場合は、Free Software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-130159 USA まで手紙を書いてください。" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" -msgstr "GNOME 向けのインスタント・メッセンジャー・クライアントです。" +msgstr "GNOME 向けインスタントメッセンジャー・クライアント" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "相花 毅 \n" @@ -3161,6 +3014,7 @@ msgstr "" "(Contributed to Moblin by Intel GLS)\n" "草野 貴之 \n" "西堀 清貴 \n" +"Mako N \n" "日本GNOMEユーザー会 " #: ../src/empathy-account-assistant.c:167 @@ -3193,79 +3047,81 @@ msgstr "" "らアカウントを後で追加することもできます。" #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1276 msgid "An error occurred" msgstr "エラーが発生しました" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "どの種類のアカウントがありますか?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "設定したい他のアカウントはありますか?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "アカウントの詳細を入力" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "生成したいアカウントの種類は?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "他のアカウントを生成しますか?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "新しいアカウントの詳細を入力" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " "programs. With a microphone or a webcam you can also have audio or video " "calls." msgstr "" -"Empathyで近くの人や友達や同僚とGoogle Talk、AIM、Windows Liveや他のプログラム" -"で会話ができます。マイクやウェブカメラでも音声や映像で会話ができます。" +"Empathy を使って、近くの人や友達や同僚と Google トーク、AIM、Windows Live や" +"他のプログラムでチャットできます。マイクやウェブカメラでも音声やビデオで通話" +"できます。" -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" -msgstr "他の会話用プログラムで利用してきたアカウントはありますか?" +msgstr "他のチャットプログラムで利用してきたアカウントはありますか?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "はい、アカウントの詳細をインポートします " -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "はい、今アカウントの詳細を入力します" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "いいえ、新しいアカウントを作成します" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "いいえ、今近くでオンラインの人を見たいだけです" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "インポートしたいアカウントを選択します:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "はい" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "いいえ、今はこれで十分です" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3277,18 +3133,16 @@ msgstr "" "してください。'アカウント' のダイアログで、後で詳細は簡単に変更できます。ま" "た、この機能を無効にすることもできます。" -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 msgid "Edit->Accounts" msgstr "編集 → アカウント" -#: ../src/empathy-account-assistant.c:1107 -#, fuzzy -#| msgid "I don't want to enable this feature for now" +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" -msgstr "この機能を今は有効にしたくありません" +msgstr "この機能を今は有効にしたくありません(_N)" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1148 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3297,88 +3151,96 @@ msgid "" msgstr "" "ローカルネットワークに接続した人々とチャットすることができません。telepathy-" "salut がインストールされていないためです。この機能を有効にするには、" -"telepathy-salut パッケージをインストールし、アカウントダイアログから「すぐ近" -"くにいる人達」のアカウントを作成してください。" +"telepathy-salut パッケージをインストールし、アカウントダイアログから People " +"Nearby のアカウントを作成してください。" -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1154 msgid "telepathy-salut not installed" msgstr "telepathy-salut がインストールされていません" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1200 msgid "Messaging and VoIP Accounts Assistant" msgstr "メッセージングと VoIP のアカウントアシスタント" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1234 msgid "Welcome to Empathy" -msgstr "ようこそEmpathyへ" +msgstr "ようこそ Empathy へ" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1243 msgid "Import your existing accounts" -msgstr "存在するアカウントをインポートします" +msgstr "既存のアカウントをインポートします" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1261 msgid "Please enter personal details" msgstr "個人の詳細な情報を入力してください" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." -msgstr "保存されてない　%s アカウントへの変更があります。" +msgstr "%s アカウントへの保存されていない変更があります。" #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." -msgstr "あなたの新しいアカウントはまだ保存されていません。" +msgstr "新しいアカウントはまだ保存されていません。" -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:754 -#: ../src/empathy-call-window.c:1175 +#: ../src/empathy-accounts-dialog.c:344 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "接続中…" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:385 #, c-format msgid "Offline — %s" msgstr "オフライン — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:397 #, c-format msgid "Disconnected — %s" msgstr "切断 - %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:408 msgid "Offline — No Network Connection" msgstr "オフライン - ネットワーク接続がありません" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:415 msgid "Unknown Status" msgstr "不明な状態" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:427 msgid "Offline — Account Disabled" msgstr "オフライン - アカウントが無効" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"変更を破棄して新しいアカウントを生成しようとしています。\n" -"本当に継続しますか?" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "接続パラメーターを編集" + +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "サーバーから個人情報を取得するのに失敗しました。" + +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "個人情報を編集するには、オンラインにしてください。" -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "接続パラメーターの編集(_E)..." + +#: ../src/empathy-accounts-dialog.c:1289 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "コンピューターから %s を削除しますか?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1293 msgid "This will not remove your account on the server." msgstr "これによって、サーバーからアカウントが削除されることはありません。" -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1529 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3387,19 +3249,15 @@ msgstr "" "本当に継続しますか?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 -#, fuzzy -#| msgid "_Enabled" +#: ../src/empathy-accounts-dialog.c:1705 msgid "_Enable" -msgstr "サインイン(_E)" +msgstr "有効化(_E)" -#: ../src/empathy-accounts-dialog.c:1644 -#, fuzzy -#| msgid "_Enabled" +#: ../src/empathy-accounts-dialog.c:1706 msgid "_Disable" -msgstr "サインイン(_E)" +msgstr "無効化(_D)" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2176 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3408,24 +3266,18 @@ msgstr "" "本当に継続しますか?" #: ../src/empathy-accounts-dialog.ui.h:1 -#, fuzzy -#| msgid "_Add…" msgid "Add…" -msgstr "追加(_A)…" - -#: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Loading account information" -msgstr "アカウントの情報を読み込み中" +msgstr "追加…" #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "No protocol installed" -msgstr "プロトコルがインストールされていません" +msgid "_Import…" +msgstr "インポート(_I)…" #: ../src/empathy-accounts-dialog.ui.h:4 msgid "Protocol:" msgstr "プロトコル:" -#: ../src/empathy-accounts-dialog.ui.h:6 +#: ../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." @@ -3433,160 +3285,144 @@ msgstr "" "新しいアカウントを登録するには、まず最初に利用するプロトコルのバックエンドを" "インストールしておいてください。" +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "プロトコルがインストールされていません" + #: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Import…" -msgstr "インポート(_I)…" +msgid "Loading account information" +msgstr "アカウントの情報を読み込み中" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr " - Empathy 認証クライアント" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Empathy 認証クライアント" #: ../src/empathy-auto-salut-account-helper.c:83 msgid "People nearby" -msgstr "すぐ近くにいる人達" +msgstr "People nearby" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:192 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:193 msgid "- Empathy Audio/Video Client" -msgstr "- Empathy 音声/映像クライアント" +msgstr "- Empathy 音声/ビデオ・クライアント" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:217 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:218 msgid "Empathy Audio/Video Client" -msgstr "Empathy 音声/映像クライアント" +msgstr "Empathy 音声/ビデオ・クライアント" -#: ../src/empathy-streamed-media-window.c:431 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "コントラスト" -#: ../src/empathy-streamed-media-window.c:434 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "明るさ" -#: ../src/empathy-streamed-media-window.c:437 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "ガンマ" -#: ../src/empathy-streamed-media-window.c:542 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "音量" -#: ../src/empathy-streamed-media-window.c:1110 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "サイドバー(_S)" -#: ../src/empathy-streamed-media-window.c:1130 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" -msgstr "音声" +msgstr "音声入力" -#: ../src/empathy-streamed-media-window.c:1134 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" -msgstr "映像" +msgstr "ビデオ入力" -#: ../src/empathy-streamed-media-window.c:1140 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "ダイアルパッド" -#: ../src/empathy-streamed-media-window.c:1151 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "詳細" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1220 -#: ../src/empathy-call-window.c:1782 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format msgid "Call with %s" -msgstr "%sで発信" +msgstr "%s との通話" -#: ../src/empathy-streamed-media-window.c:1453 -#: ../src/empathy-call-window.c:2026 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 msgid "The IP address as seen by the machine" msgstr "このマシンで見かけたIPアドレス" -#: ../src/empathy-streamed-media-window.c:1455 -#: ../src/empathy-call-window.c:2028 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 msgid "The IP address as seen by a server on the Internet" msgstr "インターネット上のサーバーで見かけたIPアドレス" -#: ../src/empathy-streamed-media-window.c:1457 -#: ../src/empathy-call-window.c:2030 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 msgid "The IP address of the peer as seen by the other side" msgstr "もう一方のほうで見かけたピアのIPアドレス" -#: ../src/empathy-streamed-media-window.c:1459 -#: ../src/empathy-call-window.c:2032 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 msgid "The IP address of a relay server" msgstr "リレーサーバーのIPアドレス" -#: ../src/empathy-streamed-media-window.c:1461 -#: ../src/empathy-call-window.c:2034 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 msgid "The IP address of the multicast group" msgstr "マルチキャストグループのIPアドレス" -#: ../src/empathy-streamed-media-window.c:1843 -#, fuzzy -#| msgid "Unknown" -msgctxt "encoding video codec" -msgid "Unknown" -msgstr "不明" - -#: ../src/empathy-streamed-media-window.c:1846 -#, fuzzy -#| msgid "Unknown" -msgctxt "encoding audio codec" -msgid "Unknown" -msgstr "不明" - -#: ../src/empathy-streamed-media-window.c:1849 -#, fuzzy -#| msgid "Unknown" -msgctxt "decoding video codec" -msgid "Unknown" -msgstr "不明" - -#: ../src/empathy-streamed-media-window.c:1852 -#, fuzzy -#| msgid "Unknown" -msgctxt "decoding audio codec" +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 +msgctxt "codec" msgid "Unknown" msgstr "不明" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2144 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "接続しました — %d分%02d秒" -#: ../src/empathy-streamed-media-window.c:2205 -#: ../src/empathy-call-window.c:2798 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 msgid "Technical Details" msgstr "技術的な詳細" -#: ../src/empathy-streamed-media-window.c:2243 -#: ../src/empathy-call-window.c:2836 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " "computer" msgstr "" -"%s のソフトウェアはあなたのコンピューターでサポートされているどの音声形式も理" -"解できません" +"%s のソフトウェアは、お使いのコンピューターでサポートされているどの音声フォー" +"マットも理解できません" -#: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:2841 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " "computer" msgstr "" -"%s のソフトウェアはあなたのコンピューターでサポートされているどの映像形式も理" -"解できません" +"%s のソフトウェアは、お使いのコンピューターでサポートされているどの動画フォー" +"マットも理解できません" -#: ../src/empathy-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:2847 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3595,29 +3431,29 @@ msgstr "" "%s への接続を確立できませんでした。ネットワーク上のどちらかが直接接続を許可さ" "れていないのかもしれません。" -#: ../src/empathy-streamed-media-window.c:2260 -#: ../src/empathy-call-window.c:2853 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 msgid "There was a failure on the network" msgstr "ネットワークで問題が発生しました" -#: ../src/empathy-streamed-media-window.c:2264 -#: ../src/empathy-call-window.c:2857 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" -"この呼び出しに必要な音声形式があなたのコンピューターにインストールされていま" -"せん" +"この通話に必要な音声フォーマットは、お使いのコンピューターにインストールされ" +"ていません" -#: ../src/empathy-streamed-media-window.c:2267 -#: ../src/empathy-call-window.c:2860 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" -"この呼び出しに必要な映像形式があなたのコンピューターにインストールされていま" -"せん" +"この通話に必要な動画フォーマットは、お使いのコンピューターにインストールされ" +"ていません" -#: ../src/empathy-streamed-media-window.c:2277 -#: ../src/empathy-call-window.c:2872 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please してください。その時に、ヘルプメニューの　'デバッグ' ウィン" "ドウで集めたログを添付してください。" -#: ../src/empathy-streamed-media-window.c:2285 -#: ../src/empathy-call-window.c:2881 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 msgid "There was a failure in the call engine" -msgstr "呼び出しエンジンで問題が発生しました" +msgstr "通話エンジンで問題が発生しました" -#: ../src/empathy-streamed-media-window.c:2288 -#: ../src/empathy-call-window.c:2884 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 msgid "The end of the stream was reached" msgstr "ストリームの終端に到達しました" -#: ../src/empathy-streamed-media-window.c:2328 -#: ../src/empathy-call-window.c:2924 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 msgid "Can't establish audio stream" msgstr "音声ストリームを確立できません" -#: ../src/empathy-streamed-media-window.c:2338 -#: ../src/empathy-call-window.c:2934 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 msgid "Can't establish video stream" msgstr "映像ストリームを確立できません" -#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2 +#: ../src/empathy-call-window.ui.h:1 #: ../src/empathy-streamed-media-window.ui.h:1 -msgid "Audio" -msgstr "音声" +msgid "_Call" +msgstr "通話(_C)" #: ../src/empathy-call-window.ui.h:3 -#: ../src/empathy-streamed-media-window.ui.h:5 -msgid "Decoding Codec:" -msgstr "デコード用コーデック:" +msgid "_Microphone" +msgstr "マイク(_M)" #: ../src/empathy-call-window.ui.h:4 -#, fuzzy -#| msgid "_Enabled" -msgid "Disable camera" -msgstr "サインイン(_E)" +msgid "_Camera" +msgstr "カメラ(_C)" #: ../src/empathy-call-window.ui.h:5 -msgid "Display the dialpad" -msgstr "" +msgid "_Settings" +msgstr "設定(_S)" #: ../src/empathy-call-window.ui.h:6 -#: ../src/empathy-streamed-media-window.ui.h:9 -msgid "Encoding Codec:" -msgstr "エンコードするコーデック:" +#: ../src/empathy-roster-window-menubar.ui.h:17 +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "_View" +msgstr "表示(_V)" -#: ../src/empathy-call-window.ui.h:7 -#: ../src/empathy-streamed-media-window.ui.h:10 -msgid "Hang up" -msgstr "接続を切る" +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:27 +msgid "_Help" +msgstr "ヘルプ(_H)" -#: ../src/empathy-call-window.ui.h:8 -#: ../src/empathy-streamed-media-window.ui.h:11 -msgid "Hang up current call" -msgstr "現在の通話を止める" +#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:28 +msgid "_Contents" +msgstr "目次(_C)" #: ../src/empathy-call-window.ui.h:9 -#: ../src/empathy-streamed-media-window.ui.h:12 -msgid "Local Candidate:" -msgstr "ローカルな候補:" +#: ../src/empathy-roster-window-menubar.ui.h:29 +msgid "_Debug" +msgstr "デバッグ(_D)" #: ../src/empathy-call-window.ui.h:10 -msgid "Maximise me" -msgstr "" +msgid "Swap camera" +msgstr "カメラの入れ替え" #: ../src/empathy-call-window.ui.h:11 msgid "Minimise me" msgstr "" #: ../src/empathy-call-window.ui.h:12 -#: ../src/empathy-streamed-media-window.ui.h:15 -msgid "Remote Candidate:" -msgstr "リモートの候補:" +msgid "Maximise me" +msgstr "" #: ../src/empathy-call-window.ui.h:13 -#: ../src/empathy-streamed-media-window.ui.h:16 -msgid "Send Audio" -msgstr "音声の送信" +msgid "Disable camera" +msgstr "カメラを無効化する" #: ../src/empathy-call-window.ui.h:14 -#, fuzzy -#| msgid "Send _Video" -msgid "Send Video" -msgstr "映像の送信(_V)" +#: ../src/empathy-streamed-media-window.ui.h:2 +msgid "Hang up" +msgstr "接続を切る" #: ../src/empathy-call-window.ui.h:15 -#, fuzzy -#| msgid "Dialpad" -msgid "Show dialpad" -msgstr "ダイアルパッド" +#: ../src/empathy-streamed-media-window.ui.h:9 +msgid "Hang up current call" +msgstr "現在の通話を止める" #: ../src/empathy-call-window.ui.h:16 -msgid "Start a video call" -msgstr "" +msgid "Video call" +msgstr "ビデオ通話" #: ../src/empathy-call-window.ui.h:17 -msgid "Start an audio call" -msgstr "" - -#: ../src/empathy-call-window.ui.h:18 -msgid "Swap camera" -msgstr "" +msgid "Start a video call" +msgstr "ビデオ通話の開始" #: ../src/empathy-call-window.ui.h:19 -#: ../src/empathy-streamed-media-window.ui.h:17 -msgid "Toggle audio transmission" -msgstr "音声の転送をオン・オフ" +msgid "Start an audio call" +msgstr "音声通話の開始" #: ../src/empathy-call-window.ui.h:20 -#, fuzzy -#| msgid "Toggle audio transmission" +msgid "Show dialpad" +msgstr "ダイアルパッドを表示" + +#: ../src/empathy-call-window.ui.h:21 +msgid "Display the dialpad" +msgstr "ダイヤルパッドの表示" + +#: ../src/empathy-call-window.ui.h:22 +msgid "Send Video" +msgstr "映像の送信" + +#: ../src/empathy-call-window.ui.h:23 msgid "Toggle video transmission" +msgstr "ビデオの転送をオン・オフ" + +#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Send Audio" +msgstr "音声の送信" + +#: ../src/empathy-call-window.ui.h:25 +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Toggle audio transmission" msgstr "音声の転送をオン・オフ" -#: ../src/empathy-call-window.ui.h:21 -#: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432 -#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434 +#: ../src/empathy-call-window.ui.h:27 +#: ../src/empathy-streamed-media-window.ui.h:20 +msgid "Encoding Codec:" +msgstr "エンコードするコーデック:" + +#: ../src/empathy-call-window.ui.h:28 +#: ../src/empathy-streamed-media-window.ui.h:21 +#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 msgid "Unknown" msgstr "不明" -#: ../src/empathy-call-window.ui.h:23 -#, fuzzy -#| msgctxt "menu item" -#| msgid "_Video Call" -msgid "Video call" -msgstr "映像で会話(_V)" +#: ../src/empathy-call-window.ui.h:29 +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Decoding Codec:" +msgstr "デコード用コーデック:" -#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-call-window.ui.h:30 +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Remote Candidate:" +msgstr "リモートの候補:" + +#: ../src/empathy-call-window.ui.h:31 #: ../src/empathy-streamed-media-window.ui.h:24 -msgid "_Call" -msgstr "呼び出す(_C)" +msgid "Local Candidate:" +msgstr "ローカルな候補:" -#: ../src/empathy-call-window.ui.h:25 +#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:25 +msgid "Audio" +msgstr "音声" + +#: ../src/empathy-chat-window.c:285 #, fuzzy -#| msgid "Camera On" -msgid "_Camera" -msgstr "カメラ入" +#| msgid "Hide the main window." +msgid "Close this window?" +msgstr "メインウィンドウを隠すかどうかです。" -#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 -msgid "_Contents" -msgstr "目次(_C)" +#: ../src/empathy-chat-window.c:290 +#, c-format +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "" -#: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 -msgid "_Debug" -msgstr "デバッグ(_D)" +#: ../src/empathy-chat-window.c:301 +#, 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] "" -#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 -msgid "_Help" -msgstr "ヘルプ(_H)" +#: ../src/empathy-chat-window.c:310 +#, fuzzy, c-format +#| msgid "Level " +msgid "Leave %s?" +msgstr "レベル " -#: ../src/empathy-call-window.ui.h:30 -#, fuzzy -#| msgid "Megaphone" -msgid "_Microphone" -msgstr "メガホン" +#: ../src/empathy-chat-window.c:311 +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "" -#: ../src/empathy-call-window.ui.h:31 -#, fuzzy -#| msgid "Settings" -msgid "_Settings" -msgstr "設定" +#: ../src/empathy-chat-window.c:330 +msgid "Close window" +msgstr "" -#: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 -#: ../src/empathy-streamed-media-window.ui.h:25 -msgid "_View" -msgstr "表示(_V)" +#: ../src/empathy-chat-window.c:330 +#, fuzzy +#| msgid "Level " +msgid "Leave room" +msgstr "レベル " -#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 +#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (未読 %d)" -#: ../src/empathy-chat-window.c:493 +#: ../src/empathy-chat-window.c:648 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (他に %u)" -#: ../src/empathy-chat-window.c:509 +#: ../src/empathy-chat-window.c:664 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (他から %d の未読)" -#: ../src/empathy-chat-window.c:518 +#: ../src/empathy-chat-window.c:673 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (未読は全部で %d)" -#: ../src/empathy-chat-window.c:733 +#: ../src/empathy-chat-window.c:888 msgid "SMS:" -msgstr "" +msgstr "SMS:" -#: ../src/empathy-chat-window.c:743 +#: ../src/empathy-chat-window.c:898 #, fuzzy, c-format -#| msgid "Typing a message." msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "メッセージを入力しています" -#: ../src/empathy-chat-window.c:765 +#: ../src/empathy-chat-window.c:920 msgid "Typing a message." msgstr "メッセージを入力しています" #: ../src/empathy-chat-window.ui.h:1 -msgid "C_lear" -msgstr "クリア(_L)" +msgid "_Conversation" +msgstr "会話(_C)" #: ../src/empathy-chat-window.ui.h:2 -msgid "C_ontact" -msgstr "仲間(_O)" +msgid "C_lear" +msgstr "消去(_L)" -#: ../src/empathy-chat-window.ui.h:4 +#: ../src/empathy-chat-window.ui.h:3 msgid "Insert _Smiley" msgstr "スマイリーの挿入(_S)" +#: ../src/empathy-chat-window.ui.h:4 +msgid "_Favorite Chat Room" +msgstr "お気に入りの談話室(_F)" + #: ../src/empathy-chat-window.ui.h:5 -msgid "Invite _Participant…" -msgstr "参加者を招待(_P)…" +msgid "Notify for All Messages" +msgstr "すべてのメッセージを通知" -#: ../src/empathy-chat-window.ui.h:6 -msgid "Move Tab _Left" -msgstr "タブを左へ移動(_L)" +#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1 +msgid "_Show Contact List" +msgstr "相手先の一覧の表示(_S)" #: ../src/empathy-chat-window.ui.h:7 -msgid "Move Tab _Right" -msgstr "タブを右へ移動(_R)" +msgid "Invite _Participant…" +msgstr "参加者を招待(_P)…" #: ../src/empathy-chat-window.ui.h:8 -msgid "Notify for All Messages" -msgstr "すべてのメッセージを通知" +msgid "C_ontact" +msgstr "相手先(_O)" #: ../src/empathy-chat-window.ui.h:10 -msgid "_Conversation" -msgstr "会話(_C)" +msgid "_Tabs" +msgstr "タブ(_T)" #: ../src/empathy-chat-window.ui.h:11 -msgid "_Detach Tab" -msgstr "タブの取り外し(_D)" - -#: ../src/empathy-chat-window.ui.h:13 -msgid "_Favorite Chat Room" -msgstr "お気に入りのチャットルーム(_F)" +msgid "_Previous Tab" +msgstr "前のタブへ(_P)" -#: ../src/empathy-chat-window.ui.h:15 +#: ../src/empathy-chat-window.ui.h:12 msgid "_Next Tab" msgstr "次のタブへ(_N)" -#: ../src/empathy-chat-window.ui.h:16 -msgid "_Previous Tab" -msgstr "前のタブへ(_P)" +#: ../src/empathy-chat-window.ui.h:13 +msgid "_Undo Close Tab" +msgstr "閉じたタブを戻す(_U)" -#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5 -msgid "_Show Contact List" -msgstr "仲間リストの表示(_S)" +#: ../src/empathy-chat-window.ui.h:14 +msgid "Move Tab _Left" +msgstr "タブを左へ移動(_L)" -#: ../src/empathy-chat-window.ui.h:18 -msgid "_Tabs" -msgstr "タブ(_T)" +#: ../src/empathy-chat-window.ui.h:15 +msgid "Move Tab _Right" +msgstr "タブを右へ移動(_R)" -#: ../src/empathy-chat-window.ui.h:19 -msgid "_Undo Close Tab" -msgstr "閉じたタブを戻す(_U)" +#: ../src/empathy-chat-window.ui.h:16 +msgid "_Detach Tab" +msgstr "タブの取り外し(_D)" #: ../src/empathy-chatrooms-window.c:251 msgid "Name" @@ -3904,109 +3767,106 @@ msgstr "名前" #: ../src/empathy-chatrooms-window.c:269 msgid "Room" -msgstr "部屋" +msgstr "談話室" #: ../src/empathy-chatrooms-window.c:277 msgid "Auto-Connect" msgstr "自動サインイン" -#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-chatrooms-window.ui.h:1 msgid "Manage Favorite Rooms" -msgstr "お気に入りの部屋" +msgstr "お気に入りの談話室" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" -msgstr "映像で呼びかけられた" +msgstr "ビデオ通話の着信" -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "着信があります" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" -msgstr "%s さんからの映像の着信ですが、応答しますか?" +msgstr "%s さんからビデオ通話の着信です。応答しますか?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" -msgstr "%s さんからの着信ですが、応答しますか?" +msgstr "%s さんから着信です。応答しますか?" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "%s さんからの呼び出しです" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "拒否する(_R)" -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "応答する(_A)" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" -msgstr "" +msgstr "ビデオで応答(_A)" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1414 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" -msgstr "%s さんからの映像での呼び出しです" +msgstr "%s さんからのビデオ通話の着信です" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" -msgstr "チャットルームへの招待" +msgstr "談話室への招待" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "%s への参加の招待" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s さんがあなたを %s に招待しています" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "お断りする(_D)" -#: ../src/empathy-event-manager.c:858 -#: ../src/empathy-new-chatroom-dialog.ui.h:7 +#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "_Join" -msgstr "参加する(_J)" +msgstr "参加(_J)" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s さんがあなたを %s に招待しました" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "あなたは %s への参加の招待を受け取りました" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "%s さんからファイル転送のお知らせです" -#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375 -#, fuzzy -#| msgid "Password" +#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372 msgid "Password required" -msgstr "パスワード" +msgstr "パスワードが必要です" -#: ../src/empathy-event-manager.c:1190 +#: ../src/empathy-event-manager.c:1217 #, fuzzy, c-format -#| msgid "%s would like to send you a file" msgid "%s would like permission to see when you are online" msgstr "%s さんがあなたにファイルを送信したいようです" -#: ../src/empathy-event-manager.c:1194 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -4016,105 +3876,105 @@ msgstr "" "メッセージ: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "不明" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s / %s で %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s / %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "\"%s\" を %s さんから受信中" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "\"%s\" から %s へ送信中" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "\"%s\" を %s から受信エラー" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "ファイル受信エラー" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "\"%s\" の %s への送信エラー" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "ファイル転送エラー" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "\"%s\" を %s さんから受信しました" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "\"%s\" を %s さんに送信します" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "ファイルの転送が完了しました" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "他の参加者の応答を待っています" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "\"%s\" の完全性をチェックしています" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "ハッシュ計算中 \"%s\"" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "ファイル" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "残り" @@ -4124,194 +3984,209 @@ msgstr "ファイル転送" #: ../src/empathy-ft-manager.ui.h:2 msgid "Remove completed, canceled and failed file transfers from the list" -msgstr "Remove completed, canceled and failed file transfers from the list" +msgstr "終了・停止・失敗したファイル転送を一覧から削除します" #: ../src/empathy-import-dialog.c:84 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." msgstr "" -"取り込めそうなアカウントが見つかりませんでした。ちなみに、現在取り込みをサ" -"ポートしているのは Pidgin のアカウントだけです。" +"インポート可能なアカウントが見つかりませんでした。現在のところ、インポートを" +"サポートしているのは Pidgin のアカウントだけです。" #: ../src/empathy-import-dialog.c:199 msgid "Import Accounts" -msgstr "アカウントの取り込み" +msgstr "アカウントのインポート" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" -msgstr "取り込む" +msgstr "インポートする" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "プロトコル" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "提供元" -#: ../src/empathy-main-window.c:392 +#: ../src/empathy-roster-window.c:389 #, fuzzy -#| msgid "Password" msgid "Provide Password" msgstr "パスワード" -#: ../src/empathy-main-window.c:398 -#, fuzzy -#| msgid "Disconnected" +#: ../src/empathy-roster-window.c:395 msgid "Disconnect" -msgstr "不通" +msgstr "切断" + +#: ../src/empathy-roster-window.c:644 +msgid "You need to setup an account to see contacts here." +msgstr "" -#: ../src/empathy-main-window.c:622 +#: ../src/empathy-roster-window.c:660 msgid "No match found" msgstr "見つかりませんでした" -#: ../src/empathy-main-window.c:777 +#: ../src/empathy-roster-window.c:765 +#, fuzzy, c-format +msgid "Sorry, %s accounts can’t be used until your %s software is updated." +msgstr "%s のアカウントは、%s のソフトウェアを更新するまで使えません。" + +#: ../src/empathy-roster-window.c:831 +msgid "Update software..." +msgstr "ソフトウェアの更新..." + +#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954 +msgid "Close" +msgstr "閉じる" + +#: ../src/empathy-roster-window.c:942 msgid "Reconnect" msgstr "再接続" -#: ../src/empathy-main-window.c:783 +#: ../src/empathy-roster-window.c:948 msgid "Edit Account" msgstr "アカウントの編集" -#: ../src/empathy-main-window.c:789 -msgid "Close" -msgstr "閉じる" - #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:928 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1092 #, c-format msgid "Top up %s (%s)..." msgstr "" -#: ../src/empathy-main-window.c:975 +#: ../src/empathy-roster-window.c:1138 #, fuzzy -#| msgid "Salut account is created" msgid "Top up account credit" msgstr "Salut のアカウントを生成するかどうか" #. top up button -#: ../src/empathy-main-window.c:1046 +#: ../src/empathy-roster-window.c:1210 msgid "Top Up..." msgstr "" -#: ../src/empathy-main-window.c:1789 +#: ../src/empathy-roster-window.c:1933 msgid "Contact" -msgstr "仲間" +msgstr "相手先" -#: ../src/empathy-main-window.c:2121 -msgid "Contact List" -msgstr "仲間リスト" - -#: ../src/empathy-main-window-menubar.ui.h:1 -msgid "Contacts on a _Map" -msgstr "地図上の仲間(_M)" +#: ../src/empathy-roster-window.c:2131 +msgid "You need to enable one of your accounts to see contacts here." +msgstr "" -#: ../src/empathy-main-window-menubar.ui.h:2 -msgid "Credit Balance" +#. translators: argument is an account name +#: ../src/empathy-roster-window.c:2139 +#, c-format +msgid "You need to enable %s to see contacts here." msgstr "" -#: ../src/empathy-main-window-menubar.ui.h:3 +#: ../src/empathy-roster-window.c:2419 +msgid "Contact List" +msgstr "相手先の一覧" + +#: ../src/empathy-roster-window.ui.h:1 #, fuzzy -#| msgid "Contact List" -msgid "Find in Contact _List" -msgstr "仲間リスト" +#| msgid "_Accounts" +msgid "Account settings" +msgstr "アカウント(_A)" -#: ../src/empathy-main-window-menubar.ui.h:4 -msgid "Join _Favorites" -msgstr "お気に入りに追加(_F)" +#: ../src/empathy-roster-window-menubar.ui.h:2 +#: ../src/empathy-status-icon.ui.h:2 +msgid "_New Conversation…" +msgstr "新しい会話(_N)…" -#: ../src/empathy-main-window-menubar.ui.h:5 -msgid "Manage Favorites" -msgstr "お気に入りの管理" +#: ../src/empathy-roster-window-menubar.ui.h:3 +#: ../src/empathy-status-icon.ui.h:3 +msgid "New _Call…" +msgstr "新しい通話(_C)…" -#: ../src/empathy-main-window-menubar.ui.h:6 -msgid "N_ormal Size" -msgstr "アバターなしの通常サイズ(_O)" +#: ../src/empathy-roster-window-menubar.ui.h:6 +msgid "_Search for Contacts…" +msgstr "相手先を検索(_S)…" -#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 -msgid "New _Call…" -msgstr "新規に呼び出す(_C)…" +#: ../src/empathy-roster-window-menubar.ui.h:7 +msgid "_File Transfers" +msgstr "ファイル転送(_F)" -#: ../src/empathy-main-window-menubar.ui.h:8 -msgid "Normal Size With _Avatars" -msgstr "アバターありの通常サイズ(_A)" +#: ../src/empathy-roster-window-menubar.ui.h:8 +msgid "_Offline Contacts" +msgstr "オフラインの相手先を表示(_O)" + +#: ../src/empathy-roster-window-menubar.ui.h:9 +msgid "Show P_rotocols" +msgstr "プロトコルを表示(_R)" + +#: ../src/empathy-roster-window-menubar.ui.h:10 +msgid "Credit Balance" +msgstr "クレジット残高" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:11 +msgid "Contacts on a _Map" +msgstr "地図上の相手先(_M)" + +#: ../src/empathy-roster-window-menubar.ui.h:13 +msgid "_Accounts" +msgstr "アカウント(_A)" + +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Blocked Contacts" +msgstr "ブロック中の相手先(_B)" + +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "P_references" msgstr "設定(_R)" -#: ../src/empathy-main-window-menubar.ui.h:10 -msgid "Show P_rotocols" -msgstr "プロトコルの表示(_R)" +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "Find in Contact _List" +msgstr "相手先の一覧で検索(_L)" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "Sort by _Name" msgstr "名前順に並び替え(_N)" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "Sort by _Status" msgstr "状態で並び替え(_S)" -#: ../src/empathy-main-window-menubar.ui.h:13 -msgid "_Accounts" -msgstr "アカウント(_A)" +#: ../src/empathy-roster-window-menubar.ui.h:20 +msgid "Normal Size With _Avatars" +msgstr "アバターありの通常サイズ(_A)" -#: ../src/empathy-main-window-menubar.ui.h:15 -#, fuzzy -#| msgid "Linked Contacts" -msgid "_Blocked Contacts" -msgstr "リンク中の仲間" +#: ../src/empathy-roster-window-menubar.ui.h:21 +msgid "N_ormal Size" +msgstr "アバターなしの通常サイズ(_O)" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Compact Size" msgstr "コンパクトサイズ(_C)" -#: ../src/empathy-main-window-menubar.ui.h:21 -msgid "_File Transfers" -msgstr "ファイル転送(_F)" +#: ../src/empathy-roster-window-menubar.ui.h:23 +msgid "_Room" +msgstr "談話室(_R)" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:24 msgid "_Join…" msgstr "参加(_J)…" -#: ../src/empathy-main-window-menubar.ui.h:24 -#: ../src/empathy-status-icon.ui.h:3 -msgid "_New Conversation…" -msgstr "新しい会話(_N)…" - -#: ../src/empathy-main-window-menubar.ui.h:25 -msgid "_Offline Contacts" -msgstr "オフラインの仲間を表示(_O)" - -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "個人情報(_P)" - -#: ../src/empathy-main-window-menubar.ui.h:28 -msgid "_Room" -msgstr "部屋(_R)" +#: ../src/empathy-roster-window-menubar.ui.h:25 +msgid "Join _Favorites" +msgstr "お気に入りに追加(_F)" -#: ../src/empathy-main-window-menubar.ui.h:29 -#, fuzzy -#| msgctxt "Link individual (contextual menu)" -#| msgid "_Link Contacts…" -msgid "_Search for Contacts…" -msgstr "仲間をリンク(_L)…" +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "Manage Favorites" +msgstr "お気に入りの管理" -#: ../src/empathy-new-chatroom-dialog.c:337 +#: ../src/empathy-new-chatroom-dialog.c:369 msgid "Chat Room" -msgstr "チャットルーム" +msgstr "談話室" -#: ../src/empathy-new-chatroom-dialog.c:353 +#: ../src/empathy-new-chatroom-dialog.c:385 msgid "Members" msgstr "メンバー" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:553 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4324,347 +4199,349 @@ msgstr "" "パスワードが必要: %s\n" "メンバー数: %s" -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "いいえ" -#: ../src/empathy-new-chatroom-dialog.c:584 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" -msgstr "部屋リストの作成を開始できません" +msgstr "談話室の一覧作成を開始できません" -#: ../src/empathy-new-chatroom-dialog.c:594 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" -msgstr "部屋リストの作成を停止できません" +msgstr "談話室の一覧作成を停止できません" -#: ../src/empathy-new-chatroom-dialog.ui.h:2 -msgid "Couldn't load room list" -msgstr "部屋リストをロードできません" +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Join Room" +msgstr "談話室に参加する" #: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "" "Enter the room name to join here or click on one or more rooms in the list." msgstr "" -"入室する部屋の名前を入力するか、下にある一覧から1つ以上の部屋をクリックしてく" -"ださい" +"参加する談話室の名前を入力するか、下にある一覧から1つ以上の談話室をクリックし" +"てください" #: ../src/empathy-new-chatroom-dialog.ui.h:4 +msgid "_Room:" +msgstr "談話室(_R):" + +#: ../src/empathy-new-chatroom-dialog.ui.h:5 msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" msgstr "" -"その部屋を提供しているサーバーを入力するか、またはその部屋が現在利用している" -"サーバーにある場合は空のままにしてください" +"その談話室を提供しているサーバーを入力するか、またはその談話室が現在利用して" +"いるサーバーにある場合は空のままにしてください" -#: ../src/empathy-new-chatroom-dialog.ui.h:5 -msgid "Join Room" -msgstr "部屋に参加する" +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "Couldn't load room list" +msgstr "談話室の一覧をロードできません" -#: ../src/empathy-new-chatroom-dialog.ui.h:6 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 msgid "Room List" -msgstr "部屋の一覧" - -#: ../src/empathy-new-chatroom-dialog.ui.h:8 -msgid "_Room:" -msgstr "部屋(_R):" +msgstr "談話室の一覧" -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "メッセージを受信した" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "メッセージを送信した" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "新しい会話を始めた" -#: ../src/empathy-preferences.c:172 -msgid "Contact goes online" -msgstr "仲間がサインインした" +#: ../src/empathy-preferences.c:169 +#, fuzzy +#| msgid "Contact goes online" +msgid "Contact comes online" +msgstr "相手先がサインインした" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" -msgstr "仲間がサインアウトした" +msgstr "相手先がサインアウトした" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "自分がサインインした" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "自分がサインアウトした" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "言語" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 -#, fuzzy -#| msgid "Client:" +#: ../src/empathy-preferences.c:726 msgid "Juliet" -msgstr "クライアント:" +msgstr "ジュリエット" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 -#, fuzzy -#| msgid "Room" +#: ../src/empathy-preferences.c:733 msgid "Romeo" -msgstr "部屋" +msgstr "ロミオ" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:739 msgid "O Romeo, Romeo, wherefore art thou Romeo?" -msgstr "" +msgstr "おお、ロミオ、ロミオ ! なぜにそなたはロミオじゃ !" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:743 msgid "Deny thy father and refuse thy name;" -msgstr "" +msgstr "ててごをも嫌い、自身の名をも棄てや。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:746 msgid "Or if thou wilt not, be but sworn my love" -msgstr "" +msgstr "それがいやならば、せめてもわしの恋人じゃと誓言しや。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:749 msgid "And I'll no longer be a Capulet." -msgstr "" +msgstr "わしゃもうキャピュレットをやもうほどに。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:752 msgid "Shall I hear more, or shall I speak at this?" -msgstr "" +msgstr "もそっと聞こうか? すぐ物を言おうか?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 -#, fuzzy -#| msgid "%s has disconnected" +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" -msgstr "%s は切断されました" +msgstr "ジュリエットは切断しました" -#: ../src/empathy-preferences.c:1166 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "設定" #: ../src/empathy-preferences.ui.h:1 +msgid "Show _smileys as images" +msgstr "スマイリーをアイコンで表示する(_S)" + +#: ../src/empathy-preferences.ui.h:2 +msgid "Show contact _list in rooms" +msgstr "談話室の相手先の一覧を表示する(_L)" + +#: ../src/empathy-preferences.ui.h:3 msgid "Appearance" msgstr "外観" -#: ../src/empathy-preferences.ui.h:3 -msgid "Behavior" -msgstr "挙動" +#: ../src/empathy-preferences.ui.h:4 +msgid "Start chats in:" +msgstr "" #: ../src/empathy-preferences.ui.h:5 -msgid "Chat Th_eme:" -msgstr "テーマ(_E):" +msgid "new ta_bs" +msgstr "" #: ../src/empathy-preferences.ui.h:6 -msgid "Disable notifications when _away or busy" -msgstr "離席中になったら通知を無効にする(_A)" +msgid "new _windows" +msgstr "" #: ../src/empathy-preferences.ui.h:7 -msgid "Disable sounds when _away or busy" -msgstr "離席中になったらサウンドの演奏を無効にする(_A)" - -#: ../src/empathy-preferences.ui.h:8 msgid "Display incoming events in the notification area" msgstr "受信したイベントを通知領域に表示する" +#: ../src/empathy-preferences.ui.h:8 +msgid "_Automatically connect on startup" +msgstr "起動したら自動的に接続(_A)" + #: ../src/empathy-preferences.ui.h:9 -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 "" +msgid "Log conversations" +msgstr "会話を記録" #: ../src/empathy-preferences.ui.h:10 -msgid "Enable notifications when a contact comes online" -msgstr "仲間が在席中になったら通知を有効にする" +msgid "Behavior" +msgstr "挙動" #: ../src/empathy-preferences.ui.h:11 -msgid "Enable notifications when a contact goes offline" -msgstr "仲間がオフラインになったら通知を有効にする" +msgid "General" +msgstr "全般" #: ../src/empathy-preferences.ui.h:12 -msgid "Enable notifications when the _chat is not focused" -msgstr "チャット・ウィンドウにフォーカスが無くても通知する(_C)" +msgid "_Enable bubble notifications" +msgstr "ポップアップ通知を有効にする(_E)" #: ../src/empathy-preferences.ui.h:13 -msgid "Enable spell checking for languages:" -msgstr "スペルチェックを有効にする:" +msgid "Disable notifications when _away or busy" +msgstr "離席中または取り込み中のとき通知を無効にする(_A)" #: ../src/empathy-preferences.ui.h:14 -msgid "General" -msgstr "全般" +msgid "Enable notifications when the _chat is not focused" +msgstr "チャットウィンドウにフォーカスがなくても通知する(_C)" #: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "" +msgid "Enable notifications when a contact comes online" +msgstr "相手先が在席中になったら通知を有効にする" #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "" +msgid "Enable notifications when a contact goes offline" +msgstr "相手先がオフラインになったら通知を有効にする" + +#: ../src/empathy-preferences.ui.h:17 +msgid "Notifications" +msgstr "通知" #: ../src/empathy-preferences.ui.h:18 -msgid "Location sources:" -msgstr "場所のソース:" +msgid "_Enable sound notifications" +msgstr "サウンド通知を有効にする(_E)" #: ../src/empathy-preferences.ui.h:19 -msgid "Log conversations" -msgstr "会話を記録" +msgid "Disable sounds when _away or busy" +msgstr "離席中または取り込み中のときサウンドを鳴らさない(_A)" #: ../src/empathy-preferences.ui.h:20 -msgid "Notifications" -msgstr "通知" - -#: ../src/empathy-preferences.ui.h:21 msgid "Play sound for events" msgstr "イベントでサウンドを鳴らす" +#: ../src/empathy-preferences.ui.h:21 +msgid "Sounds" +msgstr "サウンド" + #: ../src/empathy-preferences.ui.h:22 -msgid "Privacy" -msgstr "プライバシー" +msgid "Use _echo cancellation to improve call quality" +msgstr "通話の質を向上させるためエコー除去を使う(_E)" #: ../src/empathy-preferences.ui.h:23 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." +"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 "" -"位置精度を下げることで、市町村や国の公表がより正確ではなくなります。GPS座標は" -"小数点第1位まで正確です。" - -#: ../src/empathy-preferences.ui.h:24 -msgid "Show _smileys as images" -msgstr "スマイリーをアイコンで表示する(_S)" - -#: ../src/empathy-preferences.ui.h:25 -msgid "Show contact _list in rooms" -msgstr "部屋の仲間リストを表示する(_L)" +"エコー除去は、あなたの声をよりクリアに相手に届けます。しかし、コンピューター" +"によっては問題が生じます。奇妙な雑音が聞こえたり通話中に音飛びがある場合は、" +"エコー除去をオフにして、通話をふたたび始めてください。" #: ../src/empathy-preferences.ui.h:26 -msgid "Sounds" -msgstr "サウンド" +msgid "_Publish location to my contacts" +msgstr "相手先に場所を公開する(_P)" #: ../src/empathy-preferences.ui.h:27 -msgid "Spell Checking" -msgstr "スペルのチェック" - -#: ../src/empathy-preferences.ui.h:28 msgid "" -"The list of languages reflects only the languages for which you have a " -"dictionary installed." -msgstr "言語の一覧はインストールしている辞書の言語のみを反映します。" +"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 "" +"位置精度を下げることで、国、州(県)、市より精確な場所を公開しません。GPS 座標" +"は小数点第1位までの精度です。" +#. 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:29 -msgid "Themes" -msgstr "テーマ" +msgid "_Reduce location accuracy" +msgstr "場所の精度を下げる(_R)" #: ../src/empathy-preferences.ui.h:30 -#, fuzzy -#| msgid "Bearing:" -msgid "Variant:" -msgstr "方位:" +msgid "Privacy" +msgstr "プライバシー" #: ../src/empathy-preferences.ui.h:31 -msgid "_Automatically connect on startup" -msgstr "起動したら自動的に接続(_A)" +msgid "_GPS" +msgstr "GPS(_G)" #: ../src/empathy-preferences.ui.h:32 msgid "_Cellphone" msgstr "携帯(_C)" #: ../src/empathy-preferences.ui.h:33 -msgid "_Enable bubble notifications" -msgstr "ポップアップ通知を有効にする(_E)" +msgid "_Network (IP, Wi-Fi)" +msgstr "ネットワーク (IP、Wi-Fi)(_N)" #: ../src/empathy-preferences.ui.h:34 -msgid "_Enable sound notifications" -msgstr "サウンド演奏による通知を有効にする(_E)" - -#: ../src/empathy-preferences.ui.h:35 -msgid "_GPS" -msgstr "GPS(_G)" +msgid "Location sources:" +msgstr "場所のソース:" #: ../src/empathy-preferences.ui.h:36 -msgid "_Network (IP, Wi-Fi)" -msgstr "ネットワーク(IP、Wi-Fi)(_N)" +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "言語の一覧はインストールしている辞書の言語のみを反映します。" #: ../src/empathy-preferences.ui.h:37 -msgid "_Open new chats in separate windows" -msgstr "新しい会話の度に別のウィンドウを開く(_O)" +msgid "Enable spell checking for languages:" +msgstr "スペルチェックを有効にする:" #: ../src/empathy-preferences.ui.h:38 -msgid "_Publish location to my contacts" -msgstr "自分の仲間に位置を公表する(_P)" +msgid "Spell Checking" +msgstr "スペルチェック" + +#: ../src/empathy-preferences.ui.h:39 +msgid "Chat Th_eme:" +msgstr "テーマ(_E):" -#. 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:40 -msgid "_Reduce location accuracy" -msgstr "位置精度を下げる(_R)" +#, fuzzy +msgid "Variant:" +msgstr "方位:" -#: ../src/empathy-status-icon.ui.h:2 +#: ../src/empathy-preferences.ui.h:41 +msgid "Themes" +msgstr "テーマ" + +#: ../src/empathy-status-icon.ui.h:4 msgid "Status" msgstr "状態" -#: ../src/empathy-status-icon.ui.h:4 +#: ../src/empathy-status-icon.ui.h:5 msgid "_Quit" msgstr "終了(_Q)" -#: ../src/empathy-streamed-media-window.ui.h:2 -msgid "Call the contact again" -msgstr "仲間を再度呼び出す" - #: ../src/empathy-streamed-media-window.ui.h:3 -msgid "Camera Off" -msgstr "カメラ切" +msgid "Redial" +msgstr "リダイアル" #: ../src/empathy-streamed-media-window.ui.h:4 -msgid "Camera On" -msgstr "カメラ入" +msgid "V_ideo" +msgstr "ビデオ(_I)" + +#: ../src/empathy-streamed-media-window.ui.h:5 +msgid "Video Off" +msgstr "ビデオ切" #: ../src/empathy-streamed-media-window.ui.h:6 -msgid "Disable camera and stop sending video" -msgstr "カメラを無効にして映像の送信を中止" +msgid "Video Preview" +msgstr "ビデオのプレビュー" #: ../src/empathy-streamed-media-window.ui.h:7 -msgid "Enable camera and send video" -msgstr "カメラを有効にして映像を送る" +msgid "Video On" +msgstr "ビデオ入" -#: ../src/empathy-streamed-media-window.ui.h:8 -msgid "Enable camera but don't send video" -msgstr "カメラを有効にするが映像を送らない" +#: ../src/empathy-streamed-media-window.ui.h:10 +msgid "Call the contact again" +msgstr "相手先を再度呼び出す" #: ../src/empathy-streamed-media-window.ui.h:13 -msgid "Preview" -msgstr "プレビュー" +msgid "Camera Off" +msgstr "カメラ切" #: ../src/empathy-streamed-media-window.ui.h:14 -msgid "Redial" -msgstr "リダイアル" +msgid "Disable camera and stop sending video" +msgstr "カメラを無効にして映像の送信を中止" -#: ../src/empathy-streamed-media-window.ui.h:19 -msgid "V_ideo" -msgstr "映像(_I)" +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Preview" +msgstr "プレビュー" -#: ../src/empathy-streamed-media-window.ui.h:21 -msgid "Video Off" -msgstr "映像切" +#: ../src/empathy-streamed-media-window.ui.h:16 +msgid "Enable camera but don't send video" +msgstr "カメラを有効にするが映像を送らない" -#: ../src/empathy-streamed-media-window.ui.h:22 -msgid "Video On" -msgstr "映像入" +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Camera On" +msgstr "カメラ入" -#: ../src/empathy-streamed-media-window.ui.h:23 -msgid "Video Preview" -msgstr "映像のプレビュー" +#: ../src/empathy-streamed-media-window.ui.h:18 +msgid "Enable camera and send video" +msgstr "カメラを有効にして映像を送信" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Contact Map View" @@ -4674,7 +4551,7 @@ msgstr "保存" #: ../src/empathy-debug-window.c:1435 msgid "Debug Window" -msgstr "デバッグ・ウィンドウ" +msgstr "デバッグウィンドウ" #: ../src/empathy-debug-window.c:1517 msgid "Pause" @@ -4730,16 +4607,16 @@ msgid "" "extension." msgstr "選択した接続マネージャーはリモートデバッグ拡張をサポートしていません。" -#: ../src/empathy-invite-participant-dialog.c:179 -#: ../src/empathy-invite-participant-dialog.c:205 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "参加者を招待" -#: ../src/empathy-invite-participant-dialog.c:180 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" -msgstr "会話に招待する仲間を選んでください" +msgstr "会話に招待する相手先を選んでください" -#: ../src/empathy-invite-participant-dialog.c:201 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "招待する" @@ -4748,11 +4625,9 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "ダイアログを何も表示せず、処理(インポートなど)を進め、終了する" #: ../src/empathy-accounts.c:187 -#, fuzzy -#| msgid "Don't display any dialogs if there are any non-Salut accounts" msgid "" "Don't display any dialogs unless there are only \"People Nearby\" accounts" -msgstr "Salut アカウントがなければ、ダイアログを何も表示しない" +msgstr "\"People Nearby\" アカウントがなければ、ダイアログを何も表示しない" #: ../src/empathy-accounts.c:191 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" @@ -4764,109 +4639,266 @@ msgstr "" msgid "" msgstr "<アカウント ID>" -#: ../src/empathy-accounts.c:198 +#: ../src/empathy-accounts.c:196 +#, fuzzy +msgid "Show account assistant" +msgstr "アカウント・ダイアログを表示する" + +#: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" msgstr "- Empathy のアカウント" -#: ../src/empathy-accounts.c:237 +#: ../src/empathy-accounts.c:238 msgid "Empathy Accounts" msgstr "Empathy のアカウント" -#: ../src/empathy-debugger.c:70 +#: ../src/empathy-debugger.c:69 msgid "Show a particular service" msgstr "" -#: ../src/empathy-debugger.c:75 -#, fuzzy -#| msgid "Empathy Debugger" +#: ../src/empathy-debugger.c:74 msgid "- Empathy Debugger" -msgstr "Empathy デバッガー" +msgstr "- Empathy デバッガー" -#: ../src/empathy-debugger.c:114 +#: ../src/empathy-debugger.c:113 msgid "Empathy Debugger" msgstr "Empathy デバッガー" #: ../src/empathy-chat.c:107 -#, fuzzy -#| msgid "- Empathy IM Client" msgid "- Empathy Chat Client" -msgstr "- Empathy インスタント・メッセンジャー" +msgstr "- Empathy チャットクライアント" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "応答する" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1418 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 msgid "Reject" msgstr "拒否" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1419 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 msgid "Answer" msgstr "応答" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" -msgstr "" +msgstr "ビデオで応答" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "お断り" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "受け取る" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:260 +#: ../src/empathy-notifications-approver.c:247 #, fuzzy -#| msgid "Preview" msgid "Provide" msgstr "プレビュー" #: ../src/empathy-call-observer.c:134 #, c-format msgid "%s just tried to call you, but you were in another call." -msgstr "" +msgstr "%s が呼び出そうとしましたが、あなたは別の通話中でした。" #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070 +#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 msgid "i" msgstr "" -#: ../src/empathy-call-window.c:2727 +#: ../src/empathy-call-window.c:2929 msgid "On hold" msgstr "" -#: ../src/empathy-call-window.c:2730 +#: ../src/empathy-call-window.c:2932 msgid "Mute" -msgstr "" +msgstr "ミュート" -#: ../src/empathy-call-window.c:2732 -#, fuzzy -#| msgid "Location" +#: ../src/empathy-call-window.c:2934 msgid "Duration" -msgstr "場所" +msgstr "通話時間" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2735 -#, fuzzy, c-format -#| msgid "Connected — %d:%02dm" +#: ../src/empathy-call-window.c:2937 +#, c-format msgid "%s — %d:%02dm" -msgstr "接続しました — %d分%02d秒" +msgstr "%s — %d分%02d秒" + +#: ../src/empathy-call-window.c:3207 +#, c-format +msgid "Your current balance is %s." +msgstr "現在の残高は %s です。" + +#: ../src/empathy-call-window.c:3211 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "残高が不足しているため、通話できません。" + +#: ../src/empathy-call-window.c:3213 +msgid "Top Up" +msgstr "" #: ../libempathy-gtk/empathy-search-bar.c:243 -#, fuzzy -#| msgid "Match case" msgid "_Match case" -msgstr "大文字小文字を区別して一致" +msgstr "大文字小文字を区別する(_M)" + +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "新しいアカウントの追加" + +#~ msgid "Personal Information" +#~ msgstr "個人の情報" + +#~ msgid "Linked Contacts" +#~ msgstr "リンク中の相手先" + +#~ msgid "Select contacts to link" +#~ msgstr "リンクする連絡先の選択" + +#~ msgid "New contact preview" +#~ msgstr "新しい相手先をプレビュー" + +#~ msgid "Contacts selected in the list on the left will be linked together." +#~ msgstr "左の一覧で選択した相手先は互いにリンクしています" + +#~ msgctxt "Link individual (contextual menu)" +#~ msgid "_Link Contacts…" +#~ msgstr "相手先をリンク(_L)…" + +#~ msgid "Link Contacts" +#~ msgstr "相手先をリンク" + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink…" +#~ msgstr "リンクを外す(_U)…" + +#~ msgid "" +#~ "Completely split the displayed linked contacts into the separate contacts." +#~ msgstr "表示しているメタ相手先を、個別の相手先に完全に分離します。" + +#~ msgid "_Link" +#~ msgstr "リンク(_L)" + +#~ msgid "Unlink linked contacts '%s'?" +#~ msgstr "メタ相手先 '%s' のリンクを外しますか?" + +#~ msgid "" +#~ "Are you sure you want to unlink these linked contacts? This will " +#~ "completely split the linked contacts into separate contacts." +#~ msgstr "" +#~ "このメタ相手先のリンクを外しますか? メタ相手先を、個別の相手先に完全に分離" +#~ "します。" + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink" +#~ msgstr "リンクを外す(_U)" + +#~ msgid "_Personal Information" +#~ msgstr "個人情報(_P)" + +#~ msgid "_Open new chats in separate windows" +#~ msgstr "新しいチャットごとに別のウィンドウを開く(_O)" + +#~ msgid "Empathy has migrated butterfly logs" +#~ msgstr "Empathy は butterfly のログを移行しました" + +#~ msgid "Whether Empathy has migrated butterfly logs." +#~ msgstr "Empathy が butterfly のログを移行したかどうか。" + +#~ msgid "Socket type not supported" +#~ msgstr "サポートされていないソケットタイプです" + +#, fuzzy +#~| msgid "Empathy Accounts" +#~ msgid "My Web Accounts" +#~ msgstr "Empathy のアカウント" + +#, fuzzy +#~| msgid "Empathy Accounts" +#~ msgid "Launch My Web Accounts" +#~ msgstr "Empathy のアカウント" + +#, fuzzy +#~| msgid "_Edit" +#~ msgid "Edit %s" +#~ msgstr "編集(_E)" + +#~ msgid "Ca_ncel" +#~ msgstr "中止(_N)" + +#~ msgid "Ungrouped" +#~ msgstr "グループ無所属" + +#~ msgid "Favorite People" +#~ msgstr "お気に入りの人達" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "編集(_E)" + +#~ msgid "Select a contact" +#~ msgstr "連絡先の選択" + +#~ msgid "Contact ID:" +#~ msgstr "仲間の ID:" + +#~ msgid "C_hat" +#~ msgstr "チャット(_H)" + +#~ msgid "Send _Video" +#~ msgstr "映像の送信(_V)" + +#~ msgid "C_all" +#~ msgstr "呼び出す(_A)" + +#~ msgid "Set your presence and current status" +#~ msgstr "在席中にし現在の状態を設定する" + +#~ msgid "The selected contact cannot receive files." +#~ msgstr "選択した仲間はファイルを受信できません。" + +#~ msgid "The selected contact is offline." +#~ msgstr "選択した仲間はオフラインです。" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "変更を破棄して新しいアカウントを生成しようとしています。\n" +#~ "本当に継続しますか?" + +#, fuzzy +#~| msgid "Unknown" +#~ msgctxt "encoding video codec" +#~ msgid "Unknown" +#~ msgstr "不明" + +#, fuzzy +#~| msgid "Unknown" +#~ msgctxt "encoding audio codec" +#~ msgid "Unknown" +#~ msgstr "不明" + +#, fuzzy +#~| msgid "Unknown" +#~ msgctxt "decoding video codec" +#~ msgid "Unknown" +#~ msgstr "不明" + +#, fuzzy +#~| msgid "Unknown" +#~ msgctxt "decoding audio codec" +#~ msgid "Unknown" +#~ msgstr "不明" #~ msgid "All" #~ msgstr "すべて" @@ -5016,9 +5048,6 @@ msgstr "大文字小文字を区別して一致" #~ msgid "Set your own presence" #~ msgstr "あなたの在席情報をセットします" -#~ msgid "Show the accounts dialog" -#~ msgstr "アカウント・ダイアログを表示する" - #~ msgid "The error message was: %s" #~ msgstr "エラーメッセージ: %s" diff --git a/po/mk.po b/po/mk.po index d8518131..41157a3b 100644 --- a/po/mk.po +++ b/po/mk.po @@ -5,867 +5,2948 @@ msgid "" msgstr "" "Project-Id-Version: empathy.HEAD.mk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-26 14:55+0000\n" -"PO-Revision-Date: 2008-08-26 20:41+0200\n" -"Last-Translator: Jovan Naumovski \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2011-12-14 21:21+0000\n" +"PO-Revision-Date: 2011-12-24 16:54+0100\n" +"Last-Translator: Jovan N\n" "Language-Team: Macedonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KAider 0.1\n" -"Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n" +"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Empathy Instant Messenger" -msgstr "Empathy - инстант пораки" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "Разговарајте на Google Talk, Facebook, MSN и многу други сервиси" #: ../data/empathy.desktop.in.in.h:2 -msgid "Send and receive instant messages" -msgstr "Испраќај и примај инстант пораки" +#| msgid "Empathy Call" +msgid "Empathy" +msgstr "Empathy" + +#: ../data/empathy.desktop.in.in.h:3 +#| msgid "Empathy Instant Messenger" +msgid "Empathy Internet Messaging" +msgstr "Empathy - инстант пораки" + +#: ../data/empathy.desktop.in.in.h:4 +#| msgid "Client:" +msgid "IM Client" +msgstr "Клиент за инстант пораки" -#: ../data/empathy.schemas.in.h:1 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:1 msgid "Always open a separate chat window for new chats." msgstr "Секогаш отворај нов прозорец за новите разговори." -#: ../data/empathy.schemas.in.h:2 -msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." -msgstr "" -"Знак кој ќе се додава после прекарот кога ќе се користи довршување на прекари (со tab) во групен " -"разговор" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:2 +msgid "Camera device" +msgstr "Камера" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 +msgid "Camera position" +msgstr "Позиција на камера" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 +msgid "Character to add after nickname when using nick completion (tab) in group chat." +msgstr "Знак кој ќе се додава после прекарот кога ќе се користи довршување на прекари (со tab) во групен разговор" -#: ../data/empathy.schemas.in.h:3 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 msgid "Chat window theme" msgstr "Тема на прозорецот за разговор" -#: ../data/empathy.schemas.in.h:4 -msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)." -msgstr "" -"Листа разделена со запирка на јазици кои ќе се користат кај проверката на правопис (пр. en, fr, nl)." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +#| msgid "Chat window theme" +msgid "Chat window theme variant" +msgstr "Тема на прозорецот за разговор" -#: ../data/empathy.schemas.in.h:5 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +#| msgid "" +#| "Comma separated list of spell checker languages to use (e.g. en, fr, nl)." +msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +msgstr "Листа разделена со запирка на јазици кои ќе се користат кај проверката на правопис (пр. „en, fr, nl“)." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Compact contact list" msgstr "Компактна листа на контакти" -#: ../data/empathy.schemas.in.h:6 -msgid "Contact list sort criterium" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#| msgid "NetworkManager should be used" +msgid "Connection managers should be used" +msgstr "Треба да се користат менаџери на врски" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#| msgid "Contact list sort criterium" +msgid "Contact list sort criterion" msgstr "Критериум за сортирање на листата на контакти" -#: ../data/empathy.schemas.in.h:7 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +msgid "D-Bus object path of the last account selected to join a room." +msgstr "Патека на D-Bus објектот на последната сметка избрана за придружување во соба за разговор." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "Стандардна камера за користење при видео повици, пр. /dev/video0." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Default directory to select an avatar image from" msgstr "Стандарден директориум од кој ќе се избира слика за аватар" -#: ../data/empathy.schemas.in.h:8 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#| msgid "Enable sounds when _away" +msgid "Disable popup notifications when away" +msgstr "Овозможи скокачки известувања кога сум отсутен" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#| msgid "Enable sounds when _away" +msgid "Disable sounds when away" +msgstr "Овозможи звуци кога сум недостапен" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +msgid "Display incoming events in the status area" +msgstr "Прикажи ги дојдовните настани во површината за статуси" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +msgid "Display incoming events in the status area. If false, present them to the user immediately." +msgstr "Прикажи ги дојдовните настани во површината за статуси. Ако е false, прикажи им ги на корисникот директно." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +msgid "Echo cancellation support" +msgstr "Поддршка за отстранување на ехо" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +msgid "Empathy can publish the user's location" +msgstr "Empathy може да ја објави локацијата на корисникот" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy може да користи GPS за да ја погоди локацијата" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy може да користи мобилни мрежи за да ја погоди локацијата" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +msgid "Empathy can use the network to guess the location" +msgstr "Empathy може да ја користи мрежата за да ја погоди локацијата" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +msgid "Empathy default download folder" +msgstr "Стандардната папка за преземање на Empathy" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#| msgid "Empathy should auto-connect on startup" +msgid "Empathy should auto-away when idle" +msgstr "Empathy треба да се постави на „автоматски отсутен“ при мирување" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Empathy should auto-connect on startup" msgstr "Empathy треба да се поврзи автоматски при подигнување" -#: ../data/empathy.schemas.in.h:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#| msgid "Empathy should auto-connect on startup" +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy треба да ја намали точноста на локацијата" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "Empathy треба да го користи аватарот од контактот како икона за прозорецот на разговорот" -#: ../data/empathy.schemas.in.h:10 -msgid "Enable popup when contact is available" -msgstr "Овозможи скокачка порака кога контактот е достапен" - -#: ../data/empathy.schemas.in.h:11 -msgid "Enable sound when away" -msgstr "Овозможи звуци кога сум недостапен" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +msgid "Enable WebKit Developer Tools" +msgstr "Овозможи ги WebKit алатките" -#: ../data/empathy.schemas.in.h:12 -msgid "Enable sound when busy" -msgstr "Овозможи звуци кога сум зафатен" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +msgid "Enable popup notifications for new messages" +msgstr "Овозможи скокачки известувања за новите пораки" -#: ../data/empathy.schemas.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Enable spell checker" msgstr "Овозможи проверка на правопис" -#: ../data/empathy.schemas.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Hide main window" msgstr "Скриј го главниот прозорец" -#: ../data/empathy.schemas.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Hide the main window." msgstr "Скриј го главниот прозорец." -#: ../data/empathy.schemas.in.h:16 -msgid "NetworkManager should be used" -msgstr "NetworkManager треба да се користи" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +msgid "Last account selected in Join Room dialog" +msgstr "Последната сметка избрана во дијалог прозорецот за приклучување кон соба за разговор" -#: ../data/empathy.schemas.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Nick completed character" msgstr "Знак за довршување на прекар" -#: ../data/empathy.schemas.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Open new chats in separate windows" msgstr "Отворај ги разговорите во одделни прозорци" -#: ../data/empathy.schemas.in.h:19 -msgid "Salut account is created" -msgstr "Креирана е сметката за Salut" - -#: ../data/empathy.schemas.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +msgid "Path of the Adium theme to use" +msgstr "Патека на Adium темата која ќе се користи" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#| msgid "Whether to use the theme for chat rooms or not." +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "Делот од темата за Adium која ќе се користи, ако темата која се користи за разговорите е Adium." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#| msgid "_Play sound when messages arrive" +msgid "Play a sound for incoming messages" +msgstr "Пушти звук кога пристигнуваат пораки" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +msgid "Play a sound for new conversations" +msgstr "Пушти звук за новите разговори" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#| msgid "_Play sound when messages arrive" +msgid "Play a sound for outgoing messages" +msgstr "Пушти звук кога се испраќаат пораки" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#| msgid "_Play sound when messages arrive" +msgid "Play a sound when a contact logs in" +msgstr "Пушти звук кога се најавува некој контакт" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +msgid "Play a sound when a contact logs out" +msgstr "Пушти звук кога некој контакт се најавува" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#| msgid "_Play sound when messages arrive" +msgid "Play a sound when we log in" +msgstr "Пушти звук кога се најавувам" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#| msgid "_Play sound when messages arrive" +msgid "Play a sound when we log out" +msgstr "Пушти звук кога се одјавувам" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +msgid "Pop up notifications if the chat isn't focused" +msgstr "Покажи скокачки известувања ако разговорот не е фокусиран" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#| msgid "Display notifications when contacts come _online" +msgid "Pop up notifications when a contact logs in" +msgstr "Прикажи известувања кога контактите се најавуваат" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#| msgid "Display notifications when contacts come _online" +msgid "Pop up notifications when a contact logs out" +msgstr "Прикажи известувања кога контактите се одјавуваат" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +msgid "Position the camera preview should be during a call." +msgstr "Позиција на која прегледот на камерата треба да биде при повик." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#| msgid "Show co_mpact contact list" +msgid "Show Balance in contact list" +msgstr "Покажи го кредитот во листата на контакти" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Show avatars" msgstr "Покажи аватари" -#: ../data/empathy.schemas.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#| msgid "_Show Contact List" +msgid "Show contact list in rooms" +msgstr "Покажи листа на контакти во собите" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Show hint about closing the main window" msgstr "Покажи совет за затворањето на главниот прозорец" -#: ../data/empathy.schemas.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Show offline contacts" msgstr "Покажи ги офлајн контактите" -#: ../data/empathy.schemas.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +msgid "Show protocols" +msgstr "Покажи ги протоколите" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Spell checking languages" msgstr "Јазици за проверка на правопис" -#: ../data/empathy.schemas.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +msgid "The default folder to save file transfers in." +msgstr "Стандардната папка во која ќе се зачувуваат преносените датотеки." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "The last directory that an avatar image was chosen from." msgstr "последниот директориум од кој се избираше слика за аватар." -#: ../data/empathy.schemas.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +msgid "The position for the chat window side pane" +msgstr "Позицијата за прозорецот за разговор на страничната површина" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "Зачуваната позиција (во пиксели) на прозорецот за разговор на страничната површина." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "The theme that is used to display the conversation in chat windows." msgstr "Темата која се користи за прикажување на разговорот во прозорците за разговор." -#: ../data/empathy.schemas.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#| msgid "The theme that is used to display the conversation in chat windows." +msgid "The theme variant that is used to display the conversation in chat windows." +msgstr "Темата која се користи за прикажување на разговорот во прозорците за разговор." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "Користи графички смешковци" -#: ../data/empathy.schemas.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Use notification sounds" msgstr "Користи звуци за известување" -#: ../data/empathy.schemas.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use theme for chat rooms" msgstr "Користи тема за собите за разговор" -#: ../data/empathy.schemas.in.h:29 -msgid "" -"Whether or not Empathy should automatically log in to your accounts on " -"startup." -msgstr "Дали Empathy автоматски да ги најавува Вашите сметки при подигнување." - -#: ../data/empathy.schemas.in.h:30 -msgid "" -"Whether or not Empathy should use the avatar of the contact as the chat " -"window icon." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "Дали Empaty ќе ја објавува локацијата на корисникот на неговите контакти." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#| msgid "" +#| "Whether or not Empathy should use the avatar of the contact as the chat " +#| "window icon." +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Дали Empathy смее да користи GPS за да ја погоди локацијата." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#| msgid "" +#| "Whether or not Empathy should use the avatar of the contact as the chat " +#| "window icon." +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "Дали Empathy смее да користи безжична мрежа за да ја погоди локацијата." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#| msgid "" +#| "Whether or not Empathy should use the avatar of the contact as the chat " +#| "window icon." +msgid "Whether Empathy can use the network to guess the location." +msgstr "Дали Empathy смее да ја користи мрежата за да ја погоди локацијата." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#| msgid "" +#| "Whether or not Empathy should automatically log in to your accounts on " +#| "startup." +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "Дали Empathy смее автоматски да се најавува на Вашите сметки при стартување." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#| msgid "" +#| "Whether or not Empathy should automatically log in to your accounts on " +#| "startup." +msgid "Whether Empathy should go into away mode automatically if the user is idle." +msgstr "Дали Empathy треба да оди во режим „отсутен“ кога корисникот е неактивен." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +msgid "Whether Empathy should reduce the location's accuracy for privacy reasons." +msgstr "Дали Empaty ќе ја намали точноста на локацијата поради поголема приватност." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#| msgid "" +#| "Whether or not Empathy should use the avatar of the contact as the chat " +#| "window icon." +msgid "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "Дали Empathy да го користи аватарот на контактот како икона на прозорецот." -#: ../data/empathy.schemas.in.h:31 -msgid "Whether or not the Salut account has been created on the first Empathy run." -msgstr "Дали сметката на Salut е креирана на првото пуштање на Empathy." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled." +msgstr "Дали ќе се овозможат WebKit алатките, како Web Inspector, за развивачи на софтвер." -#: ../data/empathy.schemas.in.h:32 -msgid "" -"Whether or not the network manager should be used to automatically " -"disconnect/reconnect." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#| msgid "" +#| "Whether or not the network manager should be used to automatically " +#| "disconnect/reconnect." +msgid "Whether connectivity managers should be used to automatically disconnect/reconnect." msgstr "Дали да се користи менаџерот на мрежи за авоматско исклучување/поврзување." -#: ../data/empathy.schemas.in.h:33 -msgid "" -"Whether or not to check words typed against the languages you want to check " -"with." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#| msgid "" +#| "Whether or not 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 "Дали да се проверуваат напишаните зборови со проверка за правопис." -#: ../data/empathy.schemas.in.h:34 -msgid "Whether or not to convert smileys into graphical images in conversations." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#| msgid "" +#| "Whether or not to convert smileys into graphical images in conversations." +msgid "Whether to convert smileys into graphical images in conversations." msgstr "Дали да се конвертираат смешковците во графички слики во разговорите." -#: ../data/empathy.schemas.in.h:35 -msgid "Whether or not to play a sound when messages arrive." -msgstr "Дали да се пушта звук кога пристигнува порака." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "Дали ќе се овозможи филтерот за отстранување на ехо на Pulseaudio." -#: ../data/empathy.schemas.in.h:36 -msgid "Whether or not to play sounds when away." -msgstr "Дали да се пуштаат звуци кога сте недостапни." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "Дали да се пушта звук за известување на најава на контакт на мрежата." -#: ../data/empathy.schemas.in.h:37 -msgid "Whether or not to play sounds when busy." -msgstr "Дали да се пуштаат звуци кога сте зафатени." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +msgid "Whether to play a sound to notify of contacts logging out of the network." +msgstr "Дали да се пушти звук за известување на одјавување на контакт од мрежата." -#: ../data/empathy.schemas.in.h:38 -msgid "Whether or not to show a popup when a contact becomes available." -msgstr "Дали да се покажува скокачко известување кога некој контакт е достапен." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#| msgid "Whether or not to play a sound when messages arrive." +msgid "Whether to play a sound to notify of events." +msgstr "Дали да се пушта звук за да известува за настаните." -#: ../data/empathy.schemas.in.h:39 -msgid "" -"Whether or not to show avatars for contacts in the contact list and chat " -"windows." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#| msgid "Whether or not to play a sound when messages arrive." +msgid "Whether to play a sound to notify of incoming messages." +msgstr "Дали да се пушта звук кога пристигнува порака." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +msgid "Whether to play a sound to notify of new conversations." +msgstr "Дали да се пушти звук за известување за нови разговори." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#| msgid "Whether or not to play a sound when messages arrive." +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "Дали да се пушта звук кога се испраќа порака." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#| msgid "Whether or not to play a sound when messages arrive." +msgid "Whether to play a sound when logging into a network." +msgstr "Дали да се пушта звук кога се најавувам на некоја мрежа." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#| msgid "Whether or not to play a sound when messages arrive." +msgid "Whether to play a sound when logging out of a network." +msgstr "Дали да се пушта звук кога се одјавувам од некоја мрежа." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#| msgid "Whether or not to play sounds when away." +msgid "Whether to play sound notifications when away or busy." +msgstr "Дали да се пуштаат звуци кога сте недостапни или зафатени." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#| msgid "Whether or not to show a popup when a contact becomes available." +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "Дали да се покажува скокачко известување кога некој контакт оди офлајн." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#| msgid "Whether or not to show a popup when a contact becomes available." +msgid "Whether to show a popup notification when a contact goes online." +msgstr "Дали да се покажува скокачко известување кога некој контакт оди онлајн." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused." +msgstr "Дали да се покаже скокачко известување при добивање на нова порака, дури иако разговорот е веќе отворен, но не е фокусиран." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#| msgid "Whether or not to show a popup when a contact becomes available." +msgid "Whether to show a popup notification when receiving a new message." +msgstr "Дали да се покажува скокачко известување при примање на нова порака." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#| msgid "" +#| "Whether or not to show contacts that are offline in the contact list." +msgid "Whether to show account balances in the contact list." +msgstr "Дали да се покажуваат кредитите во листата на контакти." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#| msgid "" +#| "Whether or not to show avatars for contacts in the contact list and chat " +#| "windows." +msgid "Whether to show avatars for contacts in the contact list and chat windows." msgstr "Дали да се прикажуваат аватари во листата со контакти и прозорците за разговор." -#: ../data/empathy.schemas.in.h:40 -msgid "Whether or not to show contacts that are offline in the contact list." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#| msgid "" +#| "Whether or not to show contacts that are offline in the contact list." +msgid "Whether to show contacts that are offline in the contact list." msgstr "Дали да се прикажуваат контактите кои се офлајн во листата на контакти." -#: ../data/empathy.schemas.in.h:41 -msgid "" -"Whether or not to show the message dialog about closing the main window with " -"the 'x' button in the title bar." -msgstr "" -"Дали да се прикажува дијалог прозорец со порака за затворањето на прозорецот со копчето „x“, на " -"лентата со наслов." - -#: ../data/empathy.schemas.in.h:42 -msgid "Whether to show the contact list in compact mode or not." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#| msgid "Whether or not to play sounds when away." +msgid "Whether to show popup notifications when away or busy." +msgstr "Дали да се покажуваат скокачки известувања кога сте отсутни или зафатени." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#| msgid "" +#| "Whether or not to show avatars for contacts in the contact list and chat " +#| "windows." +msgid "Whether to show protocols for contacts in the contact list." +msgstr "Дали да се прикажуваат протоколите за контактите во листата на контакти." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#| msgid "Whether to show the contact list in compact mode or not." +msgid "Whether to show the contact list in chat rooms." +msgstr "Дали да се покажува листата на контакти во собите за разговор." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#| msgid "Whether to show the contact list in compact mode or not." +msgid "Whether to show the contact list in compact mode." msgstr "Дали да се покажува листа на контакти во компактен режим или не." -#: ../data/empathy.schemas.in.h:43 -msgid "Whether to use the theme for chat rooms or not." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#| msgid "" +#| "Whether or not to show the message dialog about closing the main window " +#| "with the 'x' button in the title bar." +msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar." +msgstr "Дали да се прикажува дијалог прозорец со порака за затворањето на прозорецот со копчето „x“, на лентата со наслов." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#| msgid "Whether to use the theme for chat rooms or not." +msgid "Whether to use the theme for chat rooms." msgstr "Дали да се користи тема во собите за разговор." -#: ../data/empathy.schemas.in.h:44 -msgid "" -"Which criterium to use when sorting the contact list. Default is to use sort " -"by the contact's name with the value \"name\". A value of \"state\" will " -"sort the contact list by state." -msgstr "" -"Кој критериум да се користи во подредувањето на листата на контакти. Стандардниот избор е да се " -"сортираат по име на контактот со вредноста „име“. Вредноста „состојба“ ќе ја сортира листата по " -"состојбата на контактите." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#| msgid "" +#| "Which criterium to use when sorting the contact list. Default is to use " +#| "sort by the contact's name with the value \"name\". A value of \"state\" " +#| "will sort the contact list by state." +msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state." +msgstr "Кој критериум да се користи во подредувањето на листата на контакти. Стандардниот избор е да се сортираат по име на контактот со вредноста „име“. Вредноста „состојба“ ќе ја сортира листата по состојбата на контактите." + +#: ../data/empathy-accounts.desktop.in.in.h:1 +msgid "Manage Messaging and VoIP accounts" +msgstr "Управувај со сметките за инстант пораки и VoIP" + +#. Tweak the dialog +#: ../data/empathy-accounts.desktop.in.in.h:2 +#: ../src/empathy-accounts-dialog.c:2312 +msgid "Messaging and VoIP Accounts" +msgstr "Сметки за инстант пораки и VoIP" + +#: ../libempathy/empathy-ft-handler.c:736 +#| msgid "No error specified" +msgid "No reason was specified" +msgstr "Не беше одредена причина" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Беше побарана промена во состојбата" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Го прекинавте преносот на датотека" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Другиот учесник го прекина преносот на датотека" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Грешка при обидот за пренос на датотека" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Другиот учесник не може да ја пренеси датотеката" + +#: ../libempathy/empathy-ft-handler.c:754 +#: ../libempathy/empathy-utils.c:311 +#| msgid "Unknown error" +msgid "Unknown reason" +msgstr "Непозната причина" + +#: ../libempathy/empathy-ft-handler.c:917 +msgid "File transfer completed, but the file was corrupted" +msgstr "Преносот на датотеката заврши, но датотеката е оштетена" + +#: ../libempathy/empathy-ft-handler.c:1203 +msgid "File transfer not supported by remote contact" +msgstr "Преносот на датотеки не е поддржан од оддалечениот контакт" + +#: ../libempathy/empathy-ft-handler.c:1259 +msgid "The selected file is not a regular file" +msgstr "Избраната датотека не е регуларна датотека" + +#: ../libempathy/empathy-ft-handler.c:1268 +msgid "The selected file is empty" +msgstr "Избраната датотека е празна" + +#: ../libempathy/empathy-message.c:415 +#: ../src/empathy-call-observer.c:131 +#, c-format +#| msgid "Incoming call from %s" +msgid "Missed call from %s" +msgstr "Пропуштен повик од %s" -#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:248 -msgid "People nearby" -msgstr "Луѓе во близина" +#. Translators: this is an outgoing call, e.g. 'Called Alice' +#: ../libempathy/empathy-message.c:419 +#, c-format +msgid "Called %s" +msgstr "Го/ја повикав %s" -#: ../libempathy/empathy-utils.c:345 +#: ../libempathy/empathy-message.c:422 +#, c-format +#| msgid "Incoming call from %s" +msgid "Call from %s" +msgstr "Повик од %s" + +#: ../libempathy/empathy-utils.c:231 msgid "Available" msgstr "Достапен" -#: ../libempathy/empathy-utils.c:347 +#: ../libempathy/empathy-utils.c:233 msgid "Busy" msgstr "Зафатен" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:236 msgid "Away" msgstr "Отсутен" -#: ../libempathy/empathy-utils.c:352 -msgid "Hidden" -msgstr "Скриен" +#: ../libempathy/empathy-utils.c:238 +#| msgid "Invite" +msgid "Invisible" +msgstr "Невидлив" -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:240 msgid "Offline" msgstr "Офлајн" -#: ../libempathy-gtk/empathy-account-chooser.c:337 -msgid "All" -msgstr "Сите" +#. translators: presence type is unknown +#: ../libempathy/empathy-utils.c:243 +#| msgid "unknown" +msgctxt "presence" +msgid "Unknown" +msgstr "Непознат" + +#: ../libempathy/empathy-utils.c:283 +#| msgid "No error specified" +msgid "No reason specified" +msgstr "Не е одредена причина" + +#: ../libempathy/empathy-utils.c:285 +#: ../libempathy/empathy-utils.c:341 +msgid "Status is set to offline" +msgstr "Статусот е поставен на „офлајн“" + +#: ../libempathy/empathy-utils.c:287 +#: ../libempathy/empathy-utils.c:321 +#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 +msgid "Network error" +msgstr "Грешка во мрежата" + +#: ../libempathy/empathy-utils.c:289 +#: ../libempathy/empathy-utils.c:323 +msgid "Authentication failed" +msgstr "Автентикацијата не успеа" + +#: ../libempathy/empathy-utils.c:291 +#: ../libempathy/empathy-utils.c:325 +msgid "Encryption error" +msgstr "Грешка во енкрипцијата" + +#: ../libempathy/empathy-utils.c:293 +msgid "Name in use" +msgstr "Име во употреба" + +#: ../libempathy/empathy-utils.c:295 +#: ../libempathy/empathy-utils.c:327 +msgid "Certificate not provided" +msgstr "Не е обезбеден сертификат" + +#: ../libempathy/empathy-utils.c:297 +#: ../libempathy/empathy-utils.c:329 +msgid "Certificate untrusted" +msgstr "Сертификатот не е доверлив" + +#: ../libempathy/empathy-utils.c:299 +#: ../libempathy/empathy-utils.c:331 +msgid "Certificate expired" +msgstr "Сертификатот истече" + +#: ../libempathy/empathy-utils.c:301 +#: ../libempathy/empathy-utils.c:333 +msgid "Certificate not activated" +msgstr "Сертификатот не е активиран" + +#: ../libempathy/empathy-utils.c:303 +#: ../libempathy/empathy-utils.c:335 +msgid "Certificate hostname mismatch" +msgstr "Несовпаѓање на името на хостот на сертификатот" + +#: ../libempathy/empathy-utils.c:305 +#: ../libempathy/empathy-utils.c:337 +msgid "Certificate fingerprint mismatch" +msgstr "Несовпаѓање на отпечатокот на сертификатот" + +#: ../libempathy/empathy-utils.c:307 +#: ../libempathy/empathy-utils.c:339 +msgid "Certificate self-signed" +msgstr "Сертификатот е самопотпишан" + +#: ../libempathy/empathy-utils.c:309 +msgid "Certificate error" +msgstr "Грешка на сертификатот" + +#: ../libempathy/empathy-utils.c:343 +msgid "Encryption is not available" +msgstr "Енкрипцијата не е достапна" + +#: ../libempathy/empathy-utils.c:345 +#| msgid "Certificate not activated" +msgid "Certificate is invalid" +msgstr "Сертификатот е невалиден" + +#: ../libempathy/empathy-utils.c:347 +msgid "Connection has been refused" +msgstr "Врската беше одбиена" + +#: ../libempathy/empathy-utils.c:349 +msgid "Connection can't be established" +msgstr "Врксата не може да се воспостави" + +#: ../libempathy/empathy-utils.c:351 +msgid "Connection has been lost" +msgstr "Врската беше загубена" + +#: ../libempathy/empathy-utils.c:353 +msgid "This resource is already connected to the server" +msgstr "Ресурсот е веќе поврзан на серверот" + +#: ../libempathy/empathy-utils.c:355 +msgid "Connection has been replaced by a new connection using the same resource" +msgstr "Врската беше заменета со понова врска со користење на истиот ресурс" + +#: ../libempathy/empathy-utils.c:358 +msgid "The account already exists on the server" +msgstr "Сметката веќе постои на серверот" + +#: ../libempathy/empathy-utils.c:360 +msgid "Server is currently too busy to handle the connection" +msgstr "Серверот е моментално презафатен за да се справи со врската" + +#: ../libempathy/empathy-utils.c:362 +#| msgid "Certificate not provided" +msgid "Certificate has been revoked" +msgstr "Сертификатот е повлечен" + +#: ../libempathy/empathy-utils.c:364 +msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak" +msgstr "Сертификатот користи несигурен алгоритам за шифрирање или е криптографски слаб" + +#: ../libempathy/empathy-utils.c:367 +msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library" +msgstr "Должината на сертификатот на серверот или длабочината на веригата на сертификати ја надминува големината ограничена од библиотеката за криптирање" + +#: ../libempathy/empathy-utils.c:371 +msgid "Your software is too old" +msgstr "Вашиот софтвер е стар" + +#: ../libempathy/empathy-utils.c:530 +#| msgid "People nearby" +msgid "People Nearby" +msgstr "Луѓе во близина" -#: ../libempathy-gtk/empathy-account-widget.c:302 -#: ../libempathy-gtk/empathy-account-widget.c:347 +#: ../libempathy/empathy-utils.c:535 +#| msgid "Use _Yahoo Japan" +msgid "Yahoo! Japan" +msgstr "Yahoo! Japan" + +#: ../libempathy/empathy-utils.c:564 +msgid "Google Talk" +msgstr "Google Talk" + +#: ../libempathy/empathy-utils.c:565 +msgid "Facebook Chat" +msgstr "Facebook Chat" + +#: ../libempathy/empathy-time.c:88 +#, c-format +msgid "%d second ago" +msgid_plural "%d seconds ago" +msgstr[0] "Пред %d секунда" +msgstr[1] "Пред %d секунди" + +#: ../libempathy/empathy-time.c:93 +#, c-format +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "Пред %d минута" +msgstr[1] "Пред %d минути" + +#: ../libempathy/empathy-time.c:98 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "Пред %d час" +msgstr[1] "Пред %d часа" + +#: ../libempathy/empathy-time.c:103 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "Пред %d ден" +msgstr[1] "Пред %d дена" + +#: ../libempathy/empathy-time.c:108 +#, c-format +msgid "%d week ago" +msgid_plural "%d weeks ago" +msgstr[0] "Пред %d седмица" +msgstr[1] "Пред %d седмици" + +#: ../libempathy/empathy-time.c:113 +#, c-format +msgid "%d month ago" +msgid_plural "%d months ago" +msgstr[0] "Пред %d месец" +msgstr[1] "Пред %d месеци" + +#: ../libempathy/empathy-time.c:136 +msgid "in the future" +msgstr "во иднината" + +#: ../libempathy-gtk/empathy-account-chooser.c:688 +#| msgid "Accounts" +msgid "All accounts" +msgstr "Сите сметки" + +#: ../libempathy-gtk/empathy-account-widget.c:694 +#: ../src/empathy-import-widget.c:321 +msgid "Account" +msgstr "Сметка" + +#: ../libempathy-gtk/empathy-account-widget.c:695 +#| msgid "Password:" +msgid "Password" +msgstr "Лозинка" + +#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:507 +msgid "Server" +msgstr "Сервер" + +#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:522 +msgid "Port" +msgstr "Порта" + +#: ../libempathy-gtk/empathy-account-widget.c:776 +#: ../libempathy-gtk/empathy-account-widget.c:828 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1 -msgid "Advanced" -msgstr "Напредно" - -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2 -msgid "Forget password and clear the entry." -msgstr "Заборави ја лозинката и исчисти го полето." - -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget.c:1182 +#| msgid "Accounts" +msgid "My Web Accounts" +msgstr "Моите веб сметки" + +#: ../libempathy-gtk/empathy-account-widget.c:1199 +#, c-format +msgid "The account %s is edited via %s." +msgstr "Сметката %s е уредувана со %s." + +#: ../libempathy-gtk/empathy-account-widget.c:1205 +#, c-format +msgid "The account %s cannot be edited in Empathy." +msgstr "Сметката %s не може да се уредува со Empathy." + +#: ../libempathy-gtk/empathy-account-widget.c:1224 +msgid "Launch My Web Accounts" +msgstr "Пушти ги моите веб сметки" + +#. general handler +#: ../libempathy-gtk/empathy-account-widget.c:1232 +#, c-format +#| msgid "_Edit" +msgid "Edit %s" +msgstr "Уреди го %s" + +#: ../libempathy-gtk/empathy-account-widget.c:1582 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#| msgid "_Username:" +msgid "Username:" +msgstr "Корисничко име:" + +#: ../libempathy-gtk/empathy-account-widget.c:1900 +msgid "A_pply" +msgstr "П_римени" + +#: ../libempathy-gtk/empathy-account-widget.c:1930 +msgid "L_og in" +msgstr "Н_ајави се" + +#: ../libempathy-gtk/empathy-account-widget.c:2004 +msgid "This account already exists on the server" +msgstr "Оваа сметка веќе постои на серверот" + +#: ../libempathy-gtk/empathy-account-widget.c:2007 +#| msgid "I already have an account I want to use" +msgid "Create a new account on the server" +msgstr "Креирај нова сметка на серверот" + +#: ../libempathy-gtk/empathy-account-widget.c:2201 +msgid "Ca_ncel" +msgstr "Пр_екини" + +#. To translators: The first parameter is the login id and the +#. * second one is the network. The resulting string will be something +#. * like: "MyUserName on freenode". +#. * You should reverse the order of these arguments if the +#. * server should come before the login id in your locale. +#: ../libempathy-gtk/empathy-account-widget.c:2479 +#, c-format +msgid "%1$s on %2$s" +msgstr "%1$s на %2$s" + +#. To translators: The parameter is the protocol name. The resulting +#. * string will be something like: "Jabber Account" +#: ../libempathy-gtk/empathy-account-widget.c:2505 +#, c-format +#| msgid "Account" +msgid "%s Account" +msgstr "Сметка за %s" + +#: ../libempathy-gtk/empathy-account-widget.c:2509 +#| msgid "New %s account" +msgid "New account" +msgstr "Нова сметка" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 +msgid "Example: MyScreenName" +msgstr "Пример: MyScreenName" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +#| msgid "Advanced" +msgid "Advanced" +msgstr "Напредно" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "Pass_word:" msgstr "Лоз_инка:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +#| msgid "Password:" +msgid "Remember Password" +msgstr "Запамти ја лозинката" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "Запамти ја лозинката" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 msgid "Screen _Name:" msgstr "_Име за приказ:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 +msgid "What is your AIM password?" +msgstr "Која е Вашата лозинка за AIM?" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 +msgid "What is your AIM screen name?" +msgstr "Кое е вашето корисничко име за AIM?" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "_Port:" msgstr "_Порта:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10 -#: ../src/empathy-new-chatroom-dialog.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 msgid "_Server:" msgstr "_Сервер:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Example: username" +msgstr "Пример: username" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 msgid "Login I_D:" msgstr "I_D за најава:" -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3 -msgid "ICQ _UIN:" -msgstr "ICQ _UIN:" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +msgid "What is your GroupWise User ID?" +msgstr "Кое е Вашето корисничко ID за GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6 -msgid "_Charset:" -msgstr "Множество на _знаци:" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +msgid "What is your GroupWise password?" +msgstr "Која е Вашата лозинка за GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-irc.c:245 -msgid "New Network" -msgstr "Нова мрежа" +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +msgid "Example: 123456789" +msgstr "Пример: 123456789" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1 -msgid "Network" -msgstr "Мрежа" +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +#| msgid "Charset:" +msgid "Ch_aracter set:" +msgstr "Множество _знаци:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2 -msgid "Servers" -msgstr "Сервери" +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +msgid "ICQ _UIN:" +msgstr "ICQ _UIN:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3 -msgid "Charset:" +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +msgid "What is your ICQ UIN?" +msgstr "Кое е Вашето ICQ UIN?" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +msgid "What is your ICQ password?" +msgstr "Која е Вашата лозинка за ICQ?" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:206 +#: ../libempathy-gtk/empathy-account-widget-sip.c:239 +#| msgid "_About" +msgid "Auto" +msgstr "Автоматски" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:209 +msgid "UDP" +msgstr "UDP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:212 +msgid "TCP" +msgstr "TCP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:215 +msgid "TLS" +msgstr "TLS" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 +#| msgid "Western" +msgid "Register" +msgstr "Register" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:249 +msgid "Options" +msgstr "Опции" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:252 +msgid "None" +msgstr "Ништо" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +#| msgid "Charset:" +msgid "Character set:" msgstr "Множество знаци:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4 -msgid "Create a new IRC network" -msgstr "Креирај нова IRC мрежа" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password." +msgstr "За повеќето IRC сервери не треба лозинка, па ако не сте сигурни не внесувајте." -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5 -msgid "Edit the selected IRC network" -msgstr "Уреди ја избраната IRC мрежа" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 msgid "Network" msgstr "Мрежа" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "Network:" msgstr "Мрежа:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "Прекар:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Password:" msgstr "Лозинка:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 msgid "Quit message:" msgstr "Порака при напуштање:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 msgid "Real name:" msgstr "Вистинско име:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12 -msgid "Remove the selected IRC network" -msgstr "Отстрани ја избраната IRC мрежа" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 +#| msgid "Server" +msgid "Servers" +msgstr "Сервери" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 +msgid "What is your IRC nickname?" +msgstr "Кое е Вашиот прекар за IRC?" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "Which IRC network?" +msgstr "Која IRC мрежа?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "Example: user@gmail.com" +msgstr "Пример: user@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 +msgid "Example: user@jabber.org" +msgstr "Пример: user@jabber.org" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 +#| msgid "_Encryption required (TLS/SSL)" +msgid "Encr_yption required (TLS/SSL)" +msgstr "Потребна е енк_рипција (TLS/SSL)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 +#| msgid "_Ignore SSL certificate errors" +msgid "I_gnore SSL certificate errors" +msgstr "_Игнорирај ги грешките на SSL сертификатите" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2 -msgid "Override server settings" -msgstr "Отфрли ги поставувањата на серверот" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 +#| msgid "Override server settings" +msgid "Override server settings" +msgstr "Отфрли ги поставувањата на серверот" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6 -msgid "Pri_ority:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +#| msgid "Pri_ority:" +msgid "Priori_ty:" msgstr "При_оритет:" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 msgid "Reso_urce:" msgstr "Рес_урс:" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8 +#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +msgid "" +"This is your username, not your normal Facebook login.\n" +"If you are facebook.com/badger, enter badger.\n" +"Use this page to choose a Facebook username if you don't have one." +msgstr "" +"Ова е вашето корисничко име, а не името кое го користите за најава на Facebook.\n" +"Ако тоа ви е на пример facebook.com/badger, внесете badger.\n" +"Користете ја оваа страница за да изберите корисничко име за Facebook, ако веќе немате." + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 msgid "Use old SS_L" msgstr "Користи стар SS_L" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9 -msgid "_Encryption required (TLS/SSL)" -msgstr "Потребна е _енкрипција (TLS/SSL)" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "What is your Facebook password?" +msgstr "Која Ви е лозинката за Facebook?" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10 -msgid "_Ignore SSL certificate errors" -msgstr "_Игнорирај ги грешките на SSL сертификатите" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "What is your Facebook username?" +msgstr "Кое е Вашето корисничко име за Facebook?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +msgid "What is your Google ID?" +msgstr "Кое е Вашето Google ID?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +msgid "What is your Google password?" +msgstr "Која Ви е лозинката за Google?" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2 -msgid "_Email:" -msgstr "_Е-пошта:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "What is your Jabber ID?" +msgstr "Кое е Вашето Jabber ID?" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3 -msgid "_First Name: " +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +msgid "What is your Jabber password?" +msgstr "Која е Вашата лозинка за Jabber?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +msgid "What is your desired Jabber ID?" +msgstr "Кое ID за Jabber го сакате?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +msgid "What is your desired Jabber password?" +msgstr "Која лозинка за Jabber ја посакувате?" + +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +msgid "Example: user@hotmail.com" +msgstr "Пример: user@hotmail.com" + +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +msgid "What is your Windows Live ID?" +msgstr "Кое е Вашето Windows Live ID?" + +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +msgid "What is your Windows Live password?" +msgstr "Која е Вашата лозинка за Windows Live?" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "E-_mail address:" +msgstr "Адреса за е-_пошта:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +#| msgid "Nickname:" +msgid "Nic_kname:" +msgstr "_Прекар:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +#| msgid "_First Name: " +msgid "_First Name:" msgstr "_Име:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Jabber ID:" msgstr "_Jabber ID:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 msgid "_Last Name:" msgstr "_Презиме:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6 -#: ../src/empathy-chatrooms-window.glade.h:8 -msgid "_Nickname:" -msgstr "_Прекар:" - -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 msgid "_Published Name:" msgstr "_Објавено име:" -#. look up the DNS SRV record at the service's domain for the host name of a STUN server. -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3 -msgid "Discover STUN" -msgstr "Откриј STUN" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +msgid "Example: user@my.sip.server" +msgstr "Пример: user@my.sip.server" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 +#| msgid "Authentication failed" +msgid "Authentication username:" +msgstr "Корисничко име за автентикација:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#| msgid "Discover STUN" +msgid "Discover Binding" +msgstr "Откриј поврзување" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 +msgid "Discover the STUN server automatically" +msgstr "Откриј го STUN серверот автоматски" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 +msgid "Ignore TLS Errors" +msgstr "Игнорирај ги грешките во TLS" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 +msgid "Interval (seconds)" +msgstr "Интервал (секунди)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +msgid "Keep-Alive Options" +msgstr "Опции за зачувување на врската" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 +msgid "Loose Routing" +msgstr "Лабаво рутирање" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +msgid "Mechanism:" +msgstr "Механизам:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 +msgid "Miscellaneous Options" +msgstr "Разни опции" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 +msgid "NAT Traversal Options" +msgstr "Опции за NAT" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 +#| msgid "_Port:" +msgid "Port:" +msgstr "Порта:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 +msgid "Proxy Options" +msgstr "Опции за прокси" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 msgid "STUN Server:" msgstr "STUN сервер:" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7 -msgid "STUN port:" -msgstr "STUN порта:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +#| msgid "_Server:" +msgid "Server:" +msgstr "Сервер:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 +#| msgid "STUN port:" +msgid "Transport:" +msgstr "Транспорт:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +msgid "Use this account to call _landlines and mobile phones" +msgstr "Користете ја оваа сметка за повици кон _фиксни и мобилни телефони" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +msgid "What is your SIP account password?" +msgstr "Која е Вашата лозинка за сметата за SIP?" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP login ID?" +msgstr "Кое е Вашето SIP ID за најава?" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "_Username:" msgstr "_Корисничко име:" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4 -msgid "Use _Yahoo Japan" -msgstr "Користи _Yahoo Japan" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#| msgid "_Ignore conference and chatroom invitations" +msgid "I_gnore conference and chat room invitations" +msgstr "_Игнорирај ги поканите за соби за разговор и конференциски повици" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +msgid "What is your Yahoo! ID?" +msgstr "Кое е Вашето „Yahoo!“ ID?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5 -msgid "Yahoo I_D:" -msgstr "Yahoo I_D:" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "What is your Yahoo! password?" +msgstr "Која е Вашата лозинка за „Yahoo!“?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7 -msgid "_Ignore conference and chatroom invitations" -msgstr "_Игнорирај ги поканите за соби за разговор" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +#| msgid "Yahoo I_D:" +msgid "Yahoo! I_D:" +msgstr "Yahoo! I_D:" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "_Room List locale:" msgstr "Локале на листа на _соби:" -#: ../libempathy-gtk/empathy-avatar-chooser.c:457 +#: ../libempathy-gtk/empathy-avatar-chooser.c:471 +#: ../libempathy-gtk/empathy-avatar-chooser.c:556 +msgid "Couldn't convert image" +msgstr "Не можев да ја претворам сликата" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:472 +msgid "None of the accepted image formats are supported on your system" +msgstr "Ниеден од прифатените формати за сликите не е поддржан на Вашиот систем" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:819 +msgid "Couldn't save picture to file" +msgstr "Не можев да ја зачувам сликата во датотека" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:939 msgid "Select Your Avatar Image" msgstr "Одберете ја Вашата слика за аватар" -#: ../libempathy-gtk/empathy-avatar-chooser.c:460 +#: ../libempathy-gtk/empathy-avatar-chooser.c:947 +msgid "Take a picture..." +msgstr "Сликајте се..." + +#: ../libempathy-gtk/empathy-avatar-chooser.c:960 msgid "No Image" msgstr "Нема слика" -#: ../libempathy-gtk/empathy-avatar-chooser.c:520 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1017 msgid "Images" msgstr "Слики" -#: ../libempathy-gtk/empathy-avatar-chooser.c:524 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1021 msgid "All Files" msgstr "Сите датотеки" -#: ../libempathy-gtk/empathy-avatar-image.c:294 +#: ../libempathy-gtk/empathy-avatar-image.c:322 msgid "Click to enlarge" msgstr "Кликнете за зголемување" -#: ../libempathy-gtk/empathy-chat.c:497 +#: ../libempathy-gtk/empathy-call-utils.c:44 +#: ../libempathy-gtk/empathy-call-utils.c:62 +msgid "There was an error starting the call" +msgstr "Се појави грешка при стартувањето на повикот" + +#: ../libempathy-gtk/empathy-call-utils.c:51 +msgid "The specified contact doesn't support calls" +msgstr "Назначениот контакт не поддржува повици" + +#: ../libempathy-gtk/empathy-call-utils.c:53 +msgid "The specified contact is offline" +msgstr "Назначениот контакт е офлајн" + +#: ../libempathy-gtk/empathy-call-utils.c:55 +msgid "The specified contact is not valid" +msgstr "Назначениот контакт е невалиден" + +#: ../libempathy-gtk/empathy-call-utils.c:57 +msgid "Emergency calls are not supported on this protocol" +msgstr "Овој протокол не поддржува итни повици" + +#: ../libempathy-gtk/empathy-call-utils.c:59 +msgid "You don't have enough credit in order to place this call" +msgstr "Немате доволно кредит за да го направите овој повик" + +#: ../libempathy-gtk/empathy-chat.c:705 +msgid "Failed to open private chat" +msgstr "Не успеав да отворам приватен разговор" + +#: ../libempathy-gtk/empathy-chat.c:763 +msgid "Topic not supported on this conversation" +msgstr "Овој разговор не поддржува наслови" + +#: ../libempathy-gtk/empathy-chat.c:769 +msgid "You are not allowed to change the topic" +msgstr "Немате дозвола да го смените насловот" + +#: ../libempathy-gtk/empathy-chat.c:970 +#, c-format +#| msgid "invalid contact" +msgid "“%s” is not a valid contact ID" +msgstr "„%s“ невалиден ID за контакт" + +#: ../libempathy-gtk/empathy-chat.c:1065 +msgid "/clear: clear all messages from the current conversation" +msgstr "/clear: ги брише сите пораки од тековниот разговор" + +#: ../libempathy-gtk/empathy-chat.c:1068 +msgid "/topic : set the topic of the current conversation" +msgstr "/topic <наслов>: го поставува насловот на тековниот разговор" + +#: ../libempathy-gtk/empathy-chat.c:1071 +msgid "/join : join a new chat room" +msgstr "/join : приклучи се во нова соба за разговор" + +#: ../libempathy-gtk/empathy-chat.c:1074 +msgid "/j : join a new chat room" +msgstr "/j : приклучи се во нова соба за разговор" + +#: ../libempathy-gtk/empathy-chat.c:1078 +msgid "/part [] []: leave the chat room, by default the current one" +msgstr "/part [] []: напушти ја собата за разговор" + +#: ../libempathy-gtk/empathy-chat.c:1082 +msgid "/query []: open a private chat" +msgstr "/query []: отвори приватен разговор" + +#: ../libempathy-gtk/empathy-chat.c:1085 +msgid "/msg : open a private chat" +msgstr "/msg : отвори приватен разговор" + +#: ../libempathy-gtk/empathy-chat.c:1088 +msgid "/nick : change your nickname on the current server" +msgstr "/nick : променете го Вашиот прекар на тековниот сервер" + +#: ../libempathy-gtk/empathy-chat.c:1091 +msgid "/me : send an ACTION message to the current conversation" +msgstr "/me : испрати ACTION порака до тековниот разговор" + +#: ../libempathy-gtk/empathy-chat.c:1094 +msgid "/say : send to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\"" +msgstr "/say : испрати ја пораката до тековниот разговор. Ова се користи за испраќање на порака со „/“. На пример: „/say /join се користи за приклучување во нова соба за разговор“" + +#: ../libempathy-gtk/empathy-chat.c:1099 +msgid "/whois : display information about a contact" +msgstr "/whois : прикажи информации за некој контакт" + +#: ../libempathy-gtk/empathy-chat.c:1102 +msgid "/help []: show all supported commands. If is defined, show its usage." +msgstr "/help []: покажи ги сите поддржани команди. Ако е дефинирана, покажи како се употребува." + +#: ../libempathy-gtk/empathy-chat.c:1121 +#, c-format +#| msgid "" +#| "\n" +#| "Message: %s" +msgid "Usage: %s" +msgstr "Користење: %s" + +#: ../libempathy-gtk/empathy-chat.c:1166 +#| msgid "Unknown error" +msgid "Unknown command" +msgstr "Непозната команда" + +#: ../libempathy-gtk/empathy-chat.c:1292 +msgid "Unknown command; see /help for the available commands" +msgstr "Непозната команда. Видете на /help кои команди се достапни" + +#: ../libempathy-gtk/empathy-chat.c:1456 +msgid "insufficient balance to send message" +msgstr "нема доволно кредит за да се испрати пораката" + +#: ../libempathy-gtk/empathy-chat.c:1460 +#: ../libempathy-gtk/empathy-chat.c:1474 +#: ../libempathy-gtk/empathy-chat.c:1537 +#, c-format +msgid "Error sending message '%s': %s" +msgstr "Грешка при испраќањето на пораката '%s': %s" + +#: ../libempathy-gtk/empathy-chat.c:1462 +#: ../libempathy-gtk/empathy-chat.c:1479 +#: ../libempathy-gtk/empathy-chat.c:1541 +#, c-format +#| msgid "Error sending message '%s': %s" +msgid "Error sending message: %s" +msgstr "Грешка при испраќањето на пораката: %s" + +#. translators: error used when user doesn't have enough credit on his +#. * account to send the message. +#: ../libempathy-gtk/empathy-chat.c:1468 +#, c-format +msgid "insufficient balance to send message. Top up." +msgstr "нема доволно кредит за испраќање на пораката. Top up." + +#: ../libempathy-gtk/empathy-chat.c:1508 +msgid "not capable" +msgstr "не е возможно" + +#: ../libempathy-gtk/empathy-chat.c:1515 msgid "offline" msgstr "офлајн" -#: ../libempathy-gtk/empathy-chat.c:500 +#: ../libempathy-gtk/empathy-chat.c:1518 msgid "invalid contact" msgstr "невалиден контакт" -#: ../libempathy-gtk/empathy-chat.c:503 +#: ../libempathy-gtk/empathy-chat.c:1521 msgid "permission denied" msgstr "немате дозвола" -#: ../libempathy-gtk/empathy-chat.c:506 +#: ../libempathy-gtk/empathy-chat.c:1524 msgid "too long message" msgstr "предолга порака" -#: ../libempathy-gtk/empathy-chat.c:509 +#: ../libempathy-gtk/empathy-chat.c:1527 msgid "not implemented" msgstr "не е имплементирано" -#: ../libempathy-gtk/empathy-chat.c:512 +#: ../libempathy-gtk/empathy-chat.c:1531 msgid "unknown" msgstr "непознато" -#: ../libempathy-gtk/empathy-chat.c:516 -#, c-format -msgid "Error sending message '%s': %s" -msgstr "Грешка при испраќањето на пораката '%s': %s" +#: ../libempathy-gtk/empathy-chat.c:1598 +#: ../src/empathy-chat-window.c:761 +msgid "Topic:" +msgstr "Наслов:" -#: ../libempathy-gtk/empathy-chat.c:546 +#: ../libempathy-gtk/empathy-chat.c:1610 #, c-format msgid "Topic set to: %s" msgstr "Насловот е поставен на: %s" -#: ../libempathy-gtk/empathy-chat.c:548 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "No topic defined" msgstr "Не е одреден наслов" -#: ../libempathy-gtk/empathy-chat.c:963 +#: ../libempathy-gtk/empathy-chat.c:2125 +msgid "(No Suggestions)" +msgstr "(Нема предлози)" + +#. translators: %s is the selected word +#: ../libempathy-gtk/empathy-chat.c:2193 +#, c-format +msgid "Add '%s' to Dictionary" +msgstr "Додај го „%s“ во речникот" + +#. translators: first %s is the selected word, +#. * second %s is the language name of the target dictionary +#: ../libempathy-gtk/empathy-chat.c:2230 +#, c-format +msgid "Add '%s' to %s Dictionary" +msgstr "Додај го „%s“ во речникот %s" + +#: ../libempathy-gtk/empathy-chat.c:2300 msgid "Insert Smiley" msgstr "Вметни смешко" -#: ../libempathy-gtk/empathy-chat.c:979 +#. send button +#: ../libempathy-gtk/empathy-chat.c:2318 +#: ../libempathy-gtk/empathy-ui-utils.c:1868 msgid "_Send" msgstr "_Испрати" -#: ../libempathy-gtk/empathy-chat.c:1013 -msgid "_Check Word Spelling..." -msgstr "_Провери го правописот...7" +#. Spelling suggestions +#: ../libempathy-gtk/empathy-chat.c:2375 +msgid "_Spelling Suggestions" +msgstr "Предлози за п_равопис" -#: ../libempathy-gtk/empathy-chat.c:1119 +#: ../libempathy-gtk/empathy-chat.c:2464 +msgid "Failed to retrieve recent logs" +msgstr "Не успеав да ги добијам скорашните дневници" + +#: ../libempathy-gtk/empathy-chat.c:2601 #, c-format -msgid "%s has joined the room" -msgstr "%s се приклучи во собата" +#| msgid "Disconnected" +msgid "%s has disconnected" +msgstr "%s се исклучи" -#: ../libempathy-gtk/empathy-chat.c:1122 +#. translators: reverse the order of these arguments +#. * if the kicked should come before the kicker in your locale. +#. +#: ../libempathy-gtk/empathy-chat.c:2608 +#, c-format +msgid "%1$s was kicked by %2$s" +msgstr "%1$s беше исфрлен од %2$s" + +#: ../libempathy-gtk/empathy-chat.c:2611 +#, c-format +msgid "%s was kicked" +msgstr "%s беше исфрлен" + +#. translators: reverse the order of these arguments +#. * if the banned should come before the banner in your locale. +#. +#: ../libempathy-gtk/empathy-chat.c:2619 +#, c-format +msgid "%1$s was banned by %2$s" +msgstr "%1$s беше баниран од %2$s" + +#: ../libempathy-gtk/empathy-chat.c:2622 +#, c-format +msgid "%s was banned" +msgstr "%s беше баниран" + +#: ../libempathy-gtk/empathy-chat.c:2626 #, c-format msgid "%s has left the room" msgstr "%s ја напушти собата" -#: ../libempathy-gtk/empathy-chat.c:1236 ../src/empathy-call-window.c:406 +#. Note to translators: this string is appended to +#. * notifications like "foo has left the room", with the message +#. * given by the user living the room. If this poses a problem, +#. * please let us know. :-) +#. +#: ../libempathy-gtk/empathy-chat.c:2635 +#, c-format +msgid " (%s)" +msgstr " (%s)" + +#: ../libempathy-gtk/empathy-chat.c:2660 +#, c-format +msgid "%s has joined the room" +msgstr "%s се приклучи во собата" + +#: ../libempathy-gtk/empathy-chat.c:2685 +#, c-format +msgid "%s is now known as %s" +msgstr "%s сега се вика %s" + +#. We don't know if the incoming call has been accepted or not, so we +#. * assume it hasn't and if it has, we'll set the proper status when +#. * we get the new handler. +#: ../libempathy-gtk/empathy-chat.c:2846 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 +#: ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 +#: ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "Исклучен" -#: ../libempathy-gtk/empathy-chat.c:1608 +#. Add message +#: ../libempathy-gtk/empathy-chat.c:3492 +msgid "Would you like to store this password?" +msgstr "Дали сакате да ја зачувате оваа лозинка?" + +#: ../libempathy-gtk/empathy-chat.c:3498 +msgid "Remember" +msgstr "Запамти" + +#: ../libempathy-gtk/empathy-chat.c:3508 +msgid "Not now" +msgstr "Не сега" + +#: ../libempathy-gtk/empathy-chat.c:3552 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 +msgid "Retry" +msgstr "Обиди се пак" + +#: ../libempathy-gtk/empathy-chat.c:3556 +msgid "Wrong password; please try again:" +msgstr "Погрешна лозинка. Пробајте пак:" + +#. Add message +#: ../libempathy-gtk/empathy-chat.c:3686 +msgid "This room is protected by a password:" +msgstr "Собата е заштитена со лозинка:" + +#: ../libempathy-gtk/empathy-chat.c:3713 +msgid "Join" +msgstr "Приклучи се" + +#: ../libempathy-gtk/empathy-chat.c:3901 +#: ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Поврзан" -#: ../libempathy-gtk/empathy-chat.glade.h:1 -msgid "Topic:" -msgstr "Наслов:" +#: ../libempathy-gtk/empathy-chat.c:3956 +msgid "Conversation" +msgstr "Разговор" -#: ../libempathy-gtk/empathy-chat.glade.h:2 -msgid "Group Chat" -msgstr "Групен разговор" +#. Translators: this string is a something like +#. * "Escher Cat (SMS)" +#: ../libempathy-gtk/empathy-chat.c:3961 +#, c-format +msgid "%s (SMS)" +msgstr "%s (SMS)" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +msgid "Unknown or invalid identifier" +msgstr "Непознат или невалиден идентификатор" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +msgid "Contact blocking temporarily unavailable" +msgstr "Блокирањето на контакти моментално е недостапно" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +msgid "Contact blocking unavailable" +msgstr "Блокирањето на контакти е недостапно" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 +#| msgid "permission denied" +msgid "Permission Denied" +msgstr "Немате дозвола" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 +msgid "Could not block contact" +msgstr "Не можев да го блокирам контактот" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 +msgid "Edit Blocked Contacts" +msgstr "Уреди ги блокираните контакти" + +#. Account and Identifier +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 +#: ../libempathy-gtk/empathy-individual-widget.c:1475 +#: ../src/empathy-chatrooms-window.ui.h:1 +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Account:" +msgstr "Сметка:" -#: ../libempathy-gtk/empathy-chat-view.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2 +#| msgid "New Contact" +msgid "Blocked Contacts" +msgstr "Блокирани контакти" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 +#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-chatrooms-window.ui.h:3 +#| msgid "_Remove" +msgid "Remove" +msgstr "Отстрани" + +#. Copy Link Address menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:322 +#: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "_Копирај ја адресата на врската" -#: ../libempathy-gtk/empathy-chat-view.c:438 +#. Open Link menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:329 +#: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "_Отвори ја врската" -#: ../libempathy-gtk/empathy-contact-dialogs.c:180 +#. Translators: timestamp displayed between conversations in +#. * chat windows (strftime format string) +#: ../libempathy-gtk/empathy-chat-text-view.c:417 +#| msgid "%A %d %B %Y" +msgid "%A %B %d %Y" +msgstr "%A %B %d %Y" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:278 msgid "Personal Information" msgstr "Лични податоци" -#: ../libempathy-gtk/empathy-contact-dialogs.c:183 -msgid "Edit Contact Information" -msgstr "Уреди ги податоците за контактот" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:186 -msgid "Contact Information" -msgstr "Податоци за контактот" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:283 -msgid "I would like to add you to my contact list." -msgstr "Би сакал да те додадам во мојата листа на контакти." - -#: ../libempathy-gtk/empathy-contact-dialogs.c:307 +#: ../libempathy-gtk/empathy-contact-dialogs.c:379 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "Нов контакт" -#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1 +#: ../libempathy-gtk/empathy-contact-dialogs.c:448 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 +#, c-format +msgid "Block %s?" +msgstr "Да го блокирам %s?" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:453 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#, c-format +msgid "Are you sure you want to block '%s' from contacting you again?" +msgstr "Дали сте сигурни дека сакате да го/ја блокирате „%s“ за да не може да Ве контактира пак?" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:458 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +msgid "_Block" +msgstr "_Блокирај" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:476 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +msgid "_Report this contact as abusive" +msgid_plural "_Report these contacts as abusive" +msgstr[0] "_Пријави го овој контакт" +msgstr[1] "_Пријави ги овие контакти" + +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 msgid "Decide _Later" msgstr "Одлучи се _подоцна" -#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "Барање за претплата" -#: ../libempathy-gtk/empathy-contact-list-view.c:1226 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "_Block User" +msgstr "_Блокирај корисник" + +#. Title +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 +#| msgid "Compact contact list" +msgid "Search contacts" +msgstr "Барај контакти" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 +#| msgid "Search" +msgid "Search: " +msgstr "Барај:" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 +#| msgid "_Add Contact..." +msgid "_Add Contact" +msgstr "_Додај контакт" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 +msgid "No contacts found" +msgstr "Не се пронајдени контакти" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 +msgid "Your message introducing yourself:" +msgstr "Порака со која ќе се претставувате:" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 +msgid "Please let me see when you're online. Thanks!" +msgstr "Дозволи ми да гледам кога си онлајн. Благодарам!" + +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 +msgid "Channels:" +msgstr "Канали:" + +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 +msgid "Country ISO Code:" +msgstr "ISO код на земја:" + +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 +#| msgid "Account:" +msgid "Country:" +msgstr "Држава:" + +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 +#| msgid "Status:" +msgid "State:" +msgstr "Држава:" + +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 +#| msgid "Client:" +msgid "City:" +msgstr "Град:" + +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 +#| msgid "Armenian" +msgid "Area:" +msgstr "Област:" + +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 +msgid "Postal Code:" +msgstr "Поштенски број:" + +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 +#| msgid "Select" +msgid "Street:" +msgstr "Улица:" + +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 +msgid "Building:" +msgstr "Зграда:" + +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 +#| msgid "_For:" +msgid "Floor:" +msgstr "Спрат:" + +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 +#| msgid "_Room:" +msgid "Room:" +msgstr "Соба:" + +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 +#| msgid "Type:" +msgid "Text:" +msgstr "Текст:" + +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 +#| msgid "Version:" +msgid "Description:" +msgstr "Опис:" + +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 +msgid "URI:" +msgstr "URI:" + +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 +msgid "Accuracy Level:" +msgstr "Ниво на точност:" + +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 +msgid "Error:" +msgstr "Грешка:" + +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 +msgid "Vertical Error (meters):" +msgstr "Вертикална грешка (метри):" + +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 +msgid "Horizontal Error (meters):" +msgstr "Хоризонтална грешка (метри):" + +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 +msgid "Speed:" +msgstr "Брзина:" + +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 +#| msgid "Version:" +msgid "Bearing:" +msgstr "Локал:" + +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 +msgid "Climb Speed:" +msgstr "Брзина на искачување:" + +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 +msgid "Last Updated on:" +msgstr "Последно ажурирано на:" + +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 +msgid "Longitude:" +msgstr "Ширина:" + +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 +msgid "Latitude:" +msgstr "Должина:" + +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 +msgid "Altitude:" +msgstr "Висина:" + +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:15 +#| msgid "Notifications" +msgid "Location" +msgstr "Локација" + +#. translators: format is "Location, $date" +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 +#, c-format +msgid "%s, %s" +msgstr "%s, %s" + +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 +msgid "%B %e, %Y at %R UTC" +msgstr "%B %e, %Y at %R UTC" + +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:901 +msgid "Save Avatar" +msgstr "Зачувај го аватарот" + +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:959 +msgid "Unable to save avatar" +msgstr "Не можам да го зачувам аватарот" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#| msgid "Fullname:" +msgid "Full name" +msgstr "Целосно име" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "Телефонски број" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "Адреса за е-пошта" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +#| msgid "Web site:" +msgid "Website" +msgstr "Веб сајт" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +#| msgid "Birthday:" +msgid "Birthday" +msgstr "Роденден" + +#. Note to translators: this is the caption for a string of the form "5 +#. * minutes ago", and refers to the time since the contact last interacted +#. * with their IM client. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#| msgid "_Last Name:" +msgid "Last seen:" +msgstr "Последно виден(а) на:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +#| msgid "Connected" +msgid "Connected from:" +msgstr "Поврзан од:" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +#| msgid "Save message" +msgid "Away message:" +msgstr "Порака за отсутност:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#| msgid "Network" +msgid "work" +msgstr "работа" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#| msgid "Themes" +msgid "home" +msgstr "дома" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +msgid "mobile" +msgstr "мобилен телефон" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +msgid "voice" +msgstr "гласовни услуги" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#| msgid "Preferences" +msgid "preferred" +msgstr "преферирано" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "поштенски" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +msgid "parcel" +msgstr "парцела" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +msgid "Location at (date)\t" +msgstr "Локација на (датум)\t" + +#. Alias +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1294 +msgid "Alias:" +msgstr "Алијас:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#| msgid "Client Information" +msgid "Client Information" +msgstr "Информации за клиентот" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Client:" +msgstr "Клиент:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 +#| msgid "Contact Details" +msgid "Contact Details" +msgstr "Информации за контактот" + +#. Identifier to connect to Instant Messaging network +#. Translators: Identifier to connect to Instant Messaging network +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +#: ../libempathy-gtk/empathy-individual-widget.c:1503 +msgid "Identifier:" +msgstr "Ознака:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +#| msgid "Information requested..." +msgid "Information requested…" +msgstr "Побарани се информации..." + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +msgid "OS:" +msgstr "OS:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Version:" +msgstr "Верзија:" + +#: ../libempathy-gtk/empathy-groups-widget.c:333 +#| msgid "Group" +msgid "Groups" +msgstr "Групи" + +#: ../libempathy-gtk/empathy-groups-widget.c:345 +msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups." +msgstr "Изберете ги групите во кои што сакате овој контакт да се наоѓа. Забележете дека можете да одберите повеќе од една група или пак ниедна група." + +#: ../libempathy-gtk/empathy-groups-widget.c:364 +msgid "_Add Group" +msgstr "_Додај група" + +#: ../libempathy-gtk/empathy-groups-widget.c:399 +#| msgid "Select" +msgctxt "verb in a column header displaying group names" +msgid "Select" +msgstr "Избери" + +#: ../libempathy-gtk/empathy-groups-widget.c:409 +#: ../src/empathy-main-window.c:1949 +msgid "Group" +msgstr "Група" + +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 +msgid "The following identity will be blocked:" +msgid_plural "The following identities will be blocked:" +msgstr[0] "Следниот идентитет ќе биде блокиран:" +msgstr[1] "Следните идентитети ќе бидат блокирани:" + +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 +msgid "The following identity can not be blocked:" +msgid_plural "The following identities can not be blocked:" +msgstr[0] "Следниот идентитет не може да биде блокиран:" +msgstr[1] "Следните идентитети не може да бидат блокирани:" + +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Уреди ги податоците за контактот" + +#. Translators: the heading at the top of the Information dialogue +#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 +#| msgid "New Contact" +msgid "Linked Contacts" +msgstr "Поврзани контакти" + +#: ../libempathy-gtk/empathy-individual-linker.c:372 +#| msgid "Compact contact list" +msgid "Select contacts to link" +msgstr "Изберете контакти за поврзување" + +#: ../libempathy-gtk/empathy-individual-linker.c:447 +#| msgid "New Contact" +msgid "New contact preview" +msgstr "Преглед на нов контакт" + +#: ../libempathy-gtk/empathy-individual-linker.c:491 +msgid "Contacts selected in the list on the left will be linked together." +msgstr "Контактите во листата лево ќе бидат поврзани меѓу себе." + +#. Translators: this is used in the context menu for a contact. The first +#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one +#. * of the user's account IDs (e.g. me@hotmail.com). +#: ../libempathy-gtk/empathy-individual-menu.c:181 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../libempathy-gtk/empathy-individual-menu.c:363 +msgid "Select account to use to place the call" +msgstr "Изберете сметка која ќе се користи за да го направи повикот" + +#. translators: Call is a noun. This string is used in the window +#. * title +#: ../libempathy-gtk/empathy-individual-menu.c:367 +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:2 +#| msgid "_Call" +msgid "Call" +msgstr "Повик" + +#: ../libempathy-gtk/empathy-individual-menu.c:432 +msgid "Mobile" +msgstr "Мобилен" + +#: ../libempathy-gtk/empathy-individual-menu.c:434 +#| msgid "Word" +msgid "Work" +msgstr "Работа" + +#: ../libempathy-gtk/empathy-individual-menu.c:436 +msgid "HOME" +msgstr "ДОМА" + +#: ../libempathy-gtk/empathy-individual-menu.c:677 +#| msgid "_Contact" +msgid "_Block Contact" +msgstr "_Блокирај го контактот" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-main-window-menubar.ui.h:16 +msgid "_Chat" +msgstr "_Разговор" + +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 +msgid "_SMS" +msgstr "_SMS" + +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +#| msgid "_End Call" +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Аудио повик" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +#| msgid "_End Call" +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Видео повик" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-main-window-menubar.ui.h:27 +#| msgid "Previous Conversations" +msgid "_Previous Conversations" +msgstr "_Претходни разговори" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +#| msgid "Send Video" +msgid "Send File" +msgstr "Испрати датотека" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "Сподели ја мојата работна површина" + +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1358 +#| msgid "Join _Favorites" +msgid "Favorite" +msgstr "Омилено" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "Инфор_матор" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 +#| msgid "_Edit" +msgctxt "Edit individual (contextual menu)" +msgid "_Edit" +msgstr "_Уреди" + +#. Translators: this is a verb meaning "to connect two contacts together +#. * to form a meta-contact". +#: ../libempathy-gtk/empathy-individual-menu.c:1385 +#| msgid "_Contact" +msgctxt "Link individual (contextual menu)" +msgid "_Link Contacts…" +msgstr "П_оврзи контакти..." + +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1011 +msgid "Inviting you to this room" +msgstr "Ве кани во оваа соба" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +#| msgid "Chat Rooms" +msgid "_Invite to Chat Room" +msgstr "Пок_ани во соба за разговор" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-main-window-menubar.ui.h:14 +#| msgid "_Add Contact..." +msgid "_Add Contact…" +msgstr "_Додај контакт..." + +#: ../libempathy-gtk/empathy-individual-view.c:2355 +msgid "Delete and _Block" +msgstr "Избриши и _блокирај" + +#: ../libempathy-gtk/empathy-individual-view.c:2390 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Дали навистина сакате да ја отстраните групата „%s“?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1228 +#: ../libempathy-gtk/empathy-individual-view.c:2393 msgid "Removing group" msgstr "Ја отстранувам групата" -#: ../libempathy-gtk/empathy-contact-list-view.c:1275 -#: ../libempathy-gtk/empathy-contact-list-view.c:1354 +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2448 +#: ../libempathy-gtk/empathy-individual-view.c:2665 msgid "_Remove" msgstr "_Отстрани" -#: ../libempathy-gtk/empathy-contact-list-view.c:1305 +#: ../libempathy-gtk/empathy-individual-view.c:2525 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Дали навистина сакате да го отстраните контактот „%s“?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1307 +#: ../libempathy-gtk/empathy-individual-view.c:2534 +#, c-format +msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact." +msgstr "Дали навистина сакате да го отстраните поврзаниот контакт „%s“? Имајте во предвид дека ова ќе ги избрише сите контакти кои го сочинуваат овој поврзан контакт." + +#: ../libempathy-gtk/empathy-individual-view.c:2546 msgid "Removing contact" msgstr "Го отстранувам контактот" -#: ../libempathy-gtk/empathy-contact-list-view.c:1312 -msgid "Sorry, I don't want you in my contact list anymore." -msgstr "Жалам, но не сакам да си во мојата листа на контакти." - -#: ../libempathy-gtk/empathy-contact-menu.c:109 -#: ../src/empathy-main-window.glade.h:9 -msgid "_Chat" -msgstr "_Разговор" - -#: ../libempathy-gtk/empathy-contact-menu.c:130 -msgid "_Call" -msgstr "_Повик" +#: ../libempathy-gtk/empathy-individual-widget.c:1642 +#, c-format +msgid "Linked contact containing %u contact" +msgid_plural "Linked contacts containing %u contacts" +msgstr[0] "Поврзан контакт кој содржи %u контакт" +msgstr[1] "Поврзан контакт кој содржи %u контакти" -#: ../libempathy-gtk/empathy-contact-menu.c:169 -#: ../src/empathy-main-window.glade.h:17 -msgid "_View Previous Conversations" -msgstr "_Прегледај ги претходните разговори" +#: ../libempathy-gtk/empathy-individual-widget.ui.h:1 +msgid "Location at (date)" +msgstr "Локација на (датум)" -#: ../libempathy-gtk/empathy-contact-menu.c:197 -msgid "Infor_mation" -msgstr "Инфор_матор" +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +msgid "Online from a phone or mobile device" +msgstr "Онлајн преку телефон или мобилен уред" -#: ../libempathy-gtk/empathy-contact-menu.c:224 -#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11 -msgid "_Edit" -msgstr "_Уреди" +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +msgid "New Network" +msgstr "Нова мрежа" -#: ../libempathy-gtk/empathy-contact-widget.c:358 -msgid "Save Avatar" -msgstr "Зачувај го аватарот" +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#| msgid "Create a new IRC network" +msgid "Choose an IRC network" +msgstr "Изберете IRC мрежа" -#: ../libempathy-gtk/empathy-contact-widget.c:414 -msgid "Unable to save avatar" -msgstr "Не можам да го зачувам аватарот" +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +msgid "Reset _Networks List" +msgstr "Ресетирај ја листата на _мрежи" -#: ../libempathy-gtk/empathy-contact-widget.c:875 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#| msgid "Select" +msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Избери" -#: ../libempathy-gtk/empathy-contact-widget.c:884 -#: ../src/empathy-main-window.c:853 -msgid "Group" -msgstr "Група" +#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +msgid "new server" +msgstr "нов сервер" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:1 -msgid "Client Information" -msgstr "Информации за клиентот" +#: ../libempathy-gtk/empathy-irc-network-dialog.c:535 +msgid "SSL" +msgstr "SSL" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:2 -msgid "Contact Details" -msgstr "Информации за контактот" +#. Translators: this is the title of the linking dialogue (reached by +#. * right-clicking on a contact and selecting "Link…"). "Link" in this title +#. * is a verb. +#: ../libempathy-gtk/empathy-linking-dialog.c:115 +#| msgid "Contact" +msgid "Link Contacts" +msgstr "Поврзи ги контактите" + +#: ../libempathy-gtk/empathy-linking-dialog.c:120 +msgctxt "Unlink individual (button)" +msgid "_Unlink…" +msgstr "_Раздели..." + +#: ../libempathy-gtk/empathy-linking-dialog.c:121 +msgid "Completely split the displayed linked contacts into the separate contacts." +msgstr "Целосно раздели ги прикажаните споени контакти во одделни." + +#. Add button +#. Translators: this is an action button in the linking dialogue. "Link" is +#. * used here as a verb meaning "to connect two contacts to form a +#. * meta-contact". +#: ../libempathy-gtk/empathy-linking-dialog.c:136 +#| msgid "_Open Link" +msgid "_Link" +msgstr "_Поврзи" + +#: ../libempathy-gtk/empathy-linking-dialog.c:183 +#, c-format +#| msgid "invalid contact" +msgid "Unlink linked contacts '%s'?" +msgstr "Да ги разделам контактите „%s“?" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:3 -msgid "Contact" -msgstr "Контакт" +#: ../libempathy-gtk/empathy-linking-dialog.c:186 +msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts." +msgstr "Дали навистина сакате да ги разделите овие споени контакти? Ова целосно ќе ги раздели споените контакти во одделни." -#: ../libempathy-gtk/empathy-contact-widget.glade.h:4 -msgid "Groups" -msgstr "Групи" +#: ../libempathy-gtk/empathy-linking-dialog.c:190 +msgctxt "Unlink individual (button)" +msgid "_Unlink" +msgstr "_Раздели" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:5 -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1 -#: ../src/empathy-chatrooms-window.glade.h:1 -#: ../src/empathy-new-chatroom-dialog.glade.h:1 -msgid "Account:" -msgstr "Сметка:" +#: ../libempathy-gtk/empathy-log-window.c:622 +msgid "History" +msgstr "Историја" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:6 -msgid "Alias:" -msgstr "Алијас:" +#: ../libempathy-gtk/empathy-log-window.c:677 +msgid "Show" +msgstr "Покажи" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:7 -msgid "Birthday:" -msgstr "Роденден:" +#: ../libempathy-gtk/empathy-log-window.c:699 +msgid "Search" +msgstr "Барај" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:8 -msgid "Client:" -msgstr "Клиент:" +#: ../libempathy-gtk/empathy-log-window.c:1150 +#, c-format +#| msgid "Chat Rooms" +msgid "Chat in %s" +msgstr "Разговор во %s" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:9 -msgid "Contact information" -msgstr "Информации за контактот" +#: ../libempathy-gtk/empathy-log-window.c:1152 +#, c-format +#| msgid "Chat window theme" +msgid "Chat with %s" +msgstr "Разговор со %s" + +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 +#| msgid "%A %d %B %Y" +msgctxt "A date with the time" +msgid "%A, %e %B %Y %X" +msgstr "%A, %e %B %Y %X" + +#. Translators: this is an emote: '* Danielle waves' +#: ../libempathy-gtk/empathy-log-window.c:1291 +#, c-format +msgid "* %s %s" +msgstr "* %s %s" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:10 -msgid "Email:" -msgstr "Е-пошта:" +#. Translators: this is a message: 'Danielle: hello' +#. * The string in bold is the sender's name +#: ../libempathy-gtk/empathy-log-window.c:1297 +#, c-format +#| msgid "Topic:" +msgid "%s: %s" +msgstr "%s: %s" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:11 -msgid "Fullname:" -msgstr "Име:" +#: ../libempathy-gtk/empathy-log-window.c:1373 +#, c-format +msgid "%s second" +msgid_plural "%s seconds" +msgstr[0] "%s секунда" +msgstr[1] "%s секунди" -#. Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.glade.h:13 -msgid "Identifier:" -msgstr "Ознака:" +#: ../libempathy-gtk/empathy-log-window.c:1380 +#, c-format +msgid "%s minute" +msgid_plural "%s minutes" +msgstr[0] "%s минута" +msgstr[1] "%s минути" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:14 -msgid "Information requested..." -msgstr "Побарани се информации..." +#: ../libempathy-gtk/empathy-log-window.c:1388 +#, c-format +msgid "Call took %s, ended at %s" +msgstr "Повикот траеше %s, прекина на %s" + +#: ../libempathy-gtk/empathy-log-window.c:1722 +msgid "Today" +msgstr "Денес" + +#: ../libempathy-gtk/empathy-log-window.c:1726 +#| msgid "Western" +msgid "Yesterday" +msgstr "Вчера" + +#. Translators: A date such as '23 May 2010' (strftime format) +#: ../libempathy-gtk/empathy-log-window.c:1741 +#| msgid "%A %d %B %Y" +msgid "%e %B %Y" +msgstr "%e %B %Y" + +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 +msgid "Anytime" +msgstr "Било кога" + +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 +msgid "Anyone" +msgstr "Било кој" + +#: ../libempathy-gtk/empathy-log-window.c:2715 +msgid "Who" +msgstr "Кој" + +#: ../libempathy-gtk/empathy-log-window.c:2924 +msgid "When" +msgstr "Кога" + +#: ../libempathy-gtk/empathy-log-window.c:3040 +msgid "Anything" +msgstr "Било што" + +#: ../libempathy-gtk/empathy-log-window.c:3042 +msgid "Text chats" +msgstr "Текстуални разговори" + +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:4 +#| msgid "_Call" +msgid "Calls" +msgstr "Повици" + +#: ../libempathy-gtk/empathy-log-window.c:3049 +#| msgid "Incoming call" +msgid "Incoming calls" +msgstr "Дојдовни повици" + +#: ../libempathy-gtk/empathy-log-window.c:3050 +#| msgid "Incoming call" +msgid "Outgoing calls" +msgstr "Појдовни повици" + +#: ../libempathy-gtk/empathy-log-window.c:3051 +msgid "Missed calls" +msgstr "Пропуштени повици" + +#: ../libempathy-gtk/empathy-log-window.c:3073 +#| msgid "Chat" +msgid "What" +msgstr "Што" + +#: ../libempathy-gtk/empathy-log-window.c:3782 +msgid "Are you sure you want to delete all logs of previous conversations?" +msgstr "Дали навистина сакате да ги избришете сите дневници од претходните разговори?" + +#: ../libempathy-gtk/empathy-log-window.c:3786 +#| msgid "C_lear" +msgid "Clear All" +msgstr "Исчисти ги сите" + +#: ../libempathy-gtk/empathy-log-window.c:3793 +msgid "Delete from:" +msgstr "Избриши од:" + +#: ../libempathy-gtk/empathy-log-window.ui.h:1 +msgid "Loading..." +msgstr "Вчитувам..." + +#: ../libempathy-gtk/empathy-log-window.ui.h:3 +#: ../src/empathy-chat-window.ui.h:3 +msgid "Chat" +msgstr "Разговор" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:15 -msgid "OS:" -msgstr "OS:" +#: ../libempathy-gtk/empathy-log-window.ui.h:4 +msgid "Delete All History..." +msgstr "Избриши ја целата историја..." + +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +msgid "Profile" +msgstr "Профил" + +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-call-window.ui.h:22 +#: ../src/empathy-streamed-media-window.ui.h:20 +#| msgid "Send Video" +msgid "Video" +msgstr "Видео" + +#: ../libempathy-gtk/empathy-log-window.ui.h:7 +#: ../src/empathy-call-window.ui.h:28 +#: ../src/empathy-chat-window.ui.h:12 +#: ../src/empathy-main-window-menubar.ui.h:20 +msgid "_Edit" +msgstr "_Уреди" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:16 -msgid "" -"Select the groups you want this contact to appear in. Note that you can " -"select more than one group or no groups." -msgstr "" -"Изберете ги групите во кои што сакате овој контакт да се наоѓа. Забележете дека можете да одберите " -"повеќе од една група или пак ниедна група." +#: ../libempathy-gtk/empathy-log-window.ui.h:8 +msgid "_File" +msgstr "_Датотека" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:17 -msgid "Version:" -msgstr "Верзија:" +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "page 2" +msgstr "страница 2" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:18 -msgid "Web site:" -msgstr "Веб сајт:" +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 +msgid "The contact is offline" +msgstr "Контактот е офлајн" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:19 -msgid "_Add Group" -msgstr "_Додај група" +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 +msgid "The specified contact is either invalid or unknown" +msgstr "Назначениот контакт е или невалиден или непознат" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:284 -msgid "new server" -msgstr "нов сервер" +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 +msgid "The contact does not support this kind of conversation" +msgstr "Контактот не го поддржува овој тип на разговор" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:513 -msgid "Server" -msgstr "Сервер" +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 +msgid "The requested functionality is not implemented for this protocol" +msgstr "Избраната функционалност не е имплементирана од овој протокол" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:528 -msgid "Port" -msgstr "Порта" +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 +msgid "Could not start a conversation with the given contact" +msgstr "Не можев да започнам разговор со дадениот контакт" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:541 -msgid "SSL" -msgstr "SSL" +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 +msgid "You are banned from this channel" +msgstr "Вие сте банирани од овој канал" -#: ../libempathy-gtk/empathy-log-window.c:497 -msgid "Account" -msgstr "Сметка" +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 +msgid "This channel is full" +msgstr "Каналот е полн" -#: ../libempathy-gtk/empathy-log-window.c:504 ../src/empathy-chat-window.c:276 -msgid "Conversation" -msgstr "Разговор" +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 +#| msgid "You have been invited to join a chat conference." +msgid "You must be invited to join this channel" +msgstr "Мора да Ве поканат за да се приклучите на овој канал" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 +msgid "Can't proceed while disconnected" +msgstr "Не можам да продолжам дури сум исклучен" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 +#| msgid "permission denied" +msgid "Permission denied" +msgstr "Немате дозвола" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 +msgid "There was an error starting the conversation" +msgstr "Имаше грешка при стартувањето на разговорот" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 +msgid "Enter a contact identifier or phone number:" +msgstr "Внесете идентификатор за контактот или телефонски број:" + +#. Tweak the dialog +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 +msgid "New Conversation" +msgstr "Нов разговор" + +#. add video button +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +#| msgid "_End Call" +msgid "_Video Call" +msgstr "_Видео повик" + +#. add audio button +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 +#| msgid "_End Call" +msgid "_Audio Call" +msgstr "_Аудио повик" + +#. Tweak the dialog +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 +#| msgid "New Contact" +msgid "New Call" +msgstr "Нов повик" + +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +#| msgid "Authentication failed" +msgid "Authentification failed for account %s" +msgstr "Автентикацијата за сметката %s не успеа" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 +#, c-format +msgid "" +"Enter your password for account\n" +"%s" +msgstr "" +"Внесете лозинка за Вашата сметка\n" +"%s" + +#. COL_STATUS_TEXT +#. COL_STATE_ICON_NAME +#. COL_STATE +#. COL_DISPLAY_MARKUP +#. COL_STATUS_CUSTOMISABLE +#. COL_TYPE +#: ../libempathy-gtk/empathy-presence-chooser.c:167 +#: ../libempathy-gtk/empathy-presence-chooser.c:203 +#| msgid "Custom message" +msgid "Custom Message…" +msgstr "Сопствена порака..." + +#: ../libempathy-gtk/empathy-presence-chooser.c:220 +#: ../libempathy-gtk/empathy-presence-chooser.c:222 +#| msgid "Custom message" +msgid "Edit Custom Messages…" +msgstr "Уреди ги сопствените пораки..." + +#: ../libempathy-gtk/empathy-presence-chooser.c:345 +msgid "Click to remove this status as a favorite" +msgstr "Кликнете за да го отстраните овој статус како омилен" + +#: ../libempathy-gtk/empathy-presence-chooser.c:354 +msgid "Click to make this status a favorite" +msgstr "Кликнете за д го направите овој контакт омилен" + +#: ../libempathy-gtk/empathy-presence-chooser.c:388 +#| msgid "Status" +msgid "Set status" +msgstr "Постави статус" + +#. Custom messages +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 +#| msgid "Custom message" +msgid "Custom messages…" +msgstr "Сопствени пораки..." + +#. Create account +#. To translator: %s is the name of the protocol, such as "Google Talk" or +#. * "Yahoo!" +#. +#: ../libempathy-gtk/empathy-protocol-chooser.c:584 +#, c-format +msgid "New %s account" +msgstr "Нова сметка за %s" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:1 +#| msgid "Hindi" +msgid "Find:" +msgstr "Најди:" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:2 +msgid "Mat_ch case" +msgstr "Разликувај _мали-големи букви" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:3 +msgid "Phrase not found" +msgstr "Терминот не е пронајден" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +#| msgid "_Next Tab" +msgid "_Next" +msgstr "_Следно" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:5 +#| msgid "_Previous Tab" +msgid "_Previous" +msgstr "_Претходно" + +#: ../libempathy-gtk/empathy-sound-manager.c:51 +#| msgid "Send and receive instant messages" +msgid "Received an instant message" +msgstr "Примена е инстант порака" + +#: ../libempathy-gtk/empathy-sound-manager.c:53 +#| msgid "Send and receive instant messages" +msgid "Sent an instant message" +msgstr "Испратена е инстант порака" + +#: ../libempathy-gtk/empathy-sound-manager.c:55 +#| msgid "Incoming call from %s" +msgid "Incoming chat request" +msgstr "Барање за дојдовен повик" + +#: ../libempathy-gtk/empathy-sound-manager.c:57 +#| msgid "Connected" +msgid "Contact connected" +msgstr "Контактот е поврзан" + +#: ../libempathy-gtk/empathy-sound-manager.c:59 +#| msgid "Disconnected" +msgid "Contact disconnected" +msgstr "Контактот е исклучен" + +#: ../libempathy-gtk/empathy-sound-manager.c:61 +#| msgid "Connected" +msgid "Connected to server" +msgstr "Поврзан со серверот" + +#: ../libempathy-gtk/empathy-sound-manager.c:63 +#| msgid "Disconnected" +msgid "Disconnected from server" +msgstr "Исклучен од серверот" + +#: ../libempathy-gtk/empathy-sound-manager.c:65 +#| msgid "Incoming call" +msgid "Incoming voice call" +msgstr "Дојдовен гласовен повик" + +#: ../libempathy-gtk/empathy-sound-manager.c:67 +msgid "Outgoing voice call" +msgstr "Излезни повици" + +#: ../libempathy-gtk/empathy-sound-manager.c:69 +msgid "Voice call ended" +msgstr "Гласовниот повик заврши" + +#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +#| msgid "Custom message" +msgid "Edit Custom Messages" +msgstr "Уреди ги сопствените пораки" + +#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#, c-format +#| msgid "" +#| "\n" +#| "Message: %s" +msgid "Message edited at %s" +msgstr "Пораката е уредена на %s" + +#: ../libempathy-gtk/empathy-theme-adium.c:1752 +msgid "Normal" +msgstr "Нормално" + +#: ../libempathy-gtk/empathy-theme-manager.c:70 +msgid "Classic" +msgstr "Класично" -#: ../libempathy-gtk/empathy-log-window.c:514 -msgid "Date" -msgstr "Датум" +#: ../libempathy-gtk/empathy-theme-manager.c:71 +msgid "Simple" +msgstr "Едноставно" -#. Tab Label -#: ../libempathy-gtk/empathy-log-window.glade.h:2 -msgid "Conversations" -msgstr "Разговори" +#: ../libempathy-gtk/empathy-theme-manager.c:72 +msgid "Clean" +msgstr "Чисто" + +#: ../libempathy-gtk/empathy-theme-manager.c:73 +msgid "Blue" +msgstr "Сино" -#: ../libempathy-gtk/empathy-log-window.glade.h:3 -msgid "Previous Conversations" -msgstr "Претходни разговори" +#: ../libempathy-gtk/empathy-tls-dialog.c:150 +msgid "The identity provided by the chat server cannot be verified." +msgstr "Идентитетот кој го овозможи серверот за разговори не може да се провери." -#. Tab Label -#: ../libempathy-gtk/empathy-log-window.glade.h:5 -msgid "Search" -msgstr "Барај" +#: ../libempathy-gtk/empathy-tls-dialog.c:157 +msgid "The certificate is not signed by a Certification Authority." +msgstr "Сертификатот не беше потпишан од тело за сертификати." -#. Searching *for* something -#: ../libempathy-gtk/empathy-log-window.glade.h:7 -msgid "_For:" -msgstr "_поим:" +#: ../libempathy-gtk/empathy-tls-dialog.c:161 +#| msgid "Certificate expired" +msgid "The certificate has expired." +msgstr "Сертификатот истече/" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2 -msgid "C_all" -msgstr "П_овик" +#: ../libempathy-gtk/empathy-tls-dialog.c:164 +#| msgid "Certificate not activated" +msgid "The certificate hasn't yet been activated." +msgstr "Сертификатот не е активиран." -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3 -msgid "C_hat" -msgstr "Р_азговор" +#: ../libempathy-gtk/empathy-tls-dialog.c:167 +msgid "The certificate does not have the expected fingerprint." +msgstr "Сертификатот ги нема очекуваните отпечатоци." -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4 -msgid "Contact ID:" -msgstr "ID на контактот:" +#: ../libempathy-gtk/empathy-tls-dialog.c:170 +msgid "The hostname verified by the certificate doesn't match the server name." +msgstr "Името на хостот утврдено со сертификатот не соодветствува со името на серверот." -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5 -msgid "New Conversation" -msgstr "Нов разговор" +#: ../libempathy-gtk/empathy-tls-dialog.c:174 +#| msgid "Certificate self-signed" +msgid "The certificate is self-signed." +msgstr "Сертификатот е самопотпишан." -#. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:685 -msgid "Custom messages..." -msgstr "Сопствени пораки..." +#: ../libempathy-gtk/empathy-tls-dialog.c:177 +msgid "The certificate has been revoked by the issuing Certification Authority." +msgstr "Сертификатот беше повлечен од издавачкото тело на сертификати." -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1 -msgid "Custom message" -msgstr "Сопствена порака" +#: ../libempathy-gtk/empathy-tls-dialog.c:181 +msgid "The certificate is cryptographically weak." +msgstr "Сертификатот е криптографски слаб." -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2 -msgid "Message:" -msgstr "Порака:" +#: ../libempathy-gtk/empathy-tls-dialog.c:184 +msgid "The certificate length exceeds verifiable limits." +msgstr "Должината на сертификатот ги надминува утврдените граници." -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3 -msgid "Save message" -msgstr "Зачувај ја пораката" +#: ../libempathy-gtk/empathy-tls-dialog.c:188 +#| msgid "Certificate expired" +msgid "The certificate is malformed." +msgstr "Сертификатот е неправилен." -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4 -msgid "Status:" -msgstr "Статус:" +#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#, c-format +#| msgid "Certificate hostname mismatch" +msgid "Expected hostname: %s" +msgstr "Очекувано име на хост: %s" -#: ../libempathy-gtk/empathy-spell-dialog.c:88 -msgid "Word" -msgstr "Збор" +#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#, c-format +#| msgid "Certificate hostname mismatch" +msgid "Certificate hostname: %s" +msgstr "Името на хостот на сертификатот: %s" -#: ../libempathy-gtk/empathy-spell-dialog.c:265 -msgid "Suggestions for the word" -msgstr "Предлози за зборот" +#: ../libempathy-gtk/empathy-tls-dialog.c:281 +#| msgid "Connecting" +msgid "Continue" +msgstr "Продолжи" -#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1 -msgid "Spell Checker" -msgstr "Проверка на правопис" +#: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "This connection is untrusted. Would you like to continue anyway?" +msgstr "Оваа врска не е доверлива. Дали сакате да продолжите?" -#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2 -msgid "Suggestions for the word:" -msgstr "Предлози за зборот:" +#: ../libempathy-gtk/empathy-tls-dialog.c:297 +msgid "Remember this choice for future connections" +msgstr "Запамти го изборот за идните врски" -#: ../libempathy-gtk/empathy-theme-boxes.c:745 -#: ../libempathy-gtk/empathy-theme-irc.c:293 -msgid "%A %d %B %Y" -msgstr "%A %d %B %Y" +#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#| msgid "Certificate expired" +msgid "Certificate Details" +msgstr "Детали за сертификатот" -#: ../libempathy-gtk/empathy-theme-manager.c:73 -msgid "Classic" -msgstr "Класично" +#: ../libempathy-gtk/empathy-ui-utils.c:1742 +msgid "Unable to open URI" +msgstr "Не можам да го отворам URI-то" -#: ../libempathy-gtk/empathy-theme-manager.c:74 -msgid "Simple" -msgstr "Едноставно" +#: ../libempathy-gtk/empathy-ui-utils.c:1860 +#| msgid "Select" +msgid "Select a file" +msgstr "Избери датотека" -#: ../libempathy-gtk/empathy-theme-manager.c:75 -msgid "Clean" -msgstr "Чисто" +#: ../libempathy-gtk/empathy-ui-utils.c:1935 +msgid "Insufficient free space to save file" +msgstr "Нема доволно простор за зачувување на датотеката" -#: ../libempathy-gtk/empathy-theme-manager.c:76 -msgid "Blue" -msgstr "Сино" +#: ../libempathy-gtk/empathy-ui-utils.c:1943 +#, c-format +msgid "%s of free space are required to save this file, but only %s is available. Please choose another location." +msgstr "Потребен е простор од %s за зачувување на датотеката, но само достапни се само %s. Ве молам, изберете друга локација." -#: ../libempathy-gtk/empathy-ui-utils.c:1330 -msgid "Unable to open URI" -msgstr "Не можам да го отворам URI-то" +#: ../libempathy-gtk/empathy-ui-utils.c:1987 +#, c-format +#| msgid "Incoming call from %s" +msgid "Incoming file from %s" +msgstr "Дојдовна датотека од %s" #: ../libempathy-gtk/totem-subtitle-encoding.c:158 msgid "Current Locale" @@ -1034,459 +3115,873 @@ msgstr "Западно" msgid "Vietnamese" msgstr "Виетнамски" -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1 -msgid "The contact to display in the applet. Empty means no contact is displayed." -msgstr "Контактот кој ќе се прикажува во аплетот. Празно значи дека нема да се прикажува контакт." - -#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2 -msgid "The contact's avatar token. Empty means contact has no avatar." -msgstr "Ознака за аватарот на контактот. Празно значи без аватар." - -#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1 -msgid "Megaphone" -msgstr "Megaphone" - -#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2 -#: ../megaphone/src/megaphone-applet.c:417 -msgid "Talk!" -msgstr "Зборувај!" - -#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1 -#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1 -msgid "_About" -msgstr "_За" - -#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2 -msgid "_Information" -msgstr "_Информации" - -#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3 -#: ../src/empathy-main-window.glade.h:15 -msgid "_Preferences" -msgstr "_Преференции" - -#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1 -msgid "Presence" -msgstr "Присуство" - -#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2 -#: ../nothere/src/nothere-applet.c:106 -msgid "Set your own presence" -msgstr "Поставете го Вашето присуство" - -#: ../src/empathy.c:380 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 +#| msgid "too long message" +msgid "No error message" +msgstr "Нема порака со грешка" + +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 +msgid "Instant Message (Empathy)" +msgstr "Инстант пораки (Empathy)" + +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Не се поврзувај при подигнување" -#: ../src/empathy.c:384 -msgid "Don't show the contact list on startup" -msgstr "Не ја прикажувај листата со контакти при подигнување" +#: ../src/empathy.c:441 +#| msgid "Don't show the contact list on startup" +msgid "Don't display the contact list or any other dialogs on startup" +msgstr "Не ја прикажувај листата со контакти ниту било какви дијалози при подигнување" -#: ../src/empathy.c:388 -msgid "Show the accounts dialog" -msgstr "Покажи го дијалогот за сметки" +#: ../src/empathy.c:456 +#| msgid "%s - Empathy Call" +msgid "- Empathy IM Client" +msgstr "- Empathy - клиент за инстант пораки" -#: ../src/empathy.c:400 -msgid "- Empathy Instant Messenger" -msgstr "- Empathy инстант пораки" +#: ../src/empathy.c:643 +msgid "Error contacting the Account Manager" +msgstr "Грешка во контактирањето со менаџерот на сметки" -#: ../src/empathy-about-dialog.c:84 +#: ../src/empathy.c:645 +#, c-format 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." +"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n" +"\n" +"%s" msgstr "" -"Empathy е слободен софтвер; можете да го редистрибуирате и/или менувате во согласност со општата " -"јавна ГНУ лиценца објавена од страна наФондацијата за слободен софтвер; можете да ја разгледате " -"втората или пак некоја понова верзија." +"Се појави грешка при обидот за поврзување со менаџерот на сметки „Telepathy“. Грешката беше:\n" +"\n" +"%s" -#: ../src/empathy-about-dialog.c:88 -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 се дистрибуира со надеж дека ќе биде корисен,но без БИЛО КАКВИ ГАРАНЦИИ. За повеќе " -"погледнете ја општата јавна ГНУ лиценца." +#: ../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 е слободен софтвер; можете да го редистрибуирате и/или менувате во согласност со општата јавна ГНУ лиценца објавена од страна наФондацијата за слободен софтвер; можете да ја разгледате втората или пак некоја понова верзија." -#: ../src/empathy-about-dialog.c:92 -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 "" -"Заедно со Empathy треба да добиете и копија од општата и јавнаГНУ лиценца; доколку ја нема " -"лиценцата пишете и на Фондацијата заслободен софтвер на следнава адреса: 51 Franklin Street, Fifth " -"Floor, Boston, MA 02110-130159 USA" +#: ../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 се дистрибуира со надеж дека ќе биде корисен,но без БИЛО КАКВИ ГАРАНЦИИ. За повеќе погледнете ја општата јавна ГНУ лиценца." -#: ../src/empathy-about-dialog.c:120 +#: ../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 "Заедно со Empathy треба да добиете и копија од општата и јавнаГНУ лиценца; доколку ја нема лиценцата пишете и на Фондацијата заслободен софтвер на следнава адреса: 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" + +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Клиент за инстант пораки за GNOME" -#: ../src/empathy-about-dialog.c:126 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "Jovan Naumovski , 2008" -#: ../src/empathy-accounts-dialog.c:389 -msgid "Enabled" -msgstr "Овозможено" +#: ../src/empathy-account-assistant.c:167 +msgid "There was an error while importing the accounts." +msgstr "Се појави грешка при увезувањето на сметките." + +#: ../src/empathy-account-assistant.c:170 +msgid "There was an error while parsing the account details." +msgstr "Се појави грешка при парсирањето на деталите за сметката." -#: ../src/empathy-accounts-dialog.c:399 -#: ../src/empathy-accounts-dialog.glade.h:4 -msgid "Accounts" -msgstr "Сметки" +#: ../src/empathy-account-assistant.c:173 +msgid "There was an error while creating the account." +msgstr "Се појави грешка при креирањето на сметката." -#. To translator: %s is the protocol name -#: ../src/empathy-accounts-dialog.c:862 +#: ../src/empathy-account-assistant.c:175 +msgid "There was an error." +msgstr "Се појави грешка." + +#: ../src/empathy-account-assistant.c:179 #, c-format -msgid "New %s account" -msgstr "Нова сметка за %s" +#| msgid "Error sending message '%s': %s" +msgid "The error message was: %s" +msgstr "Пораката со грешка беше: %s" + +#: ../src/empathy-account-assistant.c:183 +msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu." +msgstr "Може да одите назад и да ги внесите информациите за сметките или да го исклучите помошникот и да додавате сметки преку менито „Уреди“." + +#: ../src/empathy-account-assistant.c:220 +#: ../src/empathy-account-assistant.c:1272 +msgid "An error occurred" +msgstr "Се случи грешка" + +#: ../src/empathy-account-assistant.c:467 +msgid "What kind of chat account do you have?" +msgstr "Каков тип на сметка за разговор имате?" + +#: ../src/empathy-account-assistant.c:473 +#| msgid "I already have an account I want to use" +msgid "Do you have any other chat accounts you want to set up?" +msgstr "Дали имате уште сметки кои што сакате да ги поставите?" + +#: ../src/empathy-account-assistant.c:479 +msgid "Enter your account details" +msgstr "Внесете податоци за Вашата сметка" + +#: ../src/empathy-account-assistant.c:484 +#| msgid "%s is calling you, do you want to answer?" +msgid "What kind of chat account do you want to create?" +msgstr "Каков тип на сметка сакате да креирате?" + +#: ../src/empathy-account-assistant.c:490 +#| msgid "Do you really want to remove the contact '%s'?" +msgid "Do you want to create other chat accounts?" +msgstr "Дали сакате да креирате други сметки?" + +#: ../src/empathy-account-assistant.c:497 +msgid "Enter the details for the new account" +msgstr "Внесете податоци за новата сметка" + +#: ../src/empathy-account-assistant.c:612 +msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls." +msgstr "Со Empaty може да разговарате со луѓе кои користат Google Talk, AIM, Windows Live и други програми за инстант пораки и разговори. Со микрофон и веб камера може да правите аудио и видео повици." + +#: ../src/empathy-account-assistant.c:629 +msgid "Do you have an account you've been using with another chat program?" +msgstr "Дали имате сметка која ја користевте со некоја друга програма за разговор?" + +#: ../src/empathy-account-assistant.c:653 +msgid "Yes, import my account details from " +msgstr "Да, увези ги податоците за сметките од" + +#: ../src/empathy-account-assistant.c:674 +msgid "Yes, I'll enter my account details now" +msgstr "Да, ќе ги внесам моите податоци сега" + +#: ../src/empathy-account-assistant.c:696 +#| msgid "Show and edit accounts" +msgid "No, I want a new account" +msgstr "Не, сакам нова сметка" + +#: ../src/empathy-account-assistant.c:706 +msgid "No, I just want to see people online nearby for now" +msgstr "Не, само сакам да видам кои луѓе околу мене се онлајн" + +#: ../src/empathy-account-assistant.c:727 +#| msgid "Select who would you like to invite:" +msgid "Select the accounts you want to import:" +msgstr "Изберете ги сметките кои сакате да ги увезете:" + +#: ../src/empathy-account-assistant.c:814 +#: ../src/empathy-new-chatroom-dialog.c:625 +#: ../src/empathy-new-chatroom-dialog.c:626 +msgid "Yes" +msgstr "Да" + +#: ../src/empathy-account-assistant.c:821 +msgid "No, that's all for now" +msgstr "Не, тоа е сѐ сега за сега" + +#: ../src/empathy-account-assistant.c:1086 +msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog" +msgstr "Со Empaty може автоматски да откривате и да разговарате со луѓе поврзани на истата мрежа на која сте Вие. Ако сакате да ја користите оваа опција, Ве молам проверете дали деталите кои се внесени подолу се точни. Потоа може да ги промените овие податоци со користење на дијалогот „Сметки“." + +#: ../src/empathy-account-assistant.c:1092 +#: ../src/empathy-account-assistant.c:1148 +#| msgid "_Edit account" +msgid "Edit->Accounts" +msgstr "Уреди->Сметки" + +#: ../src/empathy-account-assistant.c:1108 +msgid "I do _not want to enable this feature for now" +msgstr "Не _сакам да ја овозможувам оваа опција сега" + +#: ../src/empathy-account-assistant.c:1144 +msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog" +msgstr "Доколку не е инсталиран telephaty-salut, нема да може да разговарате со луѓе поврзани на Вашата локална мрежа. Ако сакате да ја овозможите оваа опција, инсталирајте го пакетот telephaty-salut и да креирате сметка за луѓе во околината преку дијалог прозорецот „Сметки“" + +#: ../src/empathy-account-assistant.c:1150 +msgid "telepathy-salut not installed" +msgstr "Не е инсталиран telepathy-salut" + +#: ../src/empathy-account-assistant.c:1196 +msgid "Messaging and VoIP Accounts Assistant" +msgstr "Асистент за инстант пораки и VoIP" + +#: ../src/empathy-account-assistant.c:1230 +msgid "Welcome to Empathy" +msgstr " Добредојтовте во Empathy" + +#: ../src/empathy-account-assistant.c:1239 +msgid "Import your existing accounts" +msgstr "Увезете ги Вашите постоечки сметки" + +#: ../src/empathy-account-assistant.c:1257 +msgid "Please enter personal details" +msgstr "Внесете ги личните податоци" + +#. The primary text of the dialog shown to the user when he is about to lose +#. * unsaved changes +#: ../src/empathy-accounts-dialog.c:64 +#, c-format +msgid "There are unsaved modifications to your %s account." +msgstr "Има незачувани промени на Вашата сметка за %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:68 +msgid "Your new account has not been saved yet." +msgstr "Вашата сметка сѐ уште не е зачувана." + +#: ../src/empathy-accounts-dialog.c:345 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 +#| msgid "Connecting" +msgid "Connecting…" +msgstr "Се поврзувам..." + +#: ../src/empathy-accounts-dialog.c:386 +#, c-format +#| msgid "Offline" +msgid "Offline — %s" +msgstr "Офлајн — %s" -#: ../src/empathy-accounts-dialog.c:972 +#: ../src/empathy-accounts-dialog.c:398 #, c-format +#| msgid "Disconnected" +msgid "Disconnected — %s" +msgstr "Исклучен — %s" + +#: ../src/empathy-accounts-dialog.c:409 +msgid "Offline — No Network Connection" +msgstr "Офлајн - нема мрежна врска" + +#: ../src/empathy-accounts-dialog.c:416 +#| msgid "Status" +msgid "Unknown Status" +msgstr "Непознат статус" + +#: ../src/empathy-accounts-dialog.c:428 +msgid "Offline — Account Disabled" +msgstr "Офлајн - сметката е оневозможена" + +#: ../src/empathy-accounts-dialog.c:831 +#| msgid "" +#| "You are about to remove your %s account!\n" +#| "Are you sure you want to proceed?" msgid "" -"You are about to remove your %s account!\n" -"Are you sure you want to proceed?" +"You are about to create a new account, which will discard\n" +"your changes. Are you sure you want to proceed?" msgstr "" -"Ќе ја отстраните сметката %s!\n" -"Дали сигурно сакате да продолжите?" +"Ќе креирате нова сметка, со што ќе се отфрлат\n" +"Вашите промени. Дали сакате да продолжите?" -#: ../src/empathy-accounts-dialog.c:978 +#: ../src/empathy-accounts-dialog.c:1192 +#, c-format +#| msgid "Do you really want to remove the group '%s'?" +msgid "Do you want to remove %s from your computer?" +msgstr "Дали сакате да го остатраните %s од Вашиот компјутер?" + +#: ../src/empathy-accounts-dialog.c:1196 +msgid "This will not remove your account on the server." +msgstr "Ова ќе ја отстрани сметката од серверот." + +#: ../src/empathy-accounts-dialog.c:1432 +#| msgid "" +#| "You are about to remove your %s account!\n" +#| "Are you sure you want to proceed?" msgid "" -"Any associated conversations and chat rooms will NOT be removed if you " -"decide to proceed.\n" -"\n" -"Should you decide to add the account back at a later time, they will still " -"be available." +"You are about to select another account, which will discard\n" +"your changes. Are you sure you want to proceed?" msgstr "" -"Сите разговори и соби за разговор кои се однесуваат на оваа сметка ќе бидат отстранети ако " -"продолжите.\n" -"\n" -"Ако се одлучите да ја додадете сметката пак, тие повторно ќе бидат достапни." - -#: ../src/empathy-accounts-dialog.glade.h:1 -msgid "New Account" -msgstr "Нова сметка" - -#: ../src/empathy-accounts-dialog.glade.h:2 -msgid "No protocol installed" -msgstr "Не е инсталиран протокол" - -#: ../src/empathy-accounts-dialog.glade.h:3 -msgid "Settings" -msgstr "Поставувања" - -#: ../src/empathy-accounts-dialog.glade.h:5 -msgid "Cr_eate" -msgstr "Кр_еирај" - -#: ../src/empathy-accounts-dialog.glade.h:6 -msgid "I already have an account I want to use" -msgstr "Веќе имам сметка која што сакам да ја користам" - -#: ../src/empathy-accounts-dialog.glade.h:7 +"Ќе изберите нова сметка, со што ќе се отфрлат\n" +"Вашите промени. Дали сакате да продолжите?" + +#. Menu items: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1643 +#| msgid "Enabled" +msgid "_Enable" +msgstr "_Овозможи" + +#: ../src/empathy-accounts-dialog.c:1644 +msgid "_Disable" +msgstr "_Оневозможи" + +#: ../src/empathy-accounts-dialog.c:2154 +#| msgid "" +#| "You are about to remove your %s account!\n" +#| "Are you sure you want to proceed?" msgid "" -"To add a new account, you first have to install a backend for each protocol " -"you want to use." +"You are about to close the window, which will discard\n" +"your changes. Are you sure you want to proceed?" msgstr "" -"За да додадете нова сметка, прво треба да инсталирате бекенд за секој протокол кој што сакате да го " -"користите." - -#: ../src/empathy-accounts-dialog.glade.h:8 -msgid "Type:" -msgstr "Тип:" - -#: ../src/empathy-call-window.c:142 -msgid "Closed" -msgstr "Затворено" - -#: ../src/empathy-call-window.c:254 -msgid "End this call?" -msgstr "Да го завршам овој разговор?" - -#: ../src/empathy-call-window.c:256 -msgid "Closing this window will end the call in progress." -msgstr "Затворањето на овој прозорец ќе го заврши тековниот разговор." - -#: ../src/empathy-call-window.c:257 -msgid "_End Call" -msgstr "_Заврши го разговорот" - -#: ../src/empathy-call-window.c:311 -msgid "Incoming call" -msgstr "Имате повик" +"Ќе го затворите прозорецот, со што ќе се отфрлат\n" +"Вашите промени. Дали сакате да продолжите?" + +#: ../src/empathy-accounts-dialog.ui.h:1 +msgid "Add…" +msgstr "Додај..." + +#: ../src/empathy-accounts-dialog.ui.h:2 +#| msgid "Contact information" +msgid "Loading account information" +msgstr "Вчитувам информации за сметката" + +#: ../src/empathy-accounts-dialog.ui.h:3 +#| msgid "No protocol installed" +msgid "No protocol installed" +msgstr "Не е инсталиран протокол" + +#: ../src/empathy-accounts-dialog.ui.h:4 +msgid "Protocol:" +msgstr "Протокол:" + +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "To add a new account, you first have to install a backend for each protocol you want to use." +msgstr "За да додадете нова сметка, прво треба да инсталирате бекенд за секој протокол кој што сакате да го користите." + +#: ../src/empathy-accounts-dialog.ui.h:7 +msgid "_Import…" +msgstr "_Увези..." + +#: ../src/empathy-auth-client.c:286 +#| msgid "Authentication failed" +msgid " - Empathy authentication client" +msgstr " - клиент за автентикација на Empathy" + +#: ../src/empathy-auth-client.c:302 +#| msgid "Authentication failed" +msgid "Empathy authentication client" +msgstr "Клиент за автентикација на Empathy" + +#: ../src/empathy-auto-salut-account-helper.c:83 +msgid "People nearby" +msgstr "Луѓе во близина" -#: ../src/empathy-call-window.c:313 +#: ../src/empathy-av.c:118 +#: ../src/empathy-call.c:193 +msgid "- Empathy Audio/Video Client" +msgstr "- Empathy - клиент за аудио/видео" + +#: ../src/empathy-av.c:134 +#: ../src/empathy-call.c:218 +msgid "Empathy Audio/Video Client" +msgstr "Empathy - клиент за аудио/видео" + +#: ../src/empathy-streamed-media-window.c:433 +#| msgid "Contact" +msgid "Contrast" +msgstr "Контраст" + +#: ../src/empathy-streamed-media-window.c:436 +msgid "Brightness" +msgstr "Светлост" + +#: ../src/empathy-streamed-media-window.c:439 +msgid "Gamma" +msgstr "Гама" + +#: ../src/empathy-streamed-media-window.c:545 +#| msgid "Volume" +msgid "Volume" +msgstr "Гласност" + +#: ../src/empathy-streamed-media-window.c:1097 +msgid "_Sidebar" +msgstr "_Странична лента" + +#: ../src/empathy-streamed-media-window.c:1117 +msgid "Audio input" +msgstr "Аудио влез" + +#: ../src/empathy-streamed-media-window.c:1121 +msgid "Video input" +msgstr "Видео влез" + +#: ../src/empathy-streamed-media-window.c:1129 +msgid "Dialpad" +msgstr "Тастатура за бројки" + +#: ../src/empathy-streamed-media-window.c:1140 +msgid "Details" +msgstr "Детали" + +#. translators: Call is a noun and %s is the contact name. This string +#. * is used in the window title +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format -msgid "%s is calling you, do you want to answer?" -msgstr "%s Ве бара, дали сакате да се јавите?" - -#: ../src/empathy-call-window.c:319 -msgid "_Reject" -msgstr "_Спушти" - -#: ../src/empathy-call-window.c:324 -msgid "_Answer" -msgstr "_Јави се" +msgid "Call with %s" +msgstr "Разговарај со %s" + +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 +msgid "The IP address as seen by the machine" +msgstr "IP адресата како што ја гледа машината" + +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 +msgid "The IP address as seen by a server on the Internet" +msgstr "IP адресата која ја гледа серверот на интернет" + +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 +msgid "The IP address of the peer as seen by the other side" +msgstr "IP адресата која ја гледа хостот на другата страна" + +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 +msgid "The IP address of a relay server" +msgstr "IP адреса на relay серверот" + +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 +msgid "The IP address of the multicast group" +msgstr "IP адресата на мултикаст групата" + +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 +#| msgid "unknown" +msgctxt "codec" +msgid "Unknown" +msgstr "Непознато" + +#. Translators: number of minutes:seconds the caller has been connected +#: ../src/empathy-streamed-media-window.c:2139 +#, c-format +msgid "Connected — %d:%02dm" +msgstr "Поврзан — %d:%02dm" -#: ../src/empathy-call-window.c:379 -msgid "Empathy Call" -msgstr "Повик со Empathy" +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 +msgid "Technical Details" +msgstr "Технички податоци" -#. To translators: Readying is the first state of the call, it is -#. * preparing the connection and it does not yet ring. -#: ../src/empathy-call-window.c:382 -msgid "Readying" -msgstr "Се подготвувам" +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 +#, c-format +msgid "%s's software does not understand any of the audio formats supported by your computer" +msgstr "Софтверот на %s на ги разбира аудио форматите поддржани на Вашиот компјутер" -#: ../src/empathy-call-window.c:391 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format -msgid "%s - Empathy Call" -msgstr "%s - повик со Empathy" +msgid "%s's software does not understand any of the video formats supported by your computer" +msgstr "Софтверот на %s не ги разбира видео форматите поддржани на Вашиот компјутер" -#: ../src/empathy-call-window.c:395 -msgid "Ringing" -msgstr "Ѕвонам" +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 +#, c-format +msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections." +msgstr "Не можам да воспоставам врска со %s. Некој од вас најверојатно е на мрежа која не дозволува директни поврзувања." + +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 +msgid "There was a failure on the network" +msgstr "Имаше проблем на мрежата" + +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 +msgid "The audio formats necessary for this call are not installed on your computer" +msgstr "Аудио форматите потребни за овој повик не се инсталирани на Вашиот компјутер" + +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 +msgid "The video formats necessary for this call are not installed on your computer" +msgstr "Видео форматите потребни за овој повик не се инсталирани на Вашиот компјутер" + +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 +#, c-format +msgid "Something unexpected happened in a Telepathy component. Please report this bug and attach logs gathered from the 'Debug' window in the Help menu." +msgstr "Се случи нешто неочекувано во некоја компонента на Telepathy. Ве молам, пријавете ја оваа грешка и испратете ги дневниците собрани од прозорецот „Дебагирај“ од менито за помош." + +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 +msgid "There was a failure in the call engine" +msgstr "Имаше грешка во механизмот за повици" + +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 +msgid "The end of the stream was reached" +msgstr "Стигнав до крајот на стримот" + +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 +msgid "Can't establish audio stream" +msgstr "Не можам да воспоставам аудио стрим" + +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 +msgid "Can't establish video stream" +msgstr "Не можам да воспоставам видео стрим" + +#: ../src/empathy-call-window.ui.h:1 +#: ../src/empathy-preferences.ui.h:2 +#: ../src/empathy-streamed-media-window.ui.h:1 +msgid "Audio" +msgstr "Аудио" + +#: ../src/empathy-call-window.ui.h:3 +#: ../src/empathy-streamed-media-window.ui.h:5 +msgid "Decoding Codec:" +msgstr "Кодек за декодирање:" + +#: ../src/empathy-call-window.ui.h:4 +msgid "Disable camera" +msgstr "Оневозможи ја камерата" + +#: ../src/empathy-call-window.ui.h:5 +msgid "Display the dialpad" +msgstr "Прикажи ја тастатурата за бирање" + +#: ../src/empathy-call-window.ui.h:6 +#: ../src/empathy-streamed-media-window.ui.h:9 +msgid "Encoding Codec:" +msgstr "Кодек за енкодирање:" + +#: ../src/empathy-call-window.ui.h:7 +#: ../src/empathy-streamed-media-window.ui.h:10 +#| msgid "Hang Up" +msgid "Hang up" +msgstr "Спушти" -#: ../src/empathy-call-window.c:408 -msgid "Connecting" -msgstr "Се поврзувам" +#: ../src/empathy-call-window.ui.h:8 +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Hang up current call" +msgstr "Прекини го тековниот разговор" -#: ../src/empathy-call-window.c:524 -#, c-format -msgid "Incoming call from %s rejected because there is already a running call." -msgstr "Дојдовниот повик од %s е одбиен бидејќи моментално има друг повик." +#: ../src/empathy-call-window.ui.h:9 +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Local Candidate:" +msgstr "Локален кандидат:" -#: ../src/empathy-call-window.glade.h:1 -msgid "#" -msgstr "#" +#: ../src/empathy-call-window.ui.h:10 +msgid "Maximise me" +msgstr "Максимизирај ме" -#: ../src/empathy-call-window.glade.h:2 -msgid "*" -msgstr "*" +#: ../src/empathy-call-window.ui.h:11 +msgid "Minimise me" +msgstr "Минимизирај ме" -#: ../src/empathy-call-window.glade.h:3 -msgid "0" -msgstr "0" +#: ../src/empathy-call-window.ui.h:12 +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Remote Candidate:" +msgstr "Оддалечен кандидат:" -#: ../src/empathy-call-window.glade.h:4 -msgid "1" -msgstr "1" +#: ../src/empathy-call-window.ui.h:13 +#: ../src/empathy-streamed-media-window.ui.h:16 +#| msgid "Send Video" +msgid "Send Audio" +msgstr "Испрати аудио" -#: ../src/empathy-call-window.glade.h:5 -msgid "2" -msgstr "2" +#: ../src/empathy-call-window.ui.h:14 +msgid "Send Video" +msgstr "Испрати видео" -#: ../src/empathy-call-window.glade.h:6 -msgid "3" -msgstr "3" +#: ../src/empathy-call-window.ui.h:15 +msgid "Show dialpad" +msgstr "Покажи ја тастатурата за бирање" + +#: ../src/empathy-call-window.ui.h:16 +msgid "Start a video call" +msgstr "Започни видео повик" + +#: ../src/empathy-call-window.ui.h:17 +msgid "Start an audio call" +msgstr "Започни аудио повик" + +#: ../src/empathy-call-window.ui.h:18 +msgid "Swap camera" +msgstr "Смени камера" + +#: ../src/empathy-call-window.ui.h:19 +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Toggle audio transmission" +msgstr "Смени ја трансмисијата на звук" + +#: ../src/empathy-call-window.ui.h:20 +msgid "Toggle video transmission" +msgstr "Смени ја трансмисијата на видео" + +#: ../src/empathy-call-window.ui.h:21 +#: ../src/empathy-streamed-media-window.ui.h:18 +#: ../src/empathy-call-window.c:2580 +#: ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 +#: ../src/empathy-call-window.c:2583 +#| msgid "unknown" +msgid "Unknown" +msgstr "Непознато" + +#: ../src/empathy-call-window.ui.h:23 +msgid "Video call" +msgstr "Видео повик" + +#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:24 +msgid "_Call" +msgstr "_Повик" -#: ../src/empathy-call-window.glade.h:7 -msgid "4" -msgstr "4" +#: ../src/empathy-call-window.ui.h:25 +#| msgid "N_ame:" +msgid "_Camera" +msgstr "_Камера" -#: ../src/empathy-call-window.glade.h:8 -msgid "5" -msgstr "5" +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-main-window-menubar.ui.h:18 +msgid "_Contents" +msgstr "_Содржина" -#: ../src/empathy-call-window.glade.h:9 -msgid "6" -msgstr "6" +#: ../src/empathy-call-window.ui.h:27 +#: ../src/empathy-main-window-menubar.ui.h:19 +msgid "_Debug" +msgstr "_Дебагирај" -#: ../src/empathy-call-window.glade.h:10 -msgid "7" -msgstr "7" +#: ../src/empathy-call-window.ui.h:29 +#: ../src/empathy-chat-window.ui.h:14 +#: ../src/empathy-main-window-menubar.ui.h:22 +msgid "_Help" +msgstr "_Помош" -#: ../src/empathy-call-window.glade.h:11 -msgid "8" -msgstr "8" +#: ../src/empathy-call-window.ui.h:30 +#| msgid "Megaphone" +msgid "_Microphone" +msgstr "_Микрофон" -#: ../src/empathy-call-window.glade.h:12 -msgid "9" -msgstr "9" +#: ../src/empathy-call-window.ui.h:31 +#| msgid "Settings" +msgid "_Settings" +msgstr "_Поставувања" -#. To translators: The keypad is numbers [0-9], asterisk (*) and hash (#). Presented like on any phone -#: ../src/empathy-call-window.glade.h:14 -msgid "Keypad" -msgstr "Тастатура за бројки" +#: ../src/empathy-call-window.ui.h:32 +#: ../src/empathy-main-window-menubar.ui.h:30 +#: ../src/empathy-streamed-media-window.ui.h:25 +msgid "_View" +msgstr "_Поглед" -#: ../src/empathy-call-window.glade.h:15 -msgid "Volume" -msgstr "Глас" +#: ../src/empathy-chat-window.c:481 +#: ../src/empathy-chat-window.c:501 +#, c-format +msgid "%s (%d unread)" +msgid_plural "%s (%d unread)" +msgstr[0] "%s (%d непрочитана)" +msgstr[1] "%s (%d непрочитани)" -#: ../src/empathy-call-window.glade.h:16 -msgid "Hang Up" -msgstr "Спушти" +#: ../src/empathy-chat-window.c:493 +#, c-format +msgid "%s (and %u other)" +msgid_plural "%s (and %u others)" +msgstr[0] "%s (и уште %u)" +msgstr[1] "%s (и уште %u)" -#: ../src/empathy-call-window.glade.h:17 -msgid "Send Video" -msgstr "Испрати видео" +#: ../src/empathy-chat-window.c:509 +#, c-format +msgid "%s (%d unread from others)" +msgid_plural "%s (%d unread from others)" +msgstr[0] "%s (%d непрочитана од други)" +msgstr[1] "%s (%d непрочитани од други)" -#: ../src/empathy-chat-window.c:319 +#: ../src/empathy-chat-window.c:518 #, c-format -msgid "Conversations (%d)" -msgstr "Разговори (%d)" +msgid "%s (%d unread from all)" +msgid_plural "%s (%d unread from all)" +msgstr[0] "%s (%d непрочитана од сите)" +msgstr[1] "%s (%d непрочитани од сите)" -#: ../src/empathy-chat-window.c:397 -msgid "Topic:" -msgstr "Наслов:" +#: ../src/empathy-chat-window.c:733 +msgid "SMS:" +msgstr "SMS:" -#: ../src/empathy-chat-window.c:400 +#: ../src/empathy-chat-window.c:743 +#, c-format +#| msgid "Typing a message." +msgid "Sending %d message" +msgid_plural "Sending %d messages" +msgstr[0] "Испраќам %d порака" +msgstr[1] "Испраќам %d пораки" + +#: ../src/empathy-chat-window.c:765 msgid "Typing a message." msgstr "Пишува порака." -#: ../src/empathy-chat-window.glade.h:1 +#: ../src/empathy-chat-window.ui.h:1 msgid "C_lear" msgstr "И_счисти" -#: ../src/empathy-chat-window.glade.h:2 -msgid "Chat" -msgstr "Разговор" +#: ../src/empathy-chat-window.ui.h:2 +#| msgid "Contact" +msgid "C_ontact" +msgstr "К_онтакт" -#: ../src/empathy-chat-window.glade.h:3 +#: ../src/empathy-chat-window.ui.h:4 msgid "Insert _Smiley" msgstr "Вметни _смешко:" -#: ../src/empathy-chat-window.glade.h:4 -msgid "Invitation _message:" -msgstr "_Порака за покана:" +#: ../src/empathy-chat-window.ui.h:5 +msgid "Invite _Participant…" +msgstr "Покани _учесник..." -#: ../src/empathy-chat-window.glade.h:5 -msgid "Invite" -msgstr "Покани" - -#: ../src/empathy-chat-window.glade.h:6 +#: ../src/empathy-chat-window.ui.h:6 msgid "Move Tab _Left" msgstr "Помести го јазичето _налево" -#: ../src/empathy-chat-window.glade.h:7 +#: ../src/empathy-chat-window.ui.h:7 msgid "Move Tab _Right" msgstr "Помести го јазичето _надесно" -#: ../src/empathy-chat-window.glade.h:8 -msgid "Select who would you like to invite:" -msgstr "Одберете кој сакате да го поканите:" - -#: ../src/empathy-chat-window.glade.h:9 -msgid "You have been invited to join a chat conference." -msgstr "Поканети сте во соба за конференција." - -#: ../src/empathy-chat-window.glade.h:10 -msgid "_Contact" -msgstr "_Контакт" - -#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10 -msgid "_Contents" -msgstr "_Содржина" +#: ../src/empathy-chat-window.ui.h:8 +msgid "Notify for All Messages" +msgstr "Извести за сите пораки" -#: ../src/empathy-chat-window.glade.h:12 +#: ../src/empathy-chat-window.ui.h:10 msgid "_Conversation" msgstr "_Разговор" -#: ../src/empathy-chat-window.glade.h:13 +#: ../src/empathy-chat-window.ui.h:11 msgid "_Detach Tab" msgstr "_Откачи го јазичето" -#: ../src/empathy-chat-window.glade.h:15 ../src/empathy-main-window.glade.h:12 -msgid "_Help" -msgstr "_Помош" +#: ../src/empathy-chat-window.ui.h:13 +#| msgid "Edit Favorite Room" +msgid "_Favorite Chat Room" +msgstr "_Омилена соба за разговор" -#: ../src/empathy-chat-window.glade.h:16 +#: ../src/empathy-chat-window.ui.h:15 msgid "_Next Tab" msgstr "_Следно јазиче" -#: ../src/empathy-chat-window.glade.h:17 +#: ../src/empathy-chat-window.ui.h:16 msgid "_Previous Tab" msgstr "_Претходно јазиче" -#: ../src/empathy-chat-window.glade.h:18 +#: ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-status-icon.ui.h:5 +msgid "_Show Contact List" +msgstr "_Покажи листа на контакти" + +#: ../src/empathy-chat-window.ui.h:18 msgid "_Tabs" msgstr "_Јазичиња" -#: ../src/empathy-chatrooms-window.c:262 +#: ../src/empathy-chat-window.ui.h:19 +msgid "_Undo Close Tab" +msgstr "_Врати го затвореното јазиче" + +#: ../src/empathy-chatrooms-window.c:251 msgid "Name" msgstr "Име" -#: ../src/empathy-chatrooms-window.c:280 +#: ../src/empathy-chatrooms-window.c:269 msgid "Room" msgstr "Соба" -#: ../src/empathy-chatrooms-window.c:289 +#: ../src/empathy-chatrooms-window.c:277 msgid "Auto-Connect" msgstr "Автоматско поврзување" -#: ../src/empathy-chatrooms-window.glade.h:2 -msgid "Edit Favorite Room" -msgstr "Уреди ја омилената соба" - -#: ../src/empathy-chatrooms-window.glade.h:3 -msgid "Join room on start_up" -msgstr "Приклучи се во собата при по_дигнување" - -#: ../src/empathy-chatrooms-window.glade.h:4 -msgid "Join this chat room when Empathy starts and you are connected" -msgstr "Приклучете се во оваа соба за разговор кога Empathy се подигнува, а Вие сте поврзани" - -#: ../src/empathy-chatrooms-window.glade.h:5 +#: ../src/empathy-chatrooms-window.ui.h:2 msgid "Manage Favorite Rooms" msgstr "Менаџирај со омилените соби" -#: ../src/empathy-chatrooms-window.glade.h:6 -msgid "N_ame:" -msgstr "И_ме:" - -#: ../src/empathy-chatrooms-window.glade.h:7 -msgid "S_erver:" -msgstr "С_ервер:" +#: ../src/empathy-event-manager.c:523 +#| msgid "Incoming call" +msgid "Incoming video call" +msgstr "Дојдовен видео повик" -#: ../src/empathy-chatrooms-window.glade.h:9 -#: ../src/empathy-new-chatroom-dialog.glade.h:9 -msgid "_Room:" -msgstr "_Соба:" +#: ../src/empathy-event-manager.c:523 +#: ../src/empathy-call-window.c:1555 +msgid "Incoming call" +msgstr "Имате повик" -#: ../src/empathy-event-manager.c:166 +#: ../src/empathy-event-manager.c:527 #, c-format -msgid "" -"New message from %s:\n" -"%s" -msgstr "" -"Нова порака од %s:\n" -"%s" +#| msgid "%s is calling you, do you want to answer?" +msgid "%s is video calling you. Do you want to answer?" +msgstr "%s Ве бара преку видео. Дали сакате да се јавите?" -#: ../src/empathy-event-manager.c:205 +#: ../src/empathy-event-manager.c:528 +#, c-format +#| msgid "%s is calling you, do you want to answer?" +msgid "%s is calling you. Do you want to answer?" +msgstr "%s Ве бара. Дали сакате да се јавите?" + +#: ../src/empathy-event-manager.c:531 +#: ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "Дојдовен повик од %s" -#: ../src/empathy-event-manager.c:238 +#: ../src/empathy-event-manager.c:556 +msgid "_Reject" +msgstr "_Спушти" + +#: ../src/empathy-event-manager.c:564 +#: ../src/empathy-event-manager.c:572 +msgid "_Answer" +msgstr "_Јави се" + +#: ../src/empathy-event-manager.c:572 +msgid "_Answer with video" +msgstr "_Одговори со видео" + +#: ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format -msgid "" -"%s is offering you an invitation, but you don't have the needed external " -"application to handle it." -msgstr "%s Ви нуди покана, но ја немате потребната надворешна апликација за да се справите со неа." +#| msgid "Incoming call from %s" +msgid "Incoming video call from %s" +msgstr "Дојдовен видео повик од %s" -#: ../src/empathy-event-manager.c:263 -msgid "Invitation Error" -msgstr "Грешка во поканата" +#: ../src/empathy-event-manager.c:838 +#| msgid "Romanian" +msgid "Room invitation" +msgstr "Покана за соба" -#: ../src/empathy-event-manager.c:289 +#: ../src/empathy-event-manager.c:840 #, c-format -msgid "" -"%s is offering you an invitation. An external application will be started to " -"handle it." -msgstr "%s Ви нуди покана. Ќе биде стартувана надворешна апликација за да се справи со неа." +#| msgid "Invitation Error" +msgid "Invitation to join %s" +msgstr "Покана за приклучување во %s" + +#: ../src/empathy-event-manager.c:847 +#, c-format +msgid "%s is inviting you to join %s" +msgstr "%s Ве поканува да се придружите во %s" + +#: ../src/empathy-event-manager.c:855 +msgid "_Decline" +msgstr "_Одбиј" + +#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 +#| msgid "Join" +msgid "_Join" +msgstr "_Приклучи се" -#: ../src/empathy-event-manager.c:345 +#: ../src/empathy-event-manager.c:887 #, c-format -msgid "Subscription requested by %s" -msgstr "Побарана е претплата од %s" +msgid "%s invited you to join %s" +msgstr "%s Ве покани да се придружите во %s" -#: ../src/empathy-event-manager.c:348 +#: ../src/empathy-event-manager.c:893 +#, c-format +#| msgid "You have been invited to join a chat conference." +msgid "You have been invited to join %s" +msgstr "Имате покана за да се приклучите во %s" + +#: ../src/empathy-event-manager.c:944 +#, c-format +#| msgid "Incoming call from %s" +msgid "Incoming file transfer from %s" +msgstr "Дојдовен пренос на датотека од %s" + +#: ../src/empathy-event-manager.c:1147 +#: ../src/empathy-main-window.c:375 +#| msgid "Password:" +msgid "Password required" +msgstr "Потребна е лозинка" + +#: ../src/empathy-event-manager.c:1217 +#, c-format +msgid "%s would like permission to see when you are online" +msgstr "%s бара дозвола да гледа кога сте онлајн" + +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -1495,274 +3990,1094 @@ msgstr "" "\n" "Порака: %s" -#: ../src/empathy-main-window.c:466 -msgid "Show and edit accounts" -msgstr "Покажи и уреди ги сметките" +#. Translators: time left, when it is more than one hour +#: ../src/empathy-ft-manager.c:99 +#, c-format +msgid "%u:%02u.%02u" +msgstr "%u:%02u.%02u" -#: ../src/empathy-main-window.c:836 -msgid "Contact" -msgstr "Контакт" +#. Translators: time left, when is is less than one hour +#: ../src/empathy-ft-manager.c:102 +#, c-format +msgid "%02u.%02u" +msgstr "%02u.%02u" -#: ../src/empathy-main-window.c:1038 -msgid "_Edit account" -msgstr "_Уреди ја сметката" +#: ../src/empathy-ft-manager.c:178 +#| msgid "unknown" +msgctxt "file transfer percent" +msgid "Unknown" +msgstr "Непознато" -#: ../src/empathy-main-window.c:1121 -msgid "No error specified" -msgstr "Не е одредена грешка" +#: ../src/empathy-ft-manager.c:273 +#, c-format +msgid "%s of %s at %s/s" +msgstr "%s од %s во %s/s" -#: ../src/empathy-main-window.c:1124 -msgid "Network error" -msgstr "Грешка во мрежата" +#: ../src/empathy-ft-manager.c:274 +#, c-format +msgid "%s of %s" +msgstr "%s од %s" -#: ../src/empathy-main-window.c:1127 -msgid "Authentication failed" -msgstr "Автентикацијата не успеа" +#. translators: first %s is filename, second %s is the contact name +#: ../src/empathy-ft-manager.c:305 +#, c-format +#| msgid "Incoming call from %s" +msgid "Receiving \"%s\" from %s" +msgstr "Преземам „%s“ од %s" -#: ../src/empathy-main-window.c:1130 -msgid "Encryption error" -msgstr "Грешка во енкрипцијата" +#. translators: first %s is filename, second %s is the contact name +#: ../src/empathy-ft-manager.c:308 +#, c-format +msgid "Sending \"%s\" to %s" +msgstr "Испраќам „%s“ на %s" -#: ../src/empathy-main-window.c:1133 -msgid "Name in use" -msgstr "Име во употреба" +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:338 +#, c-format +msgid "Error receiving \"%s\" from %s" +msgstr "Грешка во примањето на „%s“ од %s" -#: ../src/empathy-main-window.c:1136 -msgid "Certificate not provided" -msgstr "Не е обезбеден сертификат" +#: ../src/empathy-ft-manager.c:341 +msgid "Error receiving a file" +msgstr "Грешка во примањето на датотеката" -#: ../src/empathy-main-window.c:1139 -msgid "Certificate untrusted" -msgstr "Сертификатот не е доверлив" +#: ../src/empathy-ft-manager.c:346 +#, c-format +#| msgid "Error sending message '%s': %s" +msgid "Error sending \"%s\" to %s" +msgstr "Грешка при испраќањето на „%s“ на %s" + +#: ../src/empathy-ft-manager.c:349 +#| msgid "Error sending message '%s': %s" +msgid "Error sending a file" +msgstr "Грешка при испраќањето на датотека" + +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:488 +#, c-format +msgid "\"%s\" received from %s" +msgstr "„%s“ е примена од %s" -#: ../src/empathy-main-window.c:1142 -msgid "Certificate expired" -msgstr "Сертификатот истече" +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:493 +#, c-format +#| msgid "Topic set to: %s" +msgid "\"%s\" sent to %s" +msgstr "„%s“ е испратена на %s" -#: ../src/empathy-main-window.c:1145 -msgid "Certificate not activated" -msgstr "Сертификатот не е активиран" +#: ../src/empathy-ft-manager.c:496 +msgid "File transfer completed" +msgstr "Преносот на датотеки заврши" -#: ../src/empathy-main-window.c:1148 -msgid "Certificate hostname mismatch" -msgstr "Несовпаѓање на името на хостот на сертификатот" +#: ../src/empathy-ft-manager.c:615 +#: ../src/empathy-ft-manager.c:779 +msgid "Waiting for the other participant's response" +msgstr "Чекам одговор од другиот учесник" -#: ../src/empathy-main-window.c:1151 -msgid "Certificate fingerprint mismatch" -msgstr "Несовпаѓање на отпечатокот на сертификатот" +#: ../src/empathy-ft-manager.c:641 +#: ../src/empathy-ft-manager.c:679 +#, c-format +msgid "Checking integrity of \"%s\"" +msgstr "Го проверувам интегритетот на „%s“" -#: ../src/empathy-main-window.c:1154 -msgid "Certificate self-signed" -msgstr "Сертификатот е самопотпишан" +#: ../src/empathy-ft-manager.c:644 +#: ../src/empathy-ft-manager.c:682 +#, c-format +msgid "Hashing \"%s\"" +msgstr "Пресметувам хеш за „%s“" + +#: ../src/empathy-ft-manager.c:1025 +msgid "%" +msgstr "%" + +#: ../src/empathy-ft-manager.c:1037 +#| msgid "All Files" +msgid "File" +msgstr "Датотека" + +#: ../src/empathy-ft-manager.c:1059 +#| msgid "Ringing" +msgid "Remaining" +msgstr "Преостанато" + +#: ../src/empathy-ft-manager.ui.h:1 +msgid "File Transfers" +msgstr "Пренесувања на датотеки" + +#: ../src/empathy-ft-manager.ui.h:2 +msgid "Remove completed, canceled and failed file transfers from the list" +msgstr "Отстрани ги завршените, откажаните и неуспешните преноси на датотеки од листата" + +#: ../src/empathy-import-dialog.c:84 +msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin." +msgstr "Не може да се пронајдат сметки за увезување. Empathy моментално само поддржува увезување на сметки од Pidgin." + +#: ../src/empathy-import-dialog.c:199 +#| msgid "Accounts" +msgid "Import Accounts" +msgstr "Увези сметки" + +#. Translators: this is the header of a treeview column +#: ../src/empathy-import-widget.c:301 +#| msgid "Port" +msgid "Import" +msgstr "Увези" + +#: ../src/empathy-import-widget.c:310 +msgid "Protocol" +msgstr "Протокол" + +#: ../src/empathy-import-widget.c:334 +#| msgid "Reso_urce:" +msgid "Source" +msgstr "Извор" + +#: ../src/empathy-main-window.c:392 +#| msgid "Password:" +msgid "Provide Password" +msgstr "Внесете лозинка" + +#: ../src/empathy-main-window.c:398 +#| msgid "Disconnected" +msgid "Disconnect" +msgstr "Исклучен" -#: ../src/empathy-main-window.c:1157 -msgid "Certificate error" -msgstr "Грешка на сертификатот" +#: ../src/empathy-main-window.c:635 +#| msgid "No topic defined" +msgid "No match found" +msgstr "Не е пронајдено совпаѓање" + +#: ../src/empathy-main-window.c:743 +#, c-format +msgid "Sorry, %s accounts can’t be used until your %s software is updated." +msgstr "Жалам, %s сметките не може да се користат сѐ додека софтверот %s не се ажурира." + +#: ../src/empathy-main-window.c:811 +msgid "Update software..." +msgstr "Ажурирај го софтверот..." + +#: ../src/empathy-main-window.c:817 +#: ../src/empathy-main-window.c:938 +#| msgid "Closed" +msgid "Close" +msgstr "Затвори" + +#: ../src/empathy-main-window.c:926 +#| msgid "Disconnected" +msgid "Reconnect" +msgstr "Поврзи се пак" + +#: ../src/empathy-main-window.c:932 +#| msgid "_Edit account" +msgid "Edit Account" +msgstr "Уреди ја сметката" + +#. Translators: this string will be something like: +#. * Top up My Account ($1.23)..." +#: ../src/empathy-main-window.c:1071 +#, c-format +msgid "Top up %s (%s)..." +msgstr "Дополни до %s (%s)..." + +#: ../src/empathy-main-window.c:1118 +#| msgid "Salut account is created" +msgid "Top up account credit" +msgstr "Надополни кредит за сметка" -#: ../src/empathy-main-window.c:1160 -msgid "Unknown error" -msgstr "Непозната грешка" +#. top up button +#: ../src/empathy-main-window.c:1189 +msgid "Top Up..." +msgstr "Дополни..." + +#: ../src/empathy-main-window.c:1931 +msgid "Contact" +msgstr "Контакт" -#: ../src/empathy-main-window.glade.h:1 +#: ../src/empathy-main-window.c:2306 msgid "Contact List" msgstr "Листа на контакти" -#: ../src/empathy-main-window.glade.h:2 -msgid "Context" -msgstr "Контекст" +#: ../src/empathy-main-window-menubar.ui.h:1 +msgid "Contacts on a _Map" +msgstr "Контакти на _мапа" + +#: ../src/empathy-main-window-menubar.ui.h:2 +msgid "Credit Balance" +msgstr "Кредит" -#: ../src/empathy-main-window.glade.h:3 +#: ../src/empathy-main-window-menubar.ui.h:3 +#| msgid "Contact List" +msgid "Find in Contact _List" +msgstr "Најди во _листата на контакти" + +#: ../src/empathy-main-window-menubar.ui.h:4 msgid "Join _Favorites" msgstr "Приклучи се во _омлиените" -#: ../src/empathy-main-window.glade.h:4 -msgid "Join _New..." -msgstr "Приклучи се во _нова..." - -#: ../src/empathy-main-window.glade.h:5 +#: ../src/empathy-main-window-menubar.ui.h:5 msgid "Manage Favorites" msgstr "Менаџирање на омилените" -#: ../src/empathy-main-window.glade.h:6 -msgid "Show _Offline Contacts" -msgstr "Покажи _офлајн контакти" +#: ../src/empathy-main-window-menubar.ui.h:6 +msgid "N_ormal Size" +msgstr "Н_ормална големина" -#: ../src/empathy-main-window.glade.h:7 +#: ../src/empathy-main-window-menubar.ui.h:7 +#: ../src/empathy-status-icon.ui.h:1 +msgid "New _Call…" +msgstr "Нов _повик..." + +#: ../src/empathy-main-window-menubar.ui.h:8 +msgid "Normal Size With _Avatars" +msgstr "Нормална големина со _аватари" + +#: ../src/empathy-main-window-menubar.ui.h:9 +#| msgid "Preferences" +msgid "P_references" +msgstr "П_референции" + +#: ../src/empathy-main-window-menubar.ui.h:10 +msgid "Show P_rotocols" +msgstr "Покажи ги п_ротоколите" + +#: ../src/empathy-main-window-menubar.ui.h:11 +#| msgid "Sort by _name" +msgid "Sort by _Name" +msgstr "Сортирај по _име" + +#: ../src/empathy-main-window-menubar.ui.h:12 +#| msgid "Sort by s_tate" +msgid "Sort by _Status" +msgstr "Сортирај по с_татус" + +#: ../src/empathy-main-window-menubar.ui.h:13 msgid "_Accounts" msgstr "_Сметки" -#: ../src/empathy-main-window.glade.h:8 -msgid "_Add Contact..." -msgstr "_Додај контакт..." +#: ../src/empathy-main-window-menubar.ui.h:15 +#| msgid "New Contact" +msgid "_Blocked Contacts" +msgstr "_Блокирани сметки" -#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2 -msgid "_New Conversation..." +#: ../src/empathy-main-window-menubar.ui.h:17 +msgid "_Compact Size" +msgstr "_Компактна големина" + +#: ../src/empathy-main-window-menubar.ui.h:21 +msgid "_File Transfers" +msgstr "Преноси на _датотеки" + +#: ../src/empathy-main-window-menubar.ui.h:23 +#| msgid "Join" +msgid "_Join…" +msgstr "_Приклучи се..." + +#: ../src/empathy-main-window-menubar.ui.h:24 +#: ../src/empathy-status-icon.ui.h:3 +#| msgid "New Conversation" +msgid "_New Conversation…" msgstr "_Нов разговор..." -#: ../src/empathy-main-window.glade.h:14 +#: ../src/empathy-main-window-menubar.ui.h:25 +#| msgid "Show _Offline Contacts" +msgid "_Offline Contacts" +msgstr "_Офлајн контакти" + +#: ../src/empathy-main-window-menubar.ui.h:26 msgid "_Personal Information" msgstr "_Лични информации" -#: ../src/empathy-main-window.glade.h:16 +#: ../src/empathy-main-window-menubar.ui.h:28 msgid "_Room" msgstr "_Соба" -#: ../src/empathy-new-chatroom-dialog.c:290 -msgid "Chat Rooms" -msgstr "Соби за разговор:" +#: ../src/empathy-main-window-menubar.ui.h:29 +#| msgid "_Show Contact List" +msgid "_Search for Contacts…" +msgstr "_Барај контакти..." -#: ../src/empathy-new-chatroom-dialog.glade.h:2 -msgid "Browse:" -msgstr "Прелистај:" +#: ../src/empathy-new-chatroom-dialog.c:369 +#| msgid "Chat Rooms" +msgid "Chat Room" +msgstr "Соба за разговор" -#: ../src/empathy-new-chatroom-dialog.glade.h:3 -msgid "Enter the room name to join here or click on one or more rooms in the list." -msgstr "" -"Внесете го името на собата во која ќе се приклучите или кликнете една или повеќе соби од листата." +#: ../src/empathy-new-chatroom-dialog.c:385 +#| msgid "Themes" +msgid "Members" +msgstr "Членови" -#: ../src/empathy-new-chatroom-dialog.glade.h:4 +#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, +#. yes/no, yes/no and a number. +#: ../src/empathy-new-chatroom-dialog.c:623 +#, c-format msgid "" -"Enter the server which hosts the room, or leave it empty if the room is on " -"the current account's server" +"%s\n" +"Invite required: %s\n" +"Password required: %s\n" +"Members: %s" msgstr "" -"Внесете го серверот кој ја хостира собата или оставете го полето празно ако собата е на тековниот " -"сервер на сметката" +"%s\n" +"Потребна е покана: %s\n" +"Потребна е лозинка: %s\n" +"Членови: %s" -#: ../src/empathy-new-chatroom-dialog.glade.h:5 -msgid "Join" -msgstr "Приклучи се" +#: ../src/empathy-new-chatroom-dialog.c:625 +#: ../src/empathy-new-chatroom-dialog.c:626 +msgid "No" +msgstr "Не" -#: ../src/empathy-new-chatroom-dialog.glade.h:6 -msgid "Join New" -msgstr "Приклучи се во нова" +#: ../src/empathy-new-chatroom-dialog.c:654 +msgid "Could not start room listing" +msgstr "Не можев да започнам со листање на собата" -#: ../src/empathy-new-chatroom-dialog.glade.h:7 -msgid "Re_fresh" -msgstr "О_свежи" +#: ../src/empathy-new-chatroom-dialog.c:664 +msgid "Could not stop room listing" +msgstr "Не можев да престанам со листање на собата" -#: ../src/empathy-new-chatroom-dialog.glade.h:8 -msgid "This list represents all chat rooms hosted on the server you have entered." -msgstr "Оваа листа ги претставува сите соби за разговор хостирани на серверот во кој што влеговте." +#: ../src/empathy-new-chatroom-dialog.ui.h:2 +msgid "Couldn't load room list" +msgstr "Не можев да вчитам листа на соби" -#: ../src/empathy-preferences.c:264 -msgid "Language" -msgstr "Јазик" +#: ../src/empathy-new-chatroom-dialog.ui.h:3 +msgid "Enter the room name to join here or click on one or more rooms in the list." +msgstr "Внесете го името на собата во која ќе се приклучите или кликнете една или повеќе соби од листата." -#: ../src/empathy-preferences.glade.h:1 -msgid "Appearance" -msgstr "Изглед" +#: ../src/empathy-new-chatroom-dialog.ui.h:4 +msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server" +msgstr "Внесете го серверот кој ја хостира собата или оставете го полето празно ако собата е на тековниот сервер на сметката" -#. To translators: Audio notifications preferences -#: ../src/empathy-preferences.glade.h:3 -msgid "Audio" -msgstr "Аудио" +#: ../src/empathy-new-chatroom-dialog.ui.h:5 +#| msgid "Room" +msgid "Join Room" +msgstr "Приклучи се во соба" -#: ../src/empathy-preferences.glade.h:4 -msgid "Behaviour" -msgstr "Однесување" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +#| msgid "_Room List locale:" +msgid "Room List" +msgstr "Листа на соби" -#: ../src/empathy-preferences.glade.h:5 -msgid "Contact List" -msgstr "Листа на контакти" +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "_Room:" +msgstr "_Соба:" -#: ../src/empathy-preferences.glade.h:6 -msgid "Enable spell checking for languages:" -msgstr "Овозможи проверка на правопис за јазиците:" +#: ../src/empathy-preferences.c:166 +msgid "Message received" +msgstr "Пораката е примена" -#. To translators: Visual notifications preferences, like notify bubbles, etc. -#: ../src/empathy-preferences.glade.h:8 -msgid "Visual" -msgstr "Визуелни" +#: ../src/empathy-preferences.c:167 +#| msgid "" +#| "\n" +#| "Message: %s" +msgid "Message sent" +msgstr "Пораката е испратена" -#: ../src/empathy-preferences.glade.h:9 -msgid "" -"The list of languages reflects only the languages for which you have " -"a dictionary installed." -msgstr "" -"Листата на јазици има дејство само за јазиците за кои има речник за проверка на правопис.<" -"/small>" +#: ../src/empathy-preferences.c:168 +#| msgid "New Conversation" +msgid "New conversation" +msgstr "Нов разговор" -#: ../src/empathy-preferences.glade.h:10 -msgid "Automatically _connect on startup " -msgstr "Автоматски _поврзи се при подигнување" +#: ../src/empathy-preferences.c:169 +msgid "Contact goes online" +msgstr "Контактот оди онлајн" -#: ../src/empathy-preferences.glade.h:11 -msgid "Avatars are user chosen images shown in the contact list" -msgstr "Аватарите се слики избрани од корисникот прикажани во листата на контакти" +#: ../src/empathy-preferences.c:170 +msgid "Contact goes offline" +msgstr "Контактот оди офлајн" -#: ../src/empathy-preferences.glade.h:12 -msgid "Chat Th_eme:" -msgstr "Т_ема за разговорите:" +#: ../src/empathy-preferences.c:171 +#| msgid "Disconnected" +msgid "Account connected" +msgstr "Сметката е поврзана" + +#: ../src/empathy-preferences.c:172 +#| msgid "Disconnected" +msgid "Account disconnected" +msgstr "Сметката е исклучена" + +#: ../src/empathy-preferences.c:475 +msgid "Language" +msgstr "Јазик" -#: ../src/empathy-preferences.glade.h:13 -msgid "Display notifications when contacts come _online" -msgstr "Прикажи известувања кога контактите доаѓаат _онлајн" +#. translators: Contact name for the chat theme preview +#: ../src/empathy-preferences.c:725 +#| msgid "Client:" +msgid "Juliet" +msgstr "Juliet" + +#. translators: Contact name for the chat theme preview +#: ../src/empathy-preferences.c:732 +#| msgid "Room" +msgid "Romeo" +msgstr "Romeo" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:738 +msgid "O Romeo, Romeo, wherefore art thou Romeo?" +msgstr "O Romeo, Romeo, wherefore art thou Romeo?" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:741 +msgid "Deny thy father and refuse thy name;" +msgstr "Deny thy father and refuse thy name;" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:744 +msgid "Or if thou wilt not, be but sworn my love" +msgstr "Or if thou wilt not, be but sworn my love" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:747 +msgid "And I'll no longer be a Capulet." +msgstr "And I'll no longer be a Capulet." + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:750 +msgid "Shall I hear more, or shall I speak at this?" +msgstr "Shall I hear more, or shall I speak at this?" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:753 +#| msgid "Disconnected" +msgid "Juliet has disconnected" +msgstr "Juliet has disconnected" + +#: ../src/empathy-preferences.c:1157 +msgid "Preferences" +msgstr "Преференции" -#: ../src/empathy-preferences.glade.h:14 -msgid "Enable sounds when _away" -msgstr "Овозможи звуци кога сум _недостапен" +#: ../src/empathy-preferences.ui.h:1 +#| msgid "Appearance" +msgid "Appearance" +msgstr "Изглед" -#: ../src/empathy-preferences.glade.h:15 -msgid "Enable sounds when _busy" -msgstr "Овозможи звуци кога сум _зафатен" +#: ../src/empathy-preferences.ui.h:3 +#| msgid "Behaviour" +msgid "Behavior" +msgstr "Однесување" + +#: ../src/empathy-preferences.ui.h:5 +msgid "Chat Th_eme:" +msgstr "Т_ема за разговорите:" -#: ../src/empathy-preferences.glade.h:16 +#: ../src/empathy-preferences.ui.h:6 +#| msgid "Display notifications when contacts come _online" +msgid "Disable notifications when _away or busy" +msgstr "Прикажи известувања кога сум _отсутен или зафатен" + +#: ../src/empathy-preferences.ui.h:7 +#| msgid "Enable sounds when _away" +msgid "Disable sounds when _away or busy" +msgstr "Оневозможи звуци кога сум _недостапен" + +#: ../src/empathy-preferences.ui.h:8 +msgid "Display incoming events in the notification area" +msgstr "Прикажи ги дојдовните настани во местото за известување" + +#: ../src/empathy-preferences.ui.h:9 +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 "Отстранувањето на ехо помага правејќи го Вашиот глас да звучи почист на другата страна, но може да предизвика проблеми на некои компјутер. Ако Вие или другата личност слуша чудни звуци или прекини при повиците, пробајте да го пуштите отстранувањето на ехо и да го рестартирате повикот." + +#: ../src/empathy-preferences.ui.h:10 +#| msgid "Display notifications when contacts come _online" +msgid "Enable notifications when a contact comes online" +msgstr "Прикажи известувања кога контактите доаѓаат онлајн" + +#: ../src/empathy-preferences.ui.h:11 +#| msgid "Display notifications when contacts come _online" +msgid "Enable notifications when a contact goes offline" +msgstr "Прикажи известувања кога контактите одат офлајн" + +#: ../src/empathy-preferences.ui.h:12 +#| msgid "Display notifications when contacts come _online" +msgid "Enable notifications when the _chat is not focused" +msgstr "Прикажи известувања кога _разговорот не е фокусиран" + +#: ../src/empathy-preferences.ui.h:13 +#| msgid "Enable spell checking for languages:" +msgid "Enable spell checking for languages:" +msgstr "Овозможи проверка на правопис за јазиците:" + +#: ../src/empathy-preferences.ui.h:14 msgid "General" msgstr "Општо" -#: ../src/empathy-preferences.glade.h:17 +#: ../src/empathy-preferences.ui.h:16 +#| msgid "Use notification sounds" +msgid "Location sources:" +msgstr "Извори на локација:" + +#: ../src/empathy-preferences.ui.h:17 +#| msgid "Conversations" +msgid "Log conversations" +msgstr "Дневник на разговорите" + +#: ../src/empathy-preferences.ui.h:18 msgid "Notifications" msgstr "Известувања" -#: ../src/empathy-preferences.glade.h:18 -msgid "Preferences" -msgstr "Преференции" +#: ../src/empathy-preferences.ui.h:19 +msgid "Play sound for events" +msgstr "Пуштај звуци за настани" + +#: ../src/empathy-preferences.ui.h:20 +msgid "Privacy" +msgstr "Приватност" -#: ../src/empathy-preferences.glade.h:19 -msgid "Show _avatars" -msgstr "Покажи _аватари" +#: ../src/empathy-preferences.ui.h:21 +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 "Намалената точност за локација значи дека нема да биде објавено ништо друго, освен Вашиот град и држава. GPS координатите ќе бидат со точност до 1 децимално место." -#: ../src/empathy-preferences.glade.h:20 +#: ../src/empathy-preferences.ui.h:22 msgid "Show _smileys as images" msgstr "Покажи _смешковци како слики" -#: ../src/empathy-preferences.glade.h:21 -msgid "Show co_mpact contact list" -msgstr "Покажи ко_мпактна листа на контакти" - -#: ../src/empathy-preferences.glade.h:22 -msgid "Sort by _name" -msgstr "Сортирај по _име" +#: ../src/empathy-preferences.ui.h:23 +#| msgid "_Show Contact List" +msgid "Show contact _list in rooms" +msgstr "Покажи _листа на контакти во собите" -#: ../src/empathy-preferences.glade.h:23 -msgid "Sort by s_tate" -msgstr "Сортирај по с_остојба" +#: ../src/empathy-preferences.ui.h:24 +msgid "Sounds" +msgstr "Звуци" -#: ../src/empathy-preferences.glade.h:24 +#: ../src/empathy-preferences.ui.h:25 msgid "Spell Checking" msgstr "Проверка на правопис" -#: ../src/empathy-preferences.glade.h:25 +#: ../src/empathy-preferences.ui.h:26 +#| 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 "Листата на јазици има дејство само за јазиците за кои има речник за проверка на правопис." + +#: ../src/empathy-preferences.ui.h:27 msgid "Themes" msgstr "Теми" -#: ../src/empathy-preferences.glade.h:26 +#: ../src/empathy-preferences.ui.h:28 +msgid "Use _echo cancellation to improve call quality" +msgstr "Користи отстранување на _ехо за подобрување на квалитетот на повикот" + +#: ../src/empathy-preferences.ui.h:29 +#| msgid "Version:" +msgid "Variant:" +msgstr "Варијанта:" + +#: ../src/empathy-preferences.ui.h:30 +#| msgid "Automatically _connect on startup " +msgid "_Automatically connect on startup" +msgstr "Автоматски _поврзи се при подигнување" + +#: ../src/empathy-preferences.ui.h:31 +#| msgid "Megaphone" +msgid "_Cellphone" +msgstr "_Мобилен телефон" + +#: ../src/empathy-preferences.ui.h:32 +msgid "_Enable bubble notifications" +msgstr "_Овозможи известувања во балони" + +#: ../src/empathy-preferences.ui.h:33 +#| msgid "Enable sound when away" +msgid "_Enable sound notifications" +msgstr "_Овозможи звучни известувања" + +#: ../src/empathy-preferences.ui.h:34 +msgid "_GPS" +msgstr "_GPS" + +#: ../src/empathy-preferences.ui.h:35 +msgid "_Network (IP, Wi-Fi)" +msgstr "_Мрежа (IP, Wi-Fi)" + +#: ../src/empathy-preferences.ui.h:36 msgid "_Open new chats in separate windows" msgstr "_Отвори ги новите разговори во посебни прозорци" -#: ../src/empathy-preferences.glade.h:27 -msgid "_Play sound when messages arrive" -msgstr "_Пушти звук кога пристигнуваат пораки" +#: ../src/empathy-preferences.ui.h:37 +msgid "_Publish location to my contacts" +msgstr "_Објави ја мојата локација на контактите" -#: ../src/empathy-status-icon.glade.h:1 +#. 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:39 +msgid "_Reduce location accuracy" +msgstr "_Намали ја точноста на локацијата" + +#: ../src/empathy-status-icon.ui.h:2 msgid "Status" msgstr "Статус" -#: ../src/empathy-status-icon.glade.h:3 +#: ../src/empathy-status-icon.ui.h:4 msgid "_Quit" msgstr "_Излез" -#: ../src/empathy-status-icon.glade.h:4 -msgid "_Show Contact List" -msgstr "_Покажи листа на контакти" +#: ../src/empathy-streamed-media-window.ui.h:2 +#| msgid "Compact contact list" +msgid "Call the contact again" +msgstr "Повикај го контактот пак" + +#: ../src/empathy-streamed-media-window.ui.h:3 +msgid "Camera Off" +msgstr "Камерата е исклучена" + +#: ../src/empathy-streamed-media-window.ui.h:4 +msgid "Camera On" +msgstr "Камерата е вклучена" + +#: ../src/empathy-streamed-media-window.ui.h:6 +msgid "Disable camera and stop sending video" +msgstr "Оневозможи ја камерата и престани со испраќање на видео" + +#: ../src/empathy-streamed-media-window.ui.h:7 +msgid "Enable camera and send video" +msgstr "Овозможи ја камерата и испраќај видео снимка" + +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "Enable camera but don't send video" +msgstr "Овозможи ја камерата, но не испраќај видео снимка" + +#: ../src/empathy-streamed-media-window.ui.h:13 +msgid "Preview" +msgstr "Преглед" + +#: ../src/empathy-streamed-media-window.ui.h:14 +msgid "Redial" +msgstr "Бирај повторно" + +#: ../src/empathy-streamed-media-window.ui.h:19 +#| msgid "Send Video" +msgid "V_ideo" +msgstr "В_идео" + +#: ../src/empathy-streamed-media-window.ui.h:21 +msgid "Video Off" +msgstr "Видеото е исклучено" + +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Video On" +msgstr "Видеото е вклучено" + +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Video Preview" +msgstr "Преглед на видео" + +#: ../src/empathy-map-view.c:471 +#| msgid "Contact List" +msgid "Contact Map View" +msgstr "Поглед на мапа на контактите" + +#: ../src/empathy-debug-window.c:1228 +#| msgid "Server" +msgid "Save" +msgstr "Зачувај" + +#: ../src/empathy-debug-window.c:1435 +msgid "Debug Window" +msgstr "Прозорец за дебагирање" + +#: ../src/empathy-debug-window.c:1517 +msgid "Pause" +msgstr "Пауза" + +#: ../src/empathy-debug-window.c:1529 +msgid "Level " +msgstr "Ниво" + +#: ../src/empathy-debug-window.c:1549 +msgid "Debug" +msgstr "Дебагирај" + +#: ../src/empathy-debug-window.c:1555 +msgid "Info" +msgstr "Информации" + +#: ../src/empathy-debug-window.c:1561 +#: ../src/empathy-debug-window.c:1610 +#| msgid "Message:" +msgid "Message" +msgstr "Порака" + +#: ../src/empathy-debug-window.c:1567 +msgid "Warning" +msgstr "Предупредување" + +#: ../src/empathy-debug-window.c:1573 +#| msgid "Croatian" +msgid "Critical" +msgstr "Критично" + +#: ../src/empathy-debug-window.c:1579 +msgid "Error" +msgstr "Грешка" + +#: ../src/empathy-debug-window.c:1598 +#| msgid "Simple" +msgid "Time" +msgstr "Време" + +#: ../src/empathy-debug-window.c:1601 +#| msgid "Romanian" +msgid "Domain" +msgstr "Домен" + +#: ../src/empathy-debug-window.c:1603 +msgid "Category" +msgstr "Категорија" + +#: ../src/empathy-debug-window.c:1605 +msgid "Level" +msgstr "Ниво" + +#: ../src/empathy-debug-window.c:1642 +msgid "The selected connection manager does not support the remote debugging extension." +msgstr "Избраниот менаџер на врски не го поддржува додатокот за оддалечено дебагирање." + +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 +msgid "Invite Participant" +msgstr "Покани учесник" + +#: ../src/empathy-invite-participant-dialog.c:201 +msgid "Choose a contact to invite into the conversation:" +msgstr "Изберете контакт кој ќе го поканите во разговорот:" + +#: ../src/empathy-invite-participant-dialog.c:224 +msgid "Invite" +msgstr "Покани" + +#: ../src/empathy-accounts.c:183 +msgid "Don't display any dialogs; do any work (eg, importing) and exit" +msgstr "Не прикажувај дијалози; заврши со тоа што правиш (пр. увезување) и излези" + +#: ../src/empathy-accounts.c:187 +msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts" +msgstr "Не прикажувај дијалози, освен ако има само сметки од „Луѓе во близина“" + +#: ../src/empathy-accounts.c:191 +msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" +msgstr "Почетен избор на дадена сметка (пр. gabble/jabber/foo_40example_2eorg0)" + +#: ../src/empathy-accounts.c:193 +#| msgid "Account" +msgid "" +msgstr "" + +#: ../src/empathy-accounts.c:196 +#| msgid "Show the accounts dialog" +msgid "Show account assistant" +msgstr "Покажи го помошникот за сметки" + +#: ../src/empathy-accounts.c:202 +#| msgid "Accounts" +msgid "- Empathy Accounts" +msgstr "- сметки за Empathy" + +#: ../src/empathy-accounts.c:238 +#| msgid "Accounts" +msgid "Empathy Accounts" +msgstr "Сметки за Empathy" + +#: ../src/empathy-debugger.c:69 +msgid "Show a particular service" +msgstr "Покажи одреден сервис" + +#: ../src/empathy-debugger.c:74 +#| msgid "- Empathy Instant Messenger" +msgid "- Empathy Debugger" +msgstr "- дебагер на Empathy" + +#: ../src/empathy-debugger.c:113 +msgid "Empathy Debugger" +msgstr "Дебагер на Empathy" + +#: ../src/empathy-chat.c:107 +#| msgid "%s - Empathy Call" +msgid "- Empathy Chat Client" +msgstr "- клиент за разговори - Empathy" + +#: ../src/empathy-notifications-approver.c:190 +msgid "Respond" +msgstr "Одговори" + +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 +#| msgid "_Reject" +msgid "Reject" +msgstr "Одбиј" + +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 +#| msgid "_Answer" +msgid "Answer" +msgstr "Јави се" + +#: ../src/empathy-notifications-approver.c:214 +msgid "Answer with video" +msgstr "Одговори со видео" + +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 +msgid "Decline" +msgstr "Одбиј" + +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 +#| msgid "Account" +msgid "Accept" +msgstr "Прифати" + +#. translators: the 'Provide' button is displayed in a notification +#. * bubble when Empathy is asking for an account password; clicking on it +#. * brings the password popup. +#: ../src/empathy-notifications-approver.c:247 +msgid "Provide" +msgstr "Внеси" + +#: ../src/empathy-call-observer.c:134 +#, c-format +msgid "%s just tried to call you, but you were in another call." +msgstr "%s се обиде да Ве побара, но вие бевте на сред друг разговор." + +#. Translators: this is an "Info" label. It should be as short +#. * as possible. +#: ../src/empathy-call-window.c:1172 +#: ../src/empathy-call-window.c:1195 +msgid "i" +msgstr "i" + +#: ../src/empathy-call-window.c:2929 +msgid "On hold" +msgstr "На чекање" + +#: ../src/empathy-call-window.c:2932 +msgid "Mute" +msgstr "Без глас" + +#: ../src/empathy-call-window.c:2934 +#| msgid "Croatian" +msgid "Duration" +msgstr "Времетраење" + +#. Translators: 'status - minutes:seconds' the caller has been connected +#: ../src/empathy-call-window.c:2937 +#, c-format +msgid "%s — %d:%02dm" +msgstr "%s — %d:%02dm" + +#: ../src/empathy-call-window.c:3207 +#, c-format +msgid "Your current balance is %s." +msgstr "Вашиот моментален кредит е %s." + +#: ../src/empathy-call-window.c:3211 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "Жалам, немате доволно кредит за тој повик." + +#: ../src/empathy-call-window.c:3213 +msgid "Top Up" +msgstr "Надополни" + +#: ../libempathy-gtk/empathy-search-bar.c:243 +msgid "_Match case" +msgstr "_Разликувај големи-мали" + +#~ msgid "Enable popup when contact is available" +#~ msgstr "Овозможи скокачка порака кога контактот е достапен" +#~ msgid "Enable sound when busy" +#~ msgstr "Овозможи звуци кога сум зафатен" +#~ msgid "" +#~ "Whether or not the Salut account has been created on the first Empathy " +#~ "run." +#~ msgstr "Дали сметката на Salut е креирана на првото пуштање на Empathy." +#~ msgid "Whether or not to play sounds when busy." +#~ msgstr "Дали да се пуштаат звуци кога сте зафатени." +#~ msgid "Hidden" +#~ msgstr "Скриен" +#~ msgid "All" +#~ msgstr "Сите" +#~ msgid "Forget password and clear the entry." +#~ msgstr "Заборави ја лозинката и исчисти го полето." +#~ msgid "_Charset:" +#~ msgstr "Множество на _знаци:" +#~ msgid "Network" +#~ msgstr "Мрежа" +#~ msgid "Servers" +#~ msgstr "Сервери" +#~ msgid "Edit the selected IRC network" +#~ msgstr "Уреди ја избраната IRC мрежа" +#~ msgid "Remove the selected IRC network" +#~ msgstr "Отстрани ја избраната IRC мрежа" +#~ msgid "_Email:" +#~ msgstr "_Е-пошта:" +#~ msgid "_Nickname:" +#~ msgstr "_Прекар:" +#~ msgid "_Check Word Spelling..." +#~ msgstr "_Провери го правописот...7" +#~ msgid "Group Chat" +#~ msgstr "Групен разговор" +#~ msgid "Contact Information" +#~ msgstr "Податоци за контактот" +#~ msgid "I would like to add you to my contact list." +#~ msgstr "Би сакал да те додадам во мојата листа на контакти." +#~ msgid "Sorry, I don't want you in my contact list anymore." +#~ msgstr "Жалам, но не сакам да си во мојата листа на контакти." +#~ msgid "_View Previous Conversations" +#~ msgstr "_Прегледај ги претходните разговори" +#~ msgid "Contact" +#~ msgstr "Контакт" +#~ msgid "Groups" +#~ msgstr "Групи" +#~ msgid "Email:" +#~ msgstr "Е-пошта:" +#~ msgid "Date" +#~ msgstr "Датум" +#~ msgid "C_all" +#~ msgstr "П_овик" +#~ msgid "C_hat" +#~ msgstr "Р_азговор" +#~ msgid "Contact ID:" +#~ msgstr "ID на контактот:" +#~ msgid "Custom messages..." +#~ msgstr "Сопствени пораки..." +#~ msgid "Suggestions for the word" +#~ msgstr "Предлози за зборот" +#~ msgid "Spell Checker" +#~ msgstr "Проверка на правопис" +#~ msgid "Suggestions for the word:" +#~ msgstr "Предлози за зборот:" +#~ msgid "" +#~ "The contact to display in the applet. Empty means no contact is displayed." +#~ msgstr "" +#~ "Контактот кој ќе се прикажува во аплетот. Празно значи дека нема да се " +#~ "прикажува контакт." +#~ msgid "The contact's avatar token. Empty means contact has no avatar." +#~ msgstr "Ознака за аватарот на контактот. Празно значи без аватар." +#~ msgid "Talk!" +#~ msgstr "Зборувај!" +#~ msgid "_Information" +#~ msgstr "_Информации" +#~ msgid "_Preferences" +#~ msgstr "_Преференции" +#~ msgid "Presence" +#~ msgstr "Присуство" +#~ msgid "Set your own presence" +#~ msgstr "Поставете го Вашето присуство" +#~ msgid "" +#~ "Any associated conversations and chat rooms will NOT be removed if you " +#~ "decide to proceed.\n" +#~ "\n" +#~ "Should you decide to add the account back at a later time, they will " +#~ "still be available." +#~ msgstr "" +#~ "Сите разговори и соби за разговор кои се однесуваат на оваа сметка ќе " +#~ "бидат отстранети ако продолжите.\n" +#~ "\n" +#~ "Ако се одлучите да ја додадете сметката пак, тие повторно ќе бидат " +#~ "достапни." +#~ msgid "New Account" +#~ msgstr "Нова сметка" +#~ msgid "Cr_eate" +#~ msgstr "Кр_еирај" +#~ msgid "End this call?" +#~ msgstr "Да го завршам овој разговор?" +#~ msgid "Closing this window will end the call in progress." +#~ msgstr "Затворањето на овој прозорец ќе го заврши тековниот разговор." +#~ msgid "Readying" +#~ msgstr "Се подготвувам" +#~ msgid "" +#~ "Incoming call from %s rejected because there is already a running call." +#~ msgstr "Дојдовниот повик од %s е одбиен бидејќи моментално има друг повик." +#~ msgid "#" +#~ msgstr "#" +#~ msgid "*" +#~ msgstr "*" +#~ msgid "0" +#~ msgstr "0" +#~ msgid "1" +#~ msgstr "1" +#~ msgid "2" +#~ msgstr "2" +#~ msgid "3" +#~ msgstr "3" +#~ msgid "4" +#~ msgstr "4" +#~ msgid "5" +#~ msgstr "5" +#~ msgid "6" +#~ msgstr "6" +#~ msgid "7" +#~ msgstr "7" +#~ msgid "8" +#~ msgstr "8" +#~ msgid "9" +#~ msgstr "9" +#~ msgid "Keypad" +#~ msgstr "Тастатура за бројки" +#~ msgid "Conversations (%d)" +#~ msgstr "Разговори (%d)" +#~ msgid "Invitation _message:" +#~ msgstr "_Порака за покана:" +#~ msgid "Join room on start_up" +#~ msgstr "Приклучи се во собата при по_дигнување" +#~ msgid "Join this chat room when Empathy starts and you are connected" +#~ msgstr "" +#~ "Приклучете се во оваа соба за разговор кога Empathy се подигнува, а Вие " +#~ "сте поврзани" +#~ msgid "S_erver:" +#~ msgstr "С_ервер:" +#~ msgid "" +#~ "New message from %s:\n" +#~ "%s" +#~ msgstr "" +#~ "Нова порака од %s:\n" +#~ "%s" +#~ msgid "" +#~ "%s is offering you an invitation, but you don't have the needed external " +#~ "application to handle it." +#~ msgstr "" +#~ "%s Ви нуди покана, но ја немате потребната надворешна апликација за да се " +#~ "справите со неа." +#~ msgid "" +#~ "%s is offering you an invitation. An external application will be started " +#~ "to handle it." +#~ msgstr "" +#~ "%s Ви нуди покана. Ќе биде стартувана надворешна апликација за да се " +#~ "справи со неа." +#~ msgid "Subscription requested by %s" +#~ msgstr "Побарана е претплата од %s" +#~ msgid "Context" +#~ msgstr "Контекст" +#~ msgid "Join _New..." +#~ msgstr "Приклучи се во _нова..." +#~ msgid "_New Conversation..." +#~ msgstr "_Нов разговор..." +#~ msgid "Browse:" +#~ msgstr "Прелистај:" +#~ msgid "Join New" +#~ msgstr "Приклучи се во нова" +#~ msgid "Re_fresh" +#~ msgstr "О_свежи" +#~ msgid "" +#~ "This list represents all chat rooms hosted on the server you have entered." +#~ msgstr "" +#~ "Оваа листа ги претставува сите соби за разговор хостирани на серверот во " +#~ "кој што влеговте." +#~ msgid "Audio" +#~ msgstr "Аудио" +#~ msgid "Contact List" +#~ msgstr "Листа на контакти" +#~ msgid "Visual" +#~ msgstr "Визуелни" +#~ msgid "Avatars are user chosen images shown in the contact list" +#~ msgstr "" +#~ "Аватарите се слики избрани од корисникот прикажани во листата на контакти" +#~ msgid "Enable sounds when _busy" +#~ msgstr "Овозможи звуци кога сум _зафатен" +#~ msgid "Show _avatars" +#~ msgstr "Покажи _аватари" diff --git a/po/nb.po b/po/nb.po index 2030d49e..42907de0 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,512 +1,531 @@ -# Norwegian (bokmål) translation of empathy. +# Norwegian bokmål translation of empathy. # Copyright © 2003-2005 Free Software Foundation, Inc. -# Kjartan Maraas , 2003-2011. +# Kjartan Maraas , 2003-2012. # Sigurd Gartmann , 2005, 2006. # Torstein Adolf Winterseth , 2010. msgid "" msgstr "" "Project-Id-Version: empathy 3.3.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-24 09:31+0200\n" -"PO-Revision-Date: 2011-10-24 09:32+0200\n" +"POT-Creation-Date: 2012-02-04 12:34+0100\n" +"PO-Revision-Date: 2012-02-04 12:35+0100\n" "Last-Translator: Kjartan Maraas \n" -"Language-Team: Norwegian Bokmål \n" +"Language-Team: Norwegian bokmål \n" "Language: no\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.1\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "Prat på Google Talk, Facebook, MSN og mange andre pratetjenester" - -#: ../data/empathy.desktop.in.in.h:2 msgid "Empathy" msgstr "Empathy" +#: ../data/empathy.desktop.in.in.h:2 +msgid "IM Client" +msgstr "Lynmeldingsklient" + #: ../data/empathy.desktop.in.in.h:3 msgid "Empathy Internet Messaging" msgstr "Empathy internettmeldinger" #: ../data/empathy.desktop.in.in.h:4 -msgid "IM Client" -msgstr "Lynmeldingsklient" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "Prat på Google Talk, Facebook, MSN og mange andre pratetjenester" #: ../data/org.gnome.Empathy.gschema.xml.in.h:1 -msgid "Always open a separate chat window for new chats." -msgstr "Alltid åpne et eget vindu til nye samtaler." +msgid "Connection managers should be used" +msgstr "Tilkoblingshåndterer skal brukes" #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Samtalevolum" +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." +msgstr "Om tilkoblingshåndterere skal brukes til å koble til/fra automatisk." #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Samtalevolum, som prosent." +msgid "Empathy should auto-connect on startup" +msgstr "Empathy skal koble til automatisk ved oppstart" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -msgid "Camera device" -msgstr "Kameraenhet" +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart." #: ../data/org.gnome.Empathy.gschema.xml.in.h:5 -msgid "Camera position" -msgstr "Kameraposisjon" +msgid "Empathy should auto-away when idle" +msgstr "Empathy skal sette bortestatus automatisk ved inaktivitet" #: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." +"Whether Empathy should go into away mode automatically if the user is idle." msgstr "" -"Tegn som skal legges til etter kallenavn når fullføring av kallenavn med " -"tabulator benyttes i gruppeprat." +"Om Empathy skal bytte til bortemodus automatisk hvis bruker ikke er aktiv." #: ../data/org.gnome.Empathy.gschema.xml.in.h:7 -msgid "Chat window theme" -msgstr "Tema for samtalevindu" +msgid "Empathy default download folder" +msgstr "Forvalgt nedlastingsmappe for Empathy" #: ../data/org.gnome.Empathy.gschema.xml.in.h:8 -msgid "Chat window theme variant" -msgstr "Temavariant for samtalevindu" +msgid "The default folder to save file transfers in." +msgstr "Forvalgt mappe for lagring av filoverføringer." #: ../data/org.gnome.Empathy.gschema.xml.in.h:9 -msgid "" -"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "" -"Kommaseparert liste over stavekontrollspråk som skal brukes (f.eks \"no, en, " -"fr, nl\")." +msgid "Show offline contacts" +msgstr "Vis frakoblede kontakter" #: ../data/org.gnome.Empathy.gschema.xml.in.h:10 -msgid "Compact contact list" -msgstr "Kompakt kontaktliste" +msgid "Whether to show contacts that are offline in the contact list." +msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten." #: ../data/org.gnome.Empathy.gschema.xml.in.h:11 -msgid "Connection managers should be used" -msgstr "Tilkoblingshåndterer skal brukes" +msgid "Show avatars" +msgstr "Vis personbilder" #: ../data/org.gnome.Empathy.gschema.xml.in.h:12 -msgid "Contact list sort criterion" -msgstr "Sorteringskriterier for kontaktliste" +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer." #: ../data/org.gnome.Empathy.gschema.xml.in.h:13 -msgid "D-Bus object path of the last account selected to join a room." -msgstr "D-Bus objektsti for siste konto valgt for å bli med i et rom." +msgid "Show protocols" +msgstr "Vis protokoller" #: ../data/org.gnome.Empathy.gschema.xml.in.h:14 -msgid "Default camera device to use in video calls, e.g. /dev/video0." -msgstr "Forvalgt kameraenhet til bruk for videosamtaler. F.eks. /dev/video0." +msgid "Whether to show protocols for contacts in the contact list." +msgstr "Om protokoller for kontakter skal vises i kontaktlisten." #: ../data/org.gnome.Empathy.gschema.xml.in.h:15 -msgid "Default directory to select an avatar image from" -msgstr "Forvalgt mappe for personbilde" +msgid "Show Balance in contact list" +msgstr "Vis saldo i kontaktliste" #: ../data/org.gnome.Empathy.gschema.xml.in.h:16 -msgid "Disable popup notifications when away" -msgstr "Slå av varsling når du er borte" +msgid "Whether to show account balances in the contact list." +msgstr "Om saldo for konto skal vises i kontaktlisten." #: ../data/org.gnome.Empathy.gschema.xml.in.h:17 -msgid "Disable sounds when away" -msgstr "Slå av lyder når du er borte" +msgid "Compact contact list" +msgstr "Kompakt kontaktliste" #: ../data/org.gnome.Empathy.gschema.xml.in.h:18 -msgid "Display incoming events in the status area" -msgstr "Vis innkommende hendelser i statusområdet" +msgid "Whether to show the contact list in compact mode." +msgstr "Om kontaktlisten skal vises i kompakt modus." #: ../data/org.gnome.Empathy.gschema.xml.in.h:19 -msgid "" -"Display incoming events in the status area. If false, present them to the " -"user immediately." -msgstr "" -"Vis innkommende hendelser i statusområdet. Hvis denne er «false» vises disse " -"til bruker med det samme." +msgid "Hide main window" +msgstr "Skjul hovedvinduet" #: ../data/org.gnome.Empathy.gschema.xml.in.h:20 -msgid "Echo cancellation support" -msgstr "Støtte for utlikning av ekko" +msgid "Hide the main window." +msgstr "Skjul hovedvinduet." #: ../data/org.gnome.Empathy.gschema.xml.in.h:21 -msgid "Empathy can publish the user's location" -msgstr "Empathy kan publisere brukers plassering" +msgid "Default directory to select an avatar image from" +msgstr "Forvalgt mappe for personbilde" #: ../data/org.gnome.Empathy.gschema.xml.in.h:22 -msgid "Empathy can use the GPS to guess the location" -msgstr "Empathy kan bruke GPS til å gjette plassering" +msgid "The last directory that an avatar image was chosen from." +msgstr "Den forrige mappen et personbilde ble valgt fra." #: ../data/org.gnome.Empathy.gschema.xml.in.h:23 -msgid "Empathy can use the cellular network to guess the location" -msgstr "Empathy kan bruke mobilnettverk til å gjette plassering" +msgid "Open new chats in separate windows" +msgstr "Åpne nye samtaler i egne vinduer" #: ../data/org.gnome.Empathy.gschema.xml.in.h:24 -msgid "Empathy can use the network to guess the location" -msgstr "Empathy kan bruke nettverket til å gjette plassering" +msgid "Always open a separate chat window for new chats." +msgstr "Alltid åpne et eget vindu til nye samtaler." #: ../data/org.gnome.Empathy.gschema.xml.in.h:25 -msgid "Empathy default download folder" -msgstr "Forvalgt nedlastingsmappe for Empathy" +msgid "Display incoming events in the status area" +msgstr "Vis innkommende hendelser i statusområdet" #: ../data/org.gnome.Empathy.gschema.xml.in.h:26 -msgid "Empathy should auto-away when idle" -msgstr "Empathy skal sette bortestatus automatisk ved inaktivitet" +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." +msgstr "" +"Vis innkommende hendelser i statusområdet. Hvis denne er «false» vises disse " +"til bruker med det samme." #: ../data/org.gnome.Empathy.gschema.xml.in.h:27 -msgid "Empathy should auto-connect on startup" -msgstr "Empathy skal koble til automatisk ved oppstart" +msgid "The position for the chat window side pane" +msgstr "Posisjon for pratevinduets sidelinje" #: ../data/org.gnome.Empathy.gschema.xml.in.h:28 -msgid "Empathy should reduce the location's accuracy" -msgstr "Empathy skal redusere nøyaktighet for plasseringenseri" +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "Lagret posisjon (i pikselr) for pratevinduets sideområde." #: ../data/org.gnome.Empathy.gschema.xml.in.h:29 -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "" -"Empathy skal bruke personbildet for kontakten som ikon for pratevinduet" +msgid "Contact list sort criterion" +msgstr "Sorteringskriterier for kontaktliste" #: ../data/org.gnome.Empathy.gschema.xml.in.h:30 -msgid "Enable WebKit Developer Tools" -msgstr "Slå på utviklerverktøy for WebKit" +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." +msgstr "" +"Hvilke kriterier som skal brukes ved sortering av kontaktlisten. Forvalg er " +"å sortere kontakter etter kontaktens tilstand med verdien «state». Hvis man " +"bruker «name» vil kontaktlisten sorteres etter kontaktens navn." #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 -msgid "Enable popup notifications for new messages" -msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger" +msgid "Use notification sounds" +msgstr "Bruk varslingslyder" #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 -msgid "Enable spell checker" -msgstr "Bruk stavekontroll" +msgid "Whether to play a sound to notify of events." +msgstr "Om lyder skal spilles av for å varsle om hendelser." #: ../data/org.gnome.Empathy.gschema.xml.in.h:33 -msgid "Hide main window" -msgstr "Skjul hovedvinduet" +msgid "Disable sounds when away" +msgstr "Slå av lyder når du er borte" #: ../data/org.gnome.Empathy.gschema.xml.in.h:34 -msgid "Hide the main window." -msgstr "Skjul hovedvinduet." +msgid "Whether to play sound notifications when away or busy." +msgstr "Om lyder skal spilles av når du er borte eller opptatt." #: ../data/org.gnome.Empathy.gschema.xml.in.h:35 -msgid "Last account selected in Join Room dialog" -msgstr "Siste konto valgt i dialogen «Bli med i rom»" +msgid "Play a sound for incoming messages" +msgstr "Spill av lyd når meldinger kommer inn" #: ../data/org.gnome.Empathy.gschema.xml.in.h:36 -msgid "Nick completed character" -msgstr "Tegn for fullføring av kallenavn" +msgid "Whether to play a sound to notify of incoming messages." +msgstr "Om lyder skal spilles av for å varsle om innkommende meldinger." #: ../data/org.gnome.Empathy.gschema.xml.in.h:37 -msgid "Open new chats in separate windows" -msgstr "Åpne nye samtaler i egne vinduer" +msgid "Play a sound for outgoing messages" +msgstr "Spill av lyd for utgående meldinger" #: ../data/org.gnome.Empathy.gschema.xml.in.h:38 -msgid "Path of the Adium theme to use" -msgstr "Sti til Adium-tema som skal brukes" +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "Om lyder skal spilles av for å varsle om utgående meldinger." #: ../data/org.gnome.Empathy.gschema.xml.in.h:39 -msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium." +msgid "Play a sound for new conversations" +msgstr "Spill av lyd ved nye samtaler" #: ../data/org.gnome.Empathy.gschema.xml.in.h:40 -msgid "Play a sound for incoming messages" -msgstr "Spill av lyd når meldinger kommer inn" +msgid "Whether to play a sound to notify of new conversations." +msgstr "Om lyder skal spilles av for å varsle om nye samtaler." #: ../data/org.gnome.Empathy.gschema.xml.in.h:41 -msgid "Play a sound for new conversations" -msgstr "Spill av lyd ved nye samtaler" +msgid "Play a sound when a contact logs in" +msgstr "Spill av lyd når kontakter logger inn" #: ../data/org.gnome.Empathy.gschema.xml.in.h:42 -msgid "Play a sound for outgoing messages" -msgstr "Spill av lyd for utgående meldinger" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "" +"Om en lyd skal spilles av for å varsle om at kontakter logger inn på " +"nettverket." #: ../data/org.gnome.Empathy.gschema.xml.in.h:43 -msgid "Play a sound when a contact logs in" -msgstr "Spill av lyd når kontakter logger inn" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound when a contact logs out" msgstr "Spill av lyd når kontakter logger ut" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "" +"Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket." + #: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Play a sound when we log in" msgstr "Spill av lyd når du logger inn" #: ../data/org.gnome.Empathy.gschema.xml.in.h:46 -msgid "Play a sound when we log out" -msgstr "Spill av lyd når du logger ut" +msgid "Whether to play a sound when logging into a network." +msgstr "Om lyder skal spilles av når du logger inn på et nettverk." #: ../data/org.gnome.Empathy.gschema.xml.in.h:47 -msgid "Pop up notifications if the chat isn't focused" -msgstr "Vis varsling når prat ikke er fokusert" +msgid "Play a sound when we log out" +msgstr "Spill av lyd når du logger ut" #: ../data/org.gnome.Empathy.gschema.xml.in.h:48 -msgid "Pop up notifications when a contact logs in" -msgstr "Vis varsling når en kontakt logger inn" +msgid "Whether to play a sound when logging out of a network." +msgstr "Om lyder skal spilles av når du logger ut av et nettverk." #: ../data/org.gnome.Empathy.gschema.xml.in.h:49 -msgid "Pop up notifications when a contact logs out" -msgstr "Vis varsling når en kontakt logger ut" +msgid "Enable popup notifications for new messages" +msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger" #: ../data/org.gnome.Empathy.gschema.xml.in.h:50 -msgid "Position the camera preview should be during a call." -msgstr "Posisjon for kameraforhåndsvisning under en samtale." +msgid "Whether to show a popup notification when receiving a new message." +msgstr "Om varsling skal vises når en ny melding mottas." #: ../data/org.gnome.Empathy.gschema.xml.in.h:51 -msgid "Show Balance in contact list" -msgstr "Vis saldo i kontaktliste" +msgid "Disable popup notifications when away" +msgstr "Slå av varsling når du er borte" #: ../data/org.gnome.Empathy.gschema.xml.in.h:52 -msgid "Show avatars" -msgstr "Vis personbilder" +msgid "Whether to show popup notifications when away or busy." +msgstr "Om varsling skal vises når du er borte eller opptatt." #: ../data/org.gnome.Empathy.gschema.xml.in.h:53 -msgid "Show contact list in rooms" -msgstr "Vis kontaktliste i rom" +msgid "Pop up notifications if the chat isn't focused" +msgstr "Vis varsling når prat ikke er fokusert" #: ../data/org.gnome.Empathy.gschema.xml.in.h:54 -msgid "Show hint about closing the main window" -msgstr "Vis hint om lukking av hovedvinduet" +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" +"Om varsling skal vises når en melding mottas selv om pratevinduet er åpent " +"men ikke har fokus." #: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -msgid "Show offline contacts" -msgstr "Vis frakoblede kontakter" +msgid "Pop up notifications when a contact logs in" +msgstr "Vis varsling når en kontakt logger inn" #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 -msgid "Show protocols" -msgstr "Vis protokoller" +msgid "Whether to show a popup notification when a contact goes online." +msgstr "Om et varsel skal vises når en kontakt er kobler fra." #: ../data/org.gnome.Empathy.gschema.xml.in.h:57 -msgid "Spell checking languages" -msgstr "Stavekontrollspråk" +msgid "Pop up notifications when a contact logs out" +msgstr "Vis varsling når en kontakt logger ut" #: ../data/org.gnome.Empathy.gschema.xml.in.h:58 -msgid "The default folder to save file transfers in." -msgstr "Forvalgt mappe for lagring av filoverføringer." +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "Om varsel skal vises når en kontakt kobler fra." #: ../data/org.gnome.Empathy.gschema.xml.in.h:59 -msgid "The last directory that an avatar image was chosen from." -msgstr "Den forrige mappen et personbilde ble valgt fra." +msgid "Use graphical smileys" +msgstr "Vis smilefjes grafisk" #: ../data/org.gnome.Empathy.gschema.xml.in.h:60 -msgid "The position for the chat window side pane" -msgstr "Posisjon for pratevinduets sidelinje" +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler." #: ../data/org.gnome.Empathy.gschema.xml.in.h:61 -msgid "The stored position (in pixels) of the chat window side pane." -msgstr "Lagret posisjon (i pikselr) for pratevinduets sideområde." +msgid "Show contact list in rooms" +msgstr "Vis kontaktliste i rom" #: ../data/org.gnome.Empathy.gschema.xml.in.h:62 -msgid "The theme that is used to display the conversation in chat windows." -msgstr "Temaet som brukes til å vise samtaler." +msgid "Whether to show the contact list in chat rooms." +msgstr "Om kontaktlisten skal vises i praterom." #: ../data/org.gnome.Empathy.gschema.xml.in.h:63 -msgid "" -"The theme variant that is used to display the conversation in chat windows." -msgstr "Temavariant som brukes til å vise samtale i pratevinduer." +msgid "Chat window theme" +msgstr "Tema for samtalevindu" #: ../data/org.gnome.Empathy.gschema.xml.in.h:64 -msgid "Use graphical smileys" -msgstr "Vis smilefjes grafisk" +msgid "The theme that is used to display the conversation in chat windows." +msgstr "Temaet som brukes til å vise samtaler." #: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "Use notification sounds" -msgstr "Bruk varslingslyder" +msgid "Chat window theme variant" +msgstr "Temavariant for samtalevindu" #: ../data/org.gnome.Empathy.gschema.xml.in.h:66 -msgid "Use theme for chat rooms" -msgstr "Bruk tema for samtalerom" +msgid "" +"The theme variant that is used to display the conversation in chat windows." +msgstr "Temavariant som brukes til å vise samtale i pratevinduer." #: ../data/org.gnome.Empathy.gschema.xml.in.h:67 -msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "Om Empathy kan publisere brukers plassering til kontakter." +msgid "Path of the Adium theme to use" +msgstr "Sti til Adium-tema som skal brukes" #: ../data/org.gnome.Empathy.gschema.xml.in.h:68 -msgid "Whether Empathy can use the GPS to guess the location." -msgstr "Om Empathy kan bruke GPS for å gjette plassering." +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium." #: ../data/org.gnome.Empathy.gschema.xml.in.h:69 -msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering." +msgid "Enable WebKit Developer Tools" +msgstr "Slå på utviklerverktøy for WebKit" #: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "Whether Empathy can use the network to guess the location." -msgstr "Om Empathy kan bruke nettverket for å gjette plassering." +msgid "" +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." +msgstr "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på." #: ../data/org.gnome.Empathy.gschema.xml.in.h:71 -msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart." +msgid "Use theme for chat rooms" +msgstr "Bruk tema for samtalerom" #: ../data/org.gnome.Empathy.gschema.xml.in.h:72 -msgid "" -"Whether Empathy should go into away mode automatically if the user is idle." -msgstr "" -"Om Empathy skal bytte til bortemodus automatisk hvis bruker ikke er aktiv." +msgid "Whether to use the theme for chat rooms." +msgstr "Om tema skal brukes for praterom eller ikke." #: ../data/org.gnome.Empathy.gschema.xml.in.h:73 -msgid "" -"Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "" -"Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn." +msgid "Spell checking languages" +msgstr "Stavekontrollspråk" #: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" -"Whether Empathy should use the avatar of the contact as the chat window icon." +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" -"Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet." +"Kommaseparert liste over stavekontrollspråk som skal brukes (f.eks \"no, en, " +"fr, nl\")." #: ../data/org.gnome.Empathy.gschema.xml.in.h:75 -msgid "" -"Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på." +msgid "Enable spell checker" +msgstr "Bruk stavekontroll" #: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "" -"Whether connectivity managers should be used to automatically disconnect/" -"reconnect." -msgstr "Om tilkoblingshåndterere skal brukes til å koble til/fra automatisk." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 -msgid "" "Whether to check words typed against the languages you want to check with." msgstr "Om stavekontroll skal sjekke ord mot de språkene du ønsker å bruke." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +msgid "Nick completed character" +msgstr "Tegn for fullføring av kallenavn" + #: ../data/org.gnome.Empathy.gschema.xml.in.h:78 -msgid "Whether to convert smileys into graphical images in conversations." -msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler." +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "" +"Tegn som skal legges til etter kallenavn når fullføring av kallenavn med " +"tabulator benyttes i gruppeprat." #: ../data/org.gnome.Empathy.gschema.xml.in.h:79 -msgid "Whether to enable Pulseaudio's echo cancellation filter." -msgstr "Hvorvidt Pulseaudio's filter for utlikning av ekko skal slås på." +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "" +"Empathy skal bruke personbildet for kontakten som ikon for pratevinduet" #: ../data/org.gnome.Empathy.gschema.xml.in.h:80 -msgid "Whether to play a sound to notify of contacts logging into the network." +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" -"Om en lyd skal spilles av for å varsle om at kontakter logger inn på " -"nettverket." +"Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet." #: ../data/org.gnome.Empathy.gschema.xml.in.h:81 -msgid "" -"Whether to play a sound to notify of contacts logging out of the network." -msgstr "" -"Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket." +msgid "Last account selected in Join Room dialog" +msgstr "Siste konto valgt i dialogen «Bli med i rom»" #: ../data/org.gnome.Empathy.gschema.xml.in.h:82 -msgid "Whether to play a sound to notify of events." -msgstr "Om lyder skal spilles av for å varsle om hendelser." +msgid "D-Bus object path of the last account selected to join a room." +msgstr "D-Bus objektsti for siste konto valgt for å bli med i et rom." #: ../data/org.gnome.Empathy.gschema.xml.in.h:83 -msgid "Whether to play a sound to notify of incoming messages." -msgstr "Om lyder skal spilles av for å varsle om innkommende meldinger." +msgid "Camera device" +msgstr "Kameraenhet" #: ../data/org.gnome.Empathy.gschema.xml.in.h:84 -msgid "Whether to play a sound to notify of new conversations." -msgstr "Om lyder skal spilles av for å varsle om nye samtaler." +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "Forvalgt kameraenhet til bruk for videosamtaler. F.eks. /dev/video0." #: ../data/org.gnome.Empathy.gschema.xml.in.h:85 -msgid "Whether to play a sound to notify of outgoing messages." -msgstr "Om lyder skal spilles av for å varsle om utgående meldinger." +msgid "Camera position" +msgstr "Kameraposisjon" #: ../data/org.gnome.Empathy.gschema.xml.in.h:86 -msgid "Whether to play a sound when logging into a network." -msgstr "Om lyder skal spilles av når du logger inn på et nettverk." +msgid "Position the camera preview should be during a call." +msgstr "Posisjon for kameraforhåndsvisning under en samtale." #: ../data/org.gnome.Empathy.gschema.xml.in.h:87 -msgid "Whether to play a sound when logging out of a network." -msgstr "Om lyder skal spilles av når du logger ut av et nettverk." +msgid "Echo cancellation support" +msgstr "Støtte for utlikning av ekko" #: ../data/org.gnome.Empathy.gschema.xml.in.h:88 -msgid "Whether to play sound notifications when away or busy." -msgstr "Om lyder skal spilles av når du er borte eller opptatt." +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "Hvorvidt Pulseaudio's filter for utlikning av ekko skal slås på." #: ../data/org.gnome.Empathy.gschema.xml.in.h:89 -msgid "Whether to show a popup notification when a contact goes offline." -msgstr "Om varsel skal vises når en kontakt kobler fra." +msgid "Show hint about closing the main window" +msgstr "Vis hint om lukking av hovedvinduet" #: ../data/org.gnome.Empathy.gschema.xml.in.h:90 -msgid "Whether to show a popup notification when a contact goes online." -msgstr "Om et varsel skal vises når en kontakt er kobler fra." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." msgstr "" -"Om varsling skal vises når en melding mottas selv om pratevinduet er åpent " -"men ikke har fokus." +"Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal " +"vises." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +msgid "Empathy can publish the user's location" +msgstr "Empathy kan publisere brukers plassering" #: ../data/org.gnome.Empathy.gschema.xml.in.h:92 -msgid "Whether to show a popup notification when receiving a new message." -msgstr "Om varsling skal vises når en ny melding mottas." +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "Om Empathy kan publisere brukers plassering til kontakter." #: ../data/org.gnome.Empathy.gschema.xml.in.h:93 -msgid "Whether to show account balances in the contact list." -msgstr "Om saldo for konto skal vises i kontaktlisten." +msgid "Empathy can use the network to guess the location" +msgstr "Empathy kan bruke nettverket til å gjette plassering" #: ../data/org.gnome.Empathy.gschema.xml.in.h:94 -msgid "" -"Whether to show avatars for contacts in the contact list and chat windows." -msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer." +msgid "Whether Empathy can use the network to guess the location." +msgstr "Om Empathy kan bruke nettverket for å gjette plassering." #: ../data/org.gnome.Empathy.gschema.xml.in.h:95 -msgid "Whether to show contacts that are offline in the contact list." -msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten." +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy kan bruke mobilnettverk til å gjette plassering" #: ../data/org.gnome.Empathy.gschema.xml.in.h:96 -msgid "Whether to show popup notifications when away or busy." -msgstr "Om varsling skal vises når du er borte eller opptatt." +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering." #: ../data/org.gnome.Empathy.gschema.xml.in.h:97 -msgid "Whether to show protocols for contacts in the contact list." -msgstr "Om protokoller for kontakter skal vises i kontaktlisten." +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy kan bruke GPS til å gjette plassering" #: ../data/org.gnome.Empathy.gschema.xml.in.h:98 -msgid "Whether to show the contact list in chat rooms." -msgstr "Om kontaktlisten skal vises i praterom." +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Om Empathy kan bruke GPS for å gjette plassering." #: ../data/org.gnome.Empathy.gschema.xml.in.h:99 -msgid "Whether to show the contact list in compact mode." -msgstr "Om kontaktlisten skal vises i kompakt modus." +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy skal redusere nøyaktighet for plasseringenseri" #: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." -msgstr "" -"Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal " -"vises." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 -msgid "Whether to use the theme for chat rooms." -msgstr "Om tema skal brukes for praterom eller ikke." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 -msgid "" -"Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." +"Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" -"Hvilke kriterier som skal brukes ved sortering av kontaktlisten. Forvalg er " -"å sortere kontakter etter verdien «name». Hvis man bruker «state» vil " -"kontaktlisten sorteres etter kontaktens tilstand." +"Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn." +#. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2327 +msgid "Messaging and VoIP Accounts" +msgstr "Meldings- og VoIP-kontoer" + +#: ../data/empathy-accounts.desktop.in.in.h:2 msgid "Manage Messaging and VoIP accounts" msgstr "Håndter meldings- og VoIP-kontoer" -#. Tweak the dialog -#: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2324 -msgid "Messaging and VoIP Accounts" -msgstr "Meldings- og VoIP-kontoer" +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Ingen årsak oppgitt" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Tilstandsendring ble etterspurt" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Du avbrøt filoverføringen" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Avsender avbrøt filoverføringen" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Feil under overføring av filen" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Avsender kan ikke overføre filen" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "Ukjent årsak" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Filoverføring fullført, men filen ble korrupt" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Filoverføring støttes ikke av ekstern kontakt" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Valgt fil er ikke en vanlig fil" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Valgt fil er tom" @@ -526,171 +545,139 @@ msgstr "Samtale med %s" msgid "Call from %s" msgstr "Samtale fra %s" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "Type plugg er ikke støttet" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "Ingen årsak oppgitt" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "Tilstandsendring ble etterspurt" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "Du avbrøt filoverføringen" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "Avsender avbrøt filoverføringen" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "Feil under overføring av filen" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "Avsender kan ikke overføre filen" - -#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Ukjent årsak" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "Tilgjengelig" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "Opptatt" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "Borte" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "Usynlig" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "Frakoblet" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "Ukjent" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "Ingen årsak oppgitt" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "Status er satt til frakoblet" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Nettverksfeil" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "Autentiseringen feilet" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "Krypteringsfeil" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "Navn i bruk" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "Sertifikat ikke oppgitt" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "Stoler ikke på sertifikat" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "Sertifikat utgått" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "Sertifikat ikke aktivert" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "Feil vertsnavn i forhold til sertifikat" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "Fingeravtrykk stemmer ikke for sertifikat" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "Selvsignert sertifikat" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "Sertifikatsfeil" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "Kryptering er ikke tilgjengelig" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "Sertifikatet ikke ugyldig" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "Tilkobling nektes" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "Tilkobling kan ikke etableres" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "Tilkobling mistet" -#: ../libempathy/empathy-utils.c:354 +#: ../libempathy/empathy-utils.c:355 msgid "This resource is already connected to the server" msgstr "Denne ressursen er allerede koblet til tjeneren" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "" "Tilkoblingen er erstattet med en ny tilkobling som bruker samme ressurs" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "Kontoen eksisterer allerede på tjeneren" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "Tjeneren er for opptatt til å håndtere tilkoblingen" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "Sertifikatet er trukket tilbake" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "Sertifikatet bruker en usikker cipher-algoritme eller er kryptografisk svakt" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:369 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -698,286 +685,262 @@ msgstr "" "Lengden på tjenersertifikatet eller dybden på sertifikatkjeden på tjeneren " "oversteg grensen som settes av kryptografibiblioteket" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:373 msgid "Your software is too old" msgstr "Programvaren din er for gammel" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "Intern feil" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "Personer i nærheten" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Facebook-prat" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "%d sekund siden" msgstr[1] "%d sekunder siden" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "%d minutt siden" msgstr[1] "%d minutter siden" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "%d time siden" msgstr[1] "%d timer siden" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dag siden" msgstr[1] "%d dager siden" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d uke siden" msgstr[1] "%d uker siden" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d måned siden" msgstr[1] "%d måneder siden" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "i fremtiden" -#: ../libempathy-gtk/empathy-account-chooser.c:540 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "Alle kontoer" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Konto" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Passord" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Tjener" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Port" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:763 +#: ../libempathy-gtk/empathy-account-widget.c:815 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -msgid "My Web Accounts" -msgstr "Mine nettkontoer" - -#: ../libempathy-gtk/empathy-account-widget.c:1209 -#, c-format -msgid "The account %s is edited via %s." -msgstr "Konto %s er redigert via %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1215 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Konto %s kan ikke redigeres i Empathy." - -#: ../libempathy-gtk/empathy-account-widget.c:1234 -msgid "Launch My Web Accounts" -msgstr "Start Mine nettkontoer" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1242 -#, c-format -msgid "Edit %s" -msgstr "Rediger %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1592 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget.c:1396 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Username:" msgstr "Brukernavn:" -#: ../libempathy-gtk/empathy-account-widget.c:1910 +#: ../libempathy-gtk/empathy-account-widget.c:1708 msgid "A_pply" msgstr "_Bruk" -#: ../libempathy-gtk/empathy-account-widget.c:1940 +#: ../libempathy-gtk/empathy-account-widget.c:1737 msgid "L_og in" msgstr "L_ogg inn" -#: ../libempathy-gtk/empathy-account-widget.c:2014 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "Denne kontoen eksisterer allerede på tjeneren" -#: ../libempathy-gtk/empathy-account-widget.c:2017 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "Lag en ny konto på tjeneren" -#: ../libempathy-gtk/empathy-account-widget.c:2209 -msgid "Ca_ncel" -msgstr "A_vbryt" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2487 +#: ../libempathy-gtk/empathy-account-widget.c:2239 #, c-format msgid "%1$s on %2$s" msgstr "%1$s av %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2513 +#: ../libempathy-gtk/empathy-account-widget.c:2265 #, c-format msgid "%s Account" msgstr "%s-konto" -#: ../libempathy-gtk/empathy-account-widget.c:2517 -msgid "New account" -msgstr "Ny konto" +#: ../libempathy-gtk/empathy-account-widget.c:2269 +msgid "New account" +msgstr "Ny konto" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Pass_word:" +msgstr "_Passord:" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 +msgid "Screen _Name:" +msgstr "Skjerm_navn:" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 msgid "Example: MyScreenName" msgstr "Eksempel: MittSkjermNavn " -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 -msgid "Advanced" -msgstr "Avansert" - -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 -msgid "Pass_word:" -msgstr "_Passord:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "Husk passord" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -msgid "Remember Password" -msgstr "Husk passord" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Port:" +msgstr "_Port:" -#. remember password ticky box -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 -msgid "Remember password" -msgstr "Husk passord" - -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 -msgid "Screen _Name:" -msgstr "Skjerm_navn:" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "_Server:" +msgstr "_Tjener:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 -msgid "What is your AIM password?" -msgstr "HVa er ditt AIM-passord?" +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Advanced" +msgstr "Avansert" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 msgid "What is your AIM screen name?" msgstr "Hva er ditt skjermnavn for AIM?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 -msgid "_Port:" -msgstr "_Port:" +msgid "What is your AIM password?" +msgstr "HVa er ditt AIM-passord?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../src/empathy-new-chatroom-dialog.ui.h:9 -msgid "_Server:" -msgstr "_Tjener:" - -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "Example: username" -msgstr "Eksempel: brukernavn" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "Remember Password" +msgstr "Husk passord" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "InnloggingsI_D:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Example: username" +msgstr "Eksempel: brukernavn" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 msgid "What is your GroupWise User ID?" msgstr "Hva er din bruker-ID for GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 msgid "What is your GroupWise password?" msgstr "Hva er ditt passord for GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "ICQ _UIN:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "Example: 123456789" msgstr "Eksempel: 123456789" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "Ch_aracter set:" msgstr "Tegn_sett:" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 -msgid "ICQ _UIN:" -msgstr "ICQ _UIN:" - -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 msgid "What is your ICQ UIN?" msgstr "Hva er din UIN for ICQ?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 msgid "What is your ICQ password?" msgstr "Hva er ditt passord for ICQ?" @@ -1014,11 +977,23 @@ msgstr "Alternativer" msgid "None" msgstr "Ingen" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Network" +msgstr "Nettverk" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +msgid "Network:" +msgstr "Nettverk:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Character set:" msgstr "Tegnsett:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +msgid "Servers" +msgstr "Tjenere" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." @@ -1026,14 +1001,6 @@ msgstr "" "De fleste IRC-tjenere krever ikke et passord, så ikke oppgi et passord hvis " "du ikke er sikker." -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 -msgid "Network" -msgstr "Nettverk" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 -msgid "Network:" -msgstr "Nettverk:" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "Kallenavn:" @@ -1050,48 +1017,20 @@ msgstr "Melding ved frakobling:" msgid "Real name:" msgstr "Virkelig navn:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 -msgid "Servers" -msgstr "Tjenere" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 -msgid "What is your IRC nickname?" -msgstr "Hva er ditt kallenavn på IRC?" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Which IRC network?" msgstr "Hvilket IRC-nettverk?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "Example: user@gmail.com" -msgstr "Eksempel: bruker@gmail.com" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "Example: user@jabber.org" -msgstr "Eksempel: bruker@jabber.org" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 -msgid "Encr_yption required (TLS/SSL)" -msgstr "Kr_yptering kreves (TLS/SSL)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 -msgid "I_gnore SSL certificate errors" -msgstr "I_gnorer feil med SSL-sertifikater" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 -msgid "Override server settings" -msgstr "Overstyr innstillinger for tjener" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 -msgid "Priori_ty:" -msgstr "Priori_tet" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "What is your IRC nickname?" +msgstr "Hva er ditt kallenavn på IRC?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 -msgid "Reso_urce:" -msgstr "_Ressurs:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "What is your Facebook username?" +msgstr "Hva er ditt brukernavn for Facebook?" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/badger, enter badger.\n" @@ -1103,179 +1042,203 @@ msgstr "" "Bruk denne siden for å " "velge et brukernavn på Facebook hvis du ikke har et." -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 -msgid "Use old SS_L" -msgstr "Bruk gammel SS_L" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "What is your Facebook password?" msgstr "Hva er ditt passord for Facebook?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 -msgid "What is your Facebook username?" -msgstr "Hva er ditt brukernavn for Facebook?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "What is your Google ID?" msgstr "Hva er din Google-ID?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Example: user@gmail.com" +msgstr "Eksempel: bruker@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "What is your Google password?" msgstr "Hva er ditt passord for Google?" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +msgid "Example: user@jabber.org" +msgstr "Eksempel: bruker@jabber.org" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "I_gnore SSL certificate errors" +msgstr "I_gnorer feil med SSL-sertifikater" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +msgid "Priori_ty:" +msgstr "Priori_tet" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +msgid "Reso_urce:" +msgstr "_Ressurs:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "Encr_yption required (TLS/SSL)" +msgstr "Kr_yptering kreves (TLS/SSL)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "Use old SS_L" +msgstr "Bruk gammel SS_L" + #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "Override server settings" +msgstr "Overstyr innstillinger for tjener" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 msgid "What is your Jabber ID?" msgstr "Hva er din Jabber-ID?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 -msgid "What is your Jabber password?" -msgstr "Hva er ditt passord for Jabber?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 msgid "What is your desired Jabber ID?" msgstr "Hvilken Jabber-ID ønsker du?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +msgid "What is your Jabber password?" +msgstr "Hva er ditt passord for Jabber?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 msgid "What is your desired Jabber password?" msgstr "Hvilket passord ønsker du for Jabber?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 msgid "Example: user@hotmail.com" msgstr "Eksempel: bruker@hotmail.com" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 msgid "What is your Windows Live ID?" msgstr "Hva er din ID på Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 msgid "What is your Windows Live password?" msgstr "Hva er ditt passord for Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "E-_mail address:" -msgstr "E-_postadresse:" - -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 msgid "Nic_kname:" msgstr "_Kallenavn:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "_Last Name:" +msgstr "_Etternavn:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 msgid "_First Name:" msgstr "_Fornavn:" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +msgid "_Published Name:" +msgstr "_Publisert navn:" + #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Jabber ID:" msgstr "_Jabber-ID:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 -msgid "_Last Name:" -msgstr "_Etternavn:" +msgid "E-_mail address:" +msgstr "E-_postadresse:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -msgid "_Published Name:" -msgstr "_Publisert navn:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "_Username:" +msgstr "Br_ukernavn:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Example: user@my.sip.server" msgstr "Eksempel: bruker@min.sip.server" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "Authentication username:" -msgstr "Brukernavn for autentisering:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover Binding" -msgstr "Oppdag binding" - #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "Discover the STUN server automatically" -msgstr "Søk opp STUN-tjener automatisk" +msgid "Use this account to call _landlines and mobile phones" +msgstr "Bruk denne kontoen til å ringe opp fasttelefoner og mobiltelefoner" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 -msgid "Ignore TLS Errors" -msgstr "Overse TLS-feil" +msgid "NAT Traversal Options" +msgstr "Alternativer for NAT" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "Interval (seconds)" -msgstr "Intervall (sekunder)" +msgid "Proxy Options" +msgstr "Alternativer for proxy" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -msgid "Keep-Alive Options" -msgstr "Alternativer for Keep-Alive" +msgid "Miscellaneous Options" +msgstr "Forskjellige alternativer" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 -msgid "Loose Routing" -msgstr "Løs ruting" +msgid "STUN Server:" +msgstr "STUN-tjener:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 -msgid "Mechanism:" -msgstr "Mekanisme:" +msgid "Discover the STUN server automatically" +msgstr "Søk opp STUN-tjener automatisk" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 -msgid "Miscellaneous Options" -msgstr "Forskjellige alternativer" +msgid "Discover Binding" +msgstr "Oppdag binding" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -msgid "NAT Traversal Options" -msgstr "Alternativer for NAT" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "Tjener:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Keep-Alive Options" +msgstr "Alternativer for Keep-Alive" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 -msgid "Port:" -msgstr "Port:" +msgid "Mechanism:" +msgstr "Mekanisme:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 -msgid "Proxy Options" -msgstr "Alternativer for proxy" +msgid "Interval (seconds)" +msgstr "Intervall (sekunder)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Authentication username:" +msgstr "Brukernavn for autentisering:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Transport:" +msgstr "Transport:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -msgid "STUN Server:" -msgstr "STUN-tjener:" +msgid "Loose Routing" +msgstr "Løs ruting" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 -msgid "Server:" -msgstr "Tjener:" +msgid "Ignore TLS Errors" +msgstr "Overse TLS-feil" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -msgid "Transport:" -msgstr "Transport:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -msgid "Use this account to call _landlines and mobile phones" -msgstr "Bruk denne kontoen til å ringe opp fasttelefoner og mobiltelefoner" +msgid "Port:" +msgstr "Port:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 -msgid "What is your SIP account password?" -msgstr "Hva er passordet for din SIP-konto?" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Hva er din påloggings-ID for SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 -msgid "_Username:" -msgstr "Br_ukernavn:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP account password?" +msgstr "Hva er passordet for din SIP-konto?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Yahoo! I_D:" +msgstr "Yahoo!-I_D:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "I_gnore conference and chat room invitations" msgstr "I_gnorer invitasjoner til konferanser og praterom" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Room List locale:" +msgstr "Locale for _romliste:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "What is your Yahoo! ID?" msgstr "Hva er din Yahoo!-ID?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "What is your Yahoo! password?" msgstr "Hva er ditt passord for Yahoo!?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "Yahoo! I_D:" -msgstr "Yahoo!-I_D:" - -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 -msgid "_Room List locale:" -msgstr "Locale for _romliste:" - #: ../libempathy-gtk/empathy-avatar-chooser.c:471 #: ../libempathy-gtk/empathy-avatar-chooser.c:556 msgid "Couldn't convert image" @@ -1338,40 +1301,40 @@ msgstr "Nødsamtaler er ikke støttet på denne protokollen" msgid "You don't have enough credit in order to place this call" msgstr "Du har ikke nok kreditt til å starte denne samtalen" -#: ../libempathy-gtk/empathy-chat.c:706 +#: ../libempathy-gtk/empathy-chat.c:710 msgid "Failed to open private chat" msgstr "Klarte ikke å åpne privat prat" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:768 msgid "Topic not supported on this conversation" msgstr "Emne er ikke støttet for denne samtalen" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:774 msgid "You are not allowed to change the topic" msgstr "Du har ikke lov til å bytte emne" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:973 #, c-format msgid "“%s” is not a valid contact ID" msgstr "«%s» er ikke en gyldig kontakt-ID" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1068 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: tøm alle meldinger fra aktiv samtale" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/topic : set the topic of the current conversation" msgstr "/topic : sett emne for aktiv samtale" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1074 msgid "/join : join a new chat room" msgstr "/join : bli med i et nytt praterom" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1077 msgid "/j : join a new chat room" msgstr "/j : bli med i et nytt praterom" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "" "/part [] []: leave the chat room, by default the " "current one" @@ -1379,23 +1342,23 @@ msgstr "" "/part [] [<årsak>]: forlat praterommet, forvalg er det aktive " "rommet" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/query []: open a private chat" msgstr "/query []: åpne en privat samtale" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/msg : open a private chat" msgstr "/msg : åpne en privat samtale" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/nick : change your nickname on the current server" msgstr "/nick : bytt kallenavn på denne tjeneren" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/me : send an ACTION message to the current conversation" msgstr "/me : send en HANDLINGS-melding til aktiv samtale" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1097 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1405,11 +1368,11 @@ msgstr "" "sende en melding som starter med tegnet «/». For eksempel: «/say /join " "brukes til å bli med i et nytt praterom»" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "/whois : display information about a contact" msgstr "/whois : vis informasjon om en kontakt" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1105 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1417,120 +1380,126 @@ msgstr "" "/help []: vis alle støttede kommandoer. Vis hjelp for " "hvis den er definert." -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1124 #, c-format msgid "Usage: %s" msgstr "Bruk: %s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1169 msgid "Unknown command" msgstr "Ukjent kommando" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1295 msgid "Unknown command; see /help for the available commands" msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1541 msgid "insufficient balance to send message" msgstr "ikke nok kreditt til å sende melding" -#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559 +#: ../libempathy-gtk/empathy-chat.c:1622 #, c-format msgid "Error sending message '%s': %s" msgstr "Feil ved sending av melding «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564 +#: ../libempathy-gtk/empathy-chat.c:1626 #, c-format msgid "Error sending message: %s" msgstr "Feil ved sending av melding: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1469 +#: ../libempathy-gtk/empathy-chat.c:1553 #, c-format msgid "insufficient balance to send message. Top up." msgstr "ikke nok kreditt til å sende melding. Fyll på." -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1593 msgid "not capable" msgstr "ikke kapabel" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1600 msgid "offline" msgstr "frakoblet" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1603 msgid "invalid contact" msgstr "ugyldig kontakt" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1606 msgid "permission denied" msgstr "tilgang nektet" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1609 msgid "too long message" msgstr "meldingen er for lang" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "not implemented" msgstr "ikke implementert" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "unknown" msgstr "ukjent" -#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "Emne:" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1698 #, c-format msgid "Topic set to: %s" -msgstr "Emnet er satt til: %s" +msgstr "Emne satt til: %s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1700 +#, c-format +msgid "Topic set by %s to: %s" +msgstr "Emne satt av %s til: %s" + +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1705 msgid "No topic defined" msgstr "Emne ikke definert" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2221 msgid "(No Suggestions)" msgstr "(Ingen forslag)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2289 #, c-format msgid "Add '%s' to Dictionary" msgstr "Legg til «%s» i ordboken" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2326 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Legg til «%s» i ordbok for %s" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2396 msgid "Insert Smiley" msgstr "Sett inn smilefjes" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 -#: ../libempathy-gtk/empathy-ui-utils.c:1843 +#: ../libempathy-gtk/empathy-chat.c:2414 +#: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "_Send" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2373 +#: ../libempathy-gtk/empathy-chat.c:2471 msgid "_Spelling Suggestions" msgstr "_Staveforslag" -#: ../libempathy-gtk/empathy-chat.c:2462 +#: ../libempathy-gtk/empathy-chat.c:2560 msgid "Failed to retrieve recent logs" msgstr "Klarte ikke å hente siste logger" -#: ../libempathy-gtk/empathy-chat.c:2599 +#: ../libempathy-gtk/empathy-chat.c:2699 #, c-format msgid "%s has disconnected" msgstr "%s har koblet fra" @@ -1538,12 +1507,12 @@ msgstr "%s har koblet fra" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2606 +#: ../libempathy-gtk/empathy-chat.c:2706 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s ble sparket av %2$s" -#: ../libempathy-gtk/empathy-chat.c:2609 +#: ../libempathy-gtk/empathy-chat.c:2709 #, c-format msgid "%s was kicked" msgstr "%s ble sparket" @@ -1551,17 +1520,17 @@ msgstr "%s ble sparket" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2617 +#: ../libempathy-gtk/empathy-chat.c:2717 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s ble bannlyst av %2$s" -#: ../libempathy-gtk/empathy-chat.c:2620 +#: ../libempathy-gtk/empathy-chat.c:2720 #, c-format msgid "%s was banned" msgstr "%s ble bannlyst" -#: ../libempathy-gtk/empathy-chat.c:2624 +#: ../libempathy-gtk/empathy-chat.c:2724 #, c-format msgid "%s has left the room" msgstr "%s har forlatt rommet" @@ -1571,17 +1540,17 @@ msgstr "%s har forlatt rommet" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2633 +#: ../libempathy-gtk/empathy-chat.c:2733 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2658 +#: ../libempathy-gtk/empathy-chat.c:2758 #, c-format msgid "%s has joined the room" msgstr "%s har blitt med i rommet" -#: ../libempathy-gtk/empathy-chat.c:2683 +#: ../libempathy-gtk/empathy-chat.c:2783 #, c-format msgid "%s is now known as %s" msgstr "%s er nå kjent som %s" @@ -1589,89 +1558,90 @@ msgstr "%s er nå kjent som %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2836 -#: ../src/empathy-streamed-media-window.c:1895 -#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1535 -#: ../src/empathy-call-window.c:1585 ../src/empathy-call-window.c:2631 +#: ../libempathy-gtk/empathy-chat.c:2970 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "Koblet fra" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3482 +#: ../libempathy-gtk/empathy-chat.c:3634 msgid "Would you like to store this password?" msgstr "Vil du lagre dette passordet?" -#: ../libempathy-gtk/empathy-chat.c:3488 +#: ../libempathy-gtk/empathy-chat.c:3640 msgid "Remember" msgstr "Husk" -#: ../libempathy-gtk/empathy-chat.c:3498 +#: ../libempathy-gtk/empathy-chat.c:3650 msgid "Not now" msgstr "Ikke nå" -#: ../libempathy-gtk/empathy-chat.c:3542 +#: ../libempathy-gtk/empathy-chat.c:3694 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Prøv igjen" -#: ../libempathy-gtk/empathy-chat.c:3546 +#: ../libempathy-gtk/empathy-chat.c:3698 msgid "Wrong password; please try again:" msgstr "Feil passord; vennligst prøv igjen:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3676 +#: ../libempathy-gtk/empathy-chat.c:3828 msgid "This room is protected by a password:" msgstr "Dette rommet er beskyttet med et passord:" -#: ../libempathy-gtk/empathy-chat.c:3703 +#: ../libempathy-gtk/empathy-chat.c:3855 msgid "Join" msgstr "Bli med" -#: ../libempathy-gtk/empathy-chat.c:3891 ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Koblet til" -#: ../libempathy-gtk/empathy-chat.c:3946 +#: ../libempathy-gtk/empathy-chat.c:4102 msgid "Conversation" msgstr "Samtale" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3951 +#: ../libempathy-gtk/empathy-chat.c:4107 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Ukjent eller ugyldig identifikator" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Blokkering av kontakter midlertidig utilgjengelig" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Blokkering av kontakter er ikke tilgjengelig" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Tilgang nektet" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Kunne ikke blokkere kontakt" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Rediger blokkerte kontakter" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1441 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "Account:" msgstr "Konto:" @@ -1681,473 +1651,363 @@ msgstr "Blokkerte kontakter" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:2 #: ../src/empathy-chatrooms-window.ui.h:3 msgid "Remove" msgstr "Fjern" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "_Kopier lenkens adresse" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 +#: ../libempathy-gtk/empathy-chat-text-view.c:329 #: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "_Åpne lenke" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:417 msgid "%A %B %d %Y" msgstr "%A %d %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Endre kontaktinformasjon" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 -msgid "Personal Information" -msgstr "Personlig informasjon" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "Ny kontakt" -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "Blokker %s?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "Er du sikker på at du vil blokkere «%s» fra å kontakte deg igjen?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 msgid "_Block" msgstr "_Blokker" -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Rapporter denne kontakten" msgstr[1] "_Rapporter disse kontaktene" #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "A_vgjør senere" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "Abonnementsforespørsel" -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "_Block User" msgstr "_Blokker bruker" -#: ../libempathy-gtk/empathy-contact-list-view.c:1935 -#: ../libempathy-gtk/empathy-individual-view.c:2375 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Vil du virkelig fjerne gruppen «%s»?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1937 -#: ../libempathy-gtk/empathy-individual-view.c:2378 -msgid "Removing group" -msgstr "Fjerner gruppe" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-contact-list-view.c:2063 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 -msgid "_Remove" -msgstr "Fje_rn" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2016 -#: ../libempathy-gtk/empathy-individual-view.c:2500 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Vil du virkelig fjerne kontakten «%s»?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2018 -#: ../libempathy-gtk/empathy-individual-view.c:2521 -msgid "Removing contact" -msgstr "Fjerner kontakt" - -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "_Legg til kontakt …" - -#: ../libempathy-gtk/empathy-contact-menu.c:292 -msgid "_Block Contact" -msgstr "_Blokker kontakt" - -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:321 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../libempathy-gtk/empathy-new-message-dialog.c:320 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "_Prat" - -#: ../libempathy-gtk/empathy-contact-menu.c:353 -#: ../libempathy-gtk/empathy-individual-menu.c:850 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Lydsamtale" - -#: ../libempathy-gtk/empathy-contact-menu.c:386 -#: ../libempathy-gtk/empathy-individual-menu.c:895 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Videosamtale" - -#: ../libempathy-gtk/empathy-contact-menu.c:432 -#: ../libempathy-gtk/empathy-individual-menu.c:948 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "_Tidligere samtaler" - -#: ../libempathy-gtk/empathy-contact-menu.c:454 -#: ../libempathy-gtk/empathy-individual-menu.c:989 -msgid "Send File" -msgstr "Send fil" - -#: ../libempathy-gtk/empathy-contact-menu.c:477 -#: ../libempathy-gtk/empathy-individual-menu.c:1031 -msgid "Share My Desktop" -msgstr "Del mitt skrivebord" - -#: ../libempathy-gtk/empathy-contact-menu.c:506 -#: ../libempathy-gtk/empathy-individual-menu.c:1094 -msgid "Infor_mation" -msgstr "Infor_masjon" - -#: ../libempathy-gtk/empathy-contact-menu.c:552 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "R_ediger" - -#: ../libempathy-gtk/empathy-contact-menu.c:606 -#: ../libempathy-gtk/empathy-individual-menu.c:1285 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Inviterer deg til dette rommet" - -#: ../libempathy-gtk/empathy-contact-menu.c:637 -#: ../libempathy-gtk/empathy-individual-menu.c:1331 -msgid "_Invite to Chat Room" -msgstr "_Inviter til praterom" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "Decide _Later" +msgstr "A_vgjør senere" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Søk i kontakter" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Søk: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "_Legg til kontakt" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Ingen kontakter funnet" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "Melding der du introduserer deg selv:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "Vennligst la meg så når du er tilkoblet. Takk!" -#: ../libempathy-gtk/empathy-contact-widget.c:502 +#: ../libempathy-gtk/empathy-contact-widget.c:568 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Kanaler:" -#: ../libempathy-gtk/empathy-contact-widget.c:797 -#: ../libempathy-gtk/empathy-individual-widget.c:421 +#: ../libempathy-gtk/empathy-contact-widget.c:748 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "ISO-kode for land:" -#: ../libempathy-gtk/empathy-contact-widget.c:799 -#: ../libempathy-gtk/empathy-individual-widget.c:423 +#: ../libempathy-gtk/empathy-contact-widget.c:750 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Land:" -#: ../libempathy-gtk/empathy-contact-widget.c:801 -#: ../libempathy-gtk/empathy-individual-widget.c:425 +#: ../libempathy-gtk/empathy-contact-widget.c:752 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Tilstand:" -#: ../libempathy-gtk/empathy-contact-widget.c:803 -#: ../libempathy-gtk/empathy-individual-widget.c:427 +#: ../libempathy-gtk/empathy-contact-widget.c:754 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "By:" -#: ../libempathy-gtk/empathy-contact-widget.c:805 -#: ../libempathy-gtk/empathy-individual-widget.c:429 +#: ../libempathy-gtk/empathy-contact-widget.c:756 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Område:" -#: ../libempathy-gtk/empathy-contact-widget.c:807 -#: ../libempathy-gtk/empathy-individual-widget.c:431 +#: ../libempathy-gtk/empathy-contact-widget.c:758 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Postkode:" -#: ../libempathy-gtk/empathy-contact-widget.c:809 -#: ../libempathy-gtk/empathy-individual-widget.c:433 +#: ../libempathy-gtk/empathy-contact-widget.c:760 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Gate:" -#: ../libempathy-gtk/empathy-contact-widget.c:811 -#: ../libempathy-gtk/empathy-individual-widget.c:435 +#: ../libempathy-gtk/empathy-contact-widget.c:762 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Bygning:" -#: ../libempathy-gtk/empathy-contact-widget.c:813 -#: ../libempathy-gtk/empathy-individual-widget.c:437 +#: ../libempathy-gtk/empathy-contact-widget.c:764 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Etasje:" -#: ../libempathy-gtk/empathy-contact-widget.c:815 -#: ../libempathy-gtk/empathy-individual-widget.c:439 +#: ../libempathy-gtk/empathy-contact-widget.c:766 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Rom:" -#: ../libempathy-gtk/empathy-contact-widget.c:817 -#: ../libempathy-gtk/empathy-individual-widget.c:441 +#: ../libempathy-gtk/empathy-contact-widget.c:768 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Tekst:" -#: ../libempathy-gtk/empathy-contact-widget.c:819 -#: ../libempathy-gtk/empathy-individual-widget.c:443 +#: ../libempathy-gtk/empathy-contact-widget.c:770 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Beskrivelse:" -#: ../libempathy-gtk/empathy-contact-widget.c:821 -#: ../libempathy-gtk/empathy-individual-widget.c:445 +#: ../libempathy-gtk/empathy-contact-widget.c:772 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:823 -#: ../libempathy-gtk/empathy-individual-widget.c:447 +#: ../libempathy-gtk/empathy-contact-widget.c:774 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Nøyaktighetsnivå:" -#: ../libempathy-gtk/empathy-contact-widget.c:825 -#: ../libempathy-gtk/empathy-individual-widget.c:449 +#: ../libempathy-gtk/empathy-contact-widget.c:776 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Feil:" -#: ../libempathy-gtk/empathy-contact-widget.c:827 -#: ../libempathy-gtk/empathy-individual-widget.c:451 +#: ../libempathy-gtk/empathy-contact-widget.c:778 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Vertikal feil (meter):" -#: ../libempathy-gtk/empathy-contact-widget.c:829 -#: ../libempathy-gtk/empathy-individual-widget.c:453 +#: ../libempathy-gtk/empathy-contact-widget.c:780 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Horisontal feil (meter):" -#: ../libempathy-gtk/empathy-contact-widget.c:831 -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-contact-widget.c:782 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Hastighet:" -#: ../libempathy-gtk/empathy-contact-widget.c:833 -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-contact-widget.c:784 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Retning:" -#: ../libempathy-gtk/empathy-contact-widget.c:835 -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-contact-widget.c:786 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Klatrehastighet:" -#: ../libempathy-gtk/empathy-contact-widget.c:837 -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-contact-widget.c:788 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Sist oppdatert:" -#: ../libempathy-gtk/empathy-contact-widget.c:839 -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-contact-widget.c:790 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Lengdegrad:" -#: ../libempathy-gtk/empathy-contact-widget.c:841 -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-contact-widget.c:792 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Breddegrad:" -#: ../libempathy-gtk/empathy-contact-widget.c:843 -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-contact-widget.c:794 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Høyde:" -#: ../libempathy-gtk/empathy-contact-widget.c:896 -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:559 -#: ../libempathy-gtk/empathy-individual-widget.c:574 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:847 +#: ../libempathy-gtk/empathy-contact-widget.c:862 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:35 msgid "Location" msgstr "Sted" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:576 +#: ../libempathy-gtk/empathy-contact-widget.c:864 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:965 -#: ../libempathy-gtk/empathy-individual-widget.c:625 +#: ../libempathy-gtk/empathy-contact-widget.c:916 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y, %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1047 -#: ../libempathy-gtk/empathy-individual-widget.c:867 +#: ../libempathy-gtk/empathy-contact-widget.c:998 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Lagre personbilder" -#: ../libempathy-gtk/empathy-contact-widget.c:1103 -#: ../libempathy-gtk/empathy-individual-widget.c:925 +#: ../libempathy-gtk/empathy-contact-widget.c:1054 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Kan ikke lagre personbilde" -#: ../libempathy-gtk/empathy-contact-widget.c:1787 -#: ../libempathy-gtk/empathy-individual-menu.c:1066 -#: ../libempathy-gtk/empathy-individual-widget.c:1324 -msgid "Favorite" -msgstr "Favoritt" - -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 msgid "Full name" msgstr "Fullt navn" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 msgid "Phone number" msgstr "Telefonnummer" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 msgid "E-mail address" msgstr "E-postadresse" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Website" msgstr "Nettsted" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Birthday" msgstr "Fødselsdag" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Last seen:" msgstr "Sist sett:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 msgid "Connected from:" msgstr "Tilkoblet fra:" #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 msgid "Away message:" msgstr "Bortemelding:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "work" msgstr "arbeid" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 msgid "home" msgstr "hjemme" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 msgid "mobile" msgstr "mobil" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 msgid "voice" msgstr "tale" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 msgid "preferred" msgstr "foretrukket" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 msgid "postal" msgstr "post" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 msgid "parcel" msgstr "pakke" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -msgid "Location at (date)\t" -msgstr "Plassering (dato)\t" +#. Identifier to connect to Instant Messaging network +#. Translators: Identifier to connect to Instant Messaging network +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 +msgid "Identifier:" +msgstr "Identifikator:" #. Alias -#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1260 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "Alias:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "Client Information" -msgstr "Klientinformasjon" - #: ../libempathy-gtk/empathy-contact-widget.ui.h:5 -msgid "Client:" -msgstr "Klient:" +msgid "Location at (date)\t" +msgstr "Plassering (dato)\t" #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" msgstr "Kontaktdetaljer" -#. Identifier to connect to Instant Messaging network -#. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1469 -msgid "Identifier:" -msgstr "Identifikator:" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 msgid "Information requested…" msgstr "Forespurt informasjon …" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Client Information" +msgstr "Klientinformasjon" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "OS:" msgstr "OS:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Version:" msgstr "Versjon:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Client:" +msgstr "Klient:" + +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "Grupper" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2155,105 +2015,186 @@ msgstr "" "Velg gruppene du ønsker at denne kontakten skal vises i. Du kan velge flere " "eller ingen." -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "_Legg til gruppe" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Velg" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1967 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1951 msgid "Group" msgstr "Gruppe" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Følgende identitet vil bli blokkert:" msgstr[1] "Følgende identiteter vil bli blokkert:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Følgende identitet kan ikke blokkeres:" msgstr[1] "Følgende identiteter kan ikke blokkeres:" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Endre kontaktinformasjon" + #. Translators: the heading at the top of the Information dialogue #: ../libempathy-gtk/empathy-individual-information-dialog.c:288 msgid "Linked Contacts" msgstr "Koblede kontakter" -#: ../libempathy-gtk/empathy-individual-linker.c:370 +#: ../libempathy-gtk/empathy-individual-linker.c:372 msgid "Select contacts to link" msgstr "Velg kontakter som skal kobles" -#: ../libempathy-gtk/empathy-individual-linker.c:444 +#: ../libempathy-gtk/empathy-individual-linker.c:447 msgid "New contact preview" msgstr "Forhåndsvisning av ny kontakt" -#: ../libempathy-gtk/empathy-individual-linker.c:488 +#: ../libempathy-gtk/empathy-individual-linker.c:491 msgid "Contacts selected in the list on the left will be linked together." msgstr "Kontakter som velges i listen til venstre vil bli koblet sammen." #. 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:145 +#: ../libempathy-gtk/empathy-individual-menu.c:181 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:363 msgid "Select account to use to place the call" msgstr "Velg en konto til bruk for samtalen" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 -#: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1300 -#: ../src/empathy-call-window.ui.h:2 +#: ../libempathy-gtk/empathy-individual-menu.c:367 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "Ring" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:432 msgid "Mobile" msgstr "Mobil" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:434 msgid "Work" msgstr "Arbeid" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:436 msgid "HOME" msgstr "Hjemme" +#: ../libempathy-gtk/empathy-individual-menu.c:677 +msgid "_Block Contact" +msgstr "_Blokker kontakt" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:1 +msgid "_Chat" +msgstr "_Prat" + #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:805 -#: ../libempathy-gtk/empathy-new-message-dialog.c:314 +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1143 +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Lydsamtale" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Videosamtale" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-roster-window-menubar.ui.h:4 +msgid "_Previous Conversations" +msgstr "_Tidligere samtaler" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +msgid "Send File" +msgstr "Send fil" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "Del mitt skrivebord" + +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Favoritt" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "Infor_masjon" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "R_ediger" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1169 +#: ../libempathy-gtk/empathy-individual-menu.c:1385 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "Koble kontakter …" -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1166 +msgid "Inviting you to this room" +msgstr "Inviterer deg til dette rommet" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +msgid "_Invite to Chat Room" +msgstr "_Inviter til praterom" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-roster-window-menubar.ui.h:5 +msgid "_Add Contact…" +msgstr "_Legg til kontakt …" + +#: ../libempathy-gtk/empathy-individual-view.c:2307 msgid "Delete and _Block" msgstr "Slett og _blokker" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +#: ../libempathy-gtk/empathy-individual-view.c:2342 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Vil du virkelig fjerne gruppen «%s»?" + +#: ../libempathy-gtk/empathy-individual-view.c:2345 +msgid "Removing group" +msgstr "Fjerner gruppe" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2400 +#: ../libempathy-gtk/empathy-individual-view.c:2617 +msgid "_Remove" +msgstr "Fje_rn" + +#: ../libempathy-gtk/empathy-individual-view.c:2477 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Vil du virkelig fjerne kontakten «%s»?" + +#: ../libempathy-gtk/empathy-individual-view.c:2486 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2262,7 +2203,11 @@ msgstr "" "Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle " "kontaktene den lenkede kontakten består av." -#: ../libempathy-gtk/empathy-individual-widget.c:1608 +#: ../libempathy-gtk/empathy-individual-view.c:2498 +msgid "Removing contact" +msgstr "Fjerner kontakt" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2273,23 +2218,23 @@ msgstr[1] "Lenket kontakt som inneholder %u kontakter" msgid "Location at (date)" msgstr "Plassering (dato)" -#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 msgid "Online from a phone or mobile device" msgstr "Tilkoblet fra en telefon eller mobil enhet" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "Nytt nettverk" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "Velg et IRC-nettverk" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "Nullstill _nettverksliste" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Velg" @@ -2345,245 +2290,251 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "_Fjern kobling" -#: ../libempathy-gtk/empathy-log-window.c:634 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Historikk" -#: ../libempathy-gtk/empathy-log-window.c:689 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Vis" -#: ../libempathy-gtk/empathy-log-window.c:711 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Søk" -#: ../libempathy-gtk/empathy-log-window.c:1159 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Prat i %s" -#: ../libempathy-gtk/empathy-log-window.c:1161 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Prat med %s" -#: ../libempathy-gtk/empathy-log-window.c:1211 -#: ../libempathy-gtk/empathy-log-window.c:1358 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e %B %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1300 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1306 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s sekund" msgstr[1] "%s sekunder" -#: ../libempathy-gtk/empathy-log-window.c:1389 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s minutt" msgstr[1] "%s minutter" -#: ../libempathy-gtk/empathy-log-window.c:1397 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Samtalen tok %s, avsluttet %s" -#: ../libempathy-gtk/empathy-log-window.c:1729 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "I dag" -#: ../libempathy-gtk/empathy-log-window.c:1733 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "I går" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1748 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e %B %Y" #: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3444 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Når som helst" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2372 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Hvem som helst" -#: ../libempathy-gtk/empathy-log-window.c:2685 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Hvem" -#: ../libempathy-gtk/empathy-log-window.c:2889 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Når" -#: ../libempathy-gtk/empathy-log-window.c:3005 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Hva som helst" -#: ../libempathy-gtk/empathy-log-window.c:3007 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Tekstsamtaler" -#: ../libempathy-gtk/empathy-log-window.c:3009 -#: ../src/empathy-preferences.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "Samtaler" -#: ../libempathy-gtk/empathy-log-window.c:3014 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Innkommende samtaler" -#: ../libempathy-gtk/empathy-log-window.c:3015 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Utgående samtaler" -#: ../libempathy-gtk/empathy-log-window.c:3016 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Tapte samtaler" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Hva" -#: ../libempathy-gtk/empathy-log-window.c:3747 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Er du sikker på at du vil slette alle logger av tidligere samtaler?" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Tøm alle" -#: ../libempathy-gtk/empathy-log-window.c:3758 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Slett fra:" #: ../libempathy-gtk/empathy-log-window.ui.h:1 -msgid "Loading..." -msgstr "Laster …" +msgid "_File" +msgstr "_Fil" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 -#: ../src/empathy-chat-window.ui.h:3 -msgid "Chat" -msgstr "Prat" +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:12 +msgid "_Edit" +msgstr "_Rediger" -#: ../libempathy-gtk/empathy-log-window.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Delete All History..." msgstr "Slett all historikk …" -#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "Profile" msgstr "Profil" -#: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:20 -msgid "Video" -msgstr "Video" +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:19 +msgid "Chat" +msgstr "Prat" #: ../libempathy-gtk/empathy-log-window.ui.h:7 -#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 -msgid "_Edit" -msgstr "_Rediger" +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "Video" +msgstr "Video" #: ../libempathy-gtk/empathy-log-window.ui.h:8 -msgid "_File" -msgstr "_Fil" - -#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "side 2" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "Loading..." +msgstr "Laster …" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "Kontakten er koblet fra" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 msgid "The specified contact is either invalid or unknown" msgstr "Valgt kontakt er ugyldig eller ukjent" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" msgstr "Kontakten støtter ikke denne type samtale" -#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 msgid "The requested functionality is not implemented for this protocol" msgstr "Forespurt funksjonalitet er ikke implementert for denne protokollen" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 msgid "Could not start a conversation with the given contact" msgstr "Kunne ikke starte en samtale med oppgitt kontakt" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "Du er bannlyst fra denne kanalen" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "Kanalen er full" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 msgid "You must be invited to join this channel" msgstr "Du må bli invitert til å bli med i denne kanalen" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" msgstr "Kan ikke fortsette da du er koblet fra" -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "Tilgang nektet" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "Det oppsto en feil ved start av samtalen" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "Oppgi en kontaktidentifikator eller telefonnummer:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:334 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Ny samtale" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:226 +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "_Video Call" msgstr "_Videosamtale" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:236 +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 msgid "_Audio Call" msgstr "_Lydsamtale" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:246 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Ny samtale" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Autentiseringen feilet for konto %s" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2620,12 +2571,8 @@ msgstr "Klikk for å gjøre denne statusen til en favoritt" msgid "Set status" msgstr "Sett status" -#: ../libempathy-gtk/empathy-presence-chooser.c:943 -msgid "Set your presence and current status" -msgstr "Sett din tilstedeværelse og aktiv status" - #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1131 +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 msgid "Custom messages…" msgstr "Egendefinerte meldinger …" @@ -2643,20 +2590,20 @@ msgid "Find:" msgstr "Finn:" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -msgid "Mat_ch case" -msgstr "_Skill mellom små/store bokstaver" +msgid "_Previous" +msgstr "_Forrige" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Phrase not found" -msgstr "Teksten ble ikke funnet" - -#: ../libempathy-gtk/empathy-search-bar.ui.h:4 msgid "_Next" msgstr "_Neste" +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "Mat_ch case" +msgstr "_Skill mellom små/store bokstaver" + #: ../libempathy-gtk/empathy-search-bar.ui.h:5 -msgid "_Previous" -msgstr "_Forrige" +msgid "Phrase not found" +msgstr "Teksten ble ikke funnet" #: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" @@ -2702,12 +2649,12 @@ msgstr "Samtale avsluttet" msgid "Edit Custom Messages" msgstr "Rediger egendefinerte meldinger" -#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "Melding redigert %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1752 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "Normal" @@ -2789,30 +2736,34 @@ msgid "Continue" msgstr "Fortsett" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "Tilkobling uten tillit" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Denne tilkoblingen er ikke tiltrodd. Vil du fortsette likevel?" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "Husk dette valget for fremtidige tilkoblinger" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "Sertifikatdetaljer" -#: ../libempathy-gtk/empathy-ui-utils.c:1738 +#: ../libempathy-gtk/empathy-ui-utils.c:1741 msgid "Unable to open URI" msgstr "Kan ikke åpne URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1835 +#: ../libempathy-gtk/empathy-ui-utils.c:1859 msgid "Select a file" msgstr "Velg en fil" -#: ../libempathy-gtk/empathy-ui-utils.c:1907 +#: ../libempathy-gtk/empathy-ui-utils.c:1934 msgid "Insufficient free space to save file" msgstr "Ikke nok ledig plass til å lagre filen" -#: ../libempathy-gtk/empathy-ui-utils.c:1915 +#: ../libempathy-gtk/empathy-ui-utils.c:1942 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2821,7 +2772,7 @@ msgstr "" "%s ledig plass kreves for å lagre denne filen, men kun %s er tilgjengelig. " "Vennligst velg en annen lokasjon." -#: ../libempathy-gtk/empathy-ui-utils.c:1959 +#: ../libempathy-gtk/empathy-ui-utils.c:1986 #, c-format msgid "Incoming file from %s" msgstr "Innkommende fil fra %s" @@ -2993,31 +2944,31 @@ msgstr "Vestlig" msgid "Vietnamese" msgstr "Vietnamesisk" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Ingen feilmelding" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Lynmelding (Empathy)" -#: ../src/empathy.c:434 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Ikke koble til ved oppstart" -#: ../src/empathy.c:438 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart" -#: ../src/empathy.c:453 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "- Empathy lynmeldingsprogram" -#: ../src/empathy.c:640 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Feil ved forsøk på å kontakte kontohåndtering" -#: ../src/empathy.c:642 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3063,11 +3014,11 @@ msgstr "" "Hvis ikke så skriv til Free Software Foundation, Inc., 51 Franklin Street, " "Fifth Floor, Boston, MA 02110-1301159, USA." -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "En meldingsklient for GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Kjartan Maraas\n" @@ -3105,35 +3056,36 @@ msgstr "" "avslutte assistenten og legge til kontoer senere fra Rediger-menyen." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1276 msgid "An error occurred" msgstr "En feil oppsto" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Hvilken type konto har du?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "Har du noen andre lynmeldingskontoer du vil sette opp?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Oppgi detaljer for konto" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Hvilken type lynmeldingskonto vil du lage?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Vil du lage flere lynmeldingskontoer?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Oppgi detaljer for den nye kontoen" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3145,41 +3097,41 @@ msgstr "" "prateprogrammer. Hvis du har en mikrofon eller et nettkamera kan du også ha " "lyd- og bildesamtaler." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "Har du en konto som du har brukt med et annet lynmeldingsprogram?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Ja, importer mine kontodetaljer fra " -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Ja, jeg vil skrive inn mine kontodetaljer nå" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Nei, jeg vil ha en ny konto" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Nei, jeg vil bare se personer i nærheten foreløpig" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Velg kontoer du vil importere:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Ja" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Nei, det var alt for nå" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3191,16 +3143,16 @@ msgstr "" "under er riktige. Du kan lett endre disse detaljene senere eller slå av " "funksjonen i «Konto»-dialogen" -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 msgid "Edit->Accounts" msgstr "Rediger->Kontoer" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "Jeg vil ikke slå på de_nne funksjonen nå" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1148 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3212,85 +3164,93 @@ msgstr "" "funksjonen må du installere pakken telepathy-salut og opprette en «Folk i " "nærheten»-konto i Konto-dialogen" -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1154 msgid "telepathy-salut not installed" msgstr "telepathy-salut er ikke installert" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1200 msgid "Messaging and VoIP Accounts Assistant" msgstr "Assistent for meldings- og VoIP-kontoer" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1234 msgid "Welcome to Empathy" msgstr "Velkommen til Empathy" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1243 msgid "Import your existing accounts" msgstr "Importer dine eksisterende kontoer" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1261 msgid "Please enter personal details" msgstr "Vennligst oppgi personlige detaljer" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Det finnes ikke-lagrede endringer for din %s-konto." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Din nye konto er ikke lagret ennå." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:753 -#: ../src/empathy-call-window.c:1319 +#: ../src/empathy-accounts-dialog.c:344 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "Kobler til …" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:385 #, c-format msgid "Offline — %s" msgstr "Frakoblet - %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:397 #, c-format msgid "Disconnected — %s" msgstr "Koblet fra - %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:408 msgid "Offline — No Network Connection" msgstr "Frakoblet - Ingen nettverkstilkobling" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:415 msgid "Unknown Status" msgstr "Ukjent status" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:427 msgid "Offline — Account Disabled" msgstr "Frakoblet - Konto deaktivert" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Du er i ferd med å lage en ny konto hvilket vil forkaste\n" -"dine endringer. Er du sikker på at du vil fortsette?" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "Rediger parametere for tilkobling" + +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "Klarte ikke å hente din personlige informasjon fra tjeneren." + +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "Rediger din personlige informasjon på nettet." -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "R_ediger parametere for tilkoblingen …" + +#: ../src/empathy-accounts-dialog.c:1289 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Vil du fjerne %s fra din datamaskin?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1293 msgid "This will not remove your account on the server." msgstr "Dette vil ikke fjerne din konto på tjeneren." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1529 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3299,15 +3259,15 @@ msgstr "" "dine endringer. Er du sikker på at du vil fortsette?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1705 msgid "_Enable" msgstr "Slå _på" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1706 msgid "_Disable" msgstr "Slå _av" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2176 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3319,19 +3279,15 @@ msgstr "" msgid "Add…" msgstr "Legg til …" -#: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Loading account information" -msgstr "Laster kontoinformasjon" - #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "No protocol installed" -msgstr "Ingen protokoll installert" +msgid "_Import…" +msgstr "_Importer …" #: ../src/empathy-accounts-dialog.ui.h:4 msgid "Protocol:" msgstr "Protokoll:" -#: ../src/empathy-accounts-dialog.ui.h:6 +#: ../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." @@ -3339,15 +3295,19 @@ msgstr "" "Du må installere en motor for hver protokoll du ønsker å bruke før du legger " "til en ny konto." +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "Ingen protokoll installert" + #: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Import…" -msgstr "_Importer …" +msgid "Loading account information" +msgstr "Laster kontoinformasjon" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr "- Empathy autentiseringsklient" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Empathy autentiseringsklient" @@ -3363,96 +3323,96 @@ msgstr "- Empathy lyd-/bildeklient" msgid "Empathy Audio/Video Client" msgstr "Empathy lyd-/bildeklient" -#: ../src/empathy-streamed-media-window.c:430 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Kontrast" -#: ../src/empathy-streamed-media-window.c:433 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Lysstyrke" -#: ../src/empathy-streamed-media-window.c:436 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-streamed-media-window.c:541 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Volum" -#: ../src/empathy-streamed-media-window.c:1109 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "_Sidelinje" -#: ../src/empathy-streamed-media-window.c:1129 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Lydinngang" -#: ../src/empathy-streamed-media-window.c:1133 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Videoinngang" -#: ../src/empathy-streamed-media-window.c:1141 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Nummertavle" -#: ../src/empathy-streamed-media-window.c:1152 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Detaljer" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1221 -#: ../src/empathy-call-window.c:1928 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format msgid "Call with %s" msgstr "Samtale med %s" -#: ../src/empathy-streamed-media-window.c:1454 -#: ../src/empathy-call-window.c:2172 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 msgid "The IP address as seen by the machine" msgstr "IP-adresse som sett av maskinen" -#: ../src/empathy-streamed-media-window.c:1456 -#: ../src/empathy-call-window.c:2174 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 msgid "The IP address as seen by a server on the Internet" msgstr "IP-adresse som sett av en tjener på internett" -#: ../src/empathy-streamed-media-window.c:1458 -#: ../src/empathy-call-window.c:2176 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 msgid "The IP address of the peer as seen by the other side" msgstr "IP-adresse for peer som sett av andre siden" -#: ../src/empathy-streamed-media-window.c:1460 -#: ../src/empathy-call-window.c:2178 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 msgid "The IP address of a relay server" msgstr "IP-adresse for en relay-tjener" -#: ../src/empathy-streamed-media-window.c:1462 -#: ../src/empathy-call-window.c:2180 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 msgid "The IP address of the multicast group" msgstr "IP-adresse for multicast-gruppe" +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 #: ../src/empathy-streamed-media-window.c:1844 #: ../src/empathy-streamed-media-window.c:1847 -#: ../src/empathy-streamed-media-window.c:1850 -#: ../src/empathy-streamed-media-window.c:1853 msgctxt "codec" msgid "Unknown" msgstr "Ukjent" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2145 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "Koblet til - %d:%02dm" -#: ../src/empathy-streamed-media-window.c:2206 -#: ../src/empathy-call-window.c:2983 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 msgid "Technical Details" msgstr "Tekniske detaljer" -#: ../src/empathy-streamed-media-window.c:2244 -#: ../src/empathy-call-window.c:3022 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3461,8 +3421,8 @@ msgstr "" "Programvaren til %s forstår ikke noen av lydformatene som støttes av din " "datamaskin" -#: ../src/empathy-streamed-media-window.c:2249 -#: ../src/empathy-call-window.c:3027 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3471,8 +3431,8 @@ msgstr "" "Programvaren til %s forstår ikke noen av videoformatene som støttes av din " "datamaskin" -#: ../src/empathy-streamed-media-window.c:2255 -#: ../src/empathy-call-window.c:3033 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3481,29 +3441,29 @@ msgstr "" "Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som " "ikke tillater direkte tilkoblinger." -#: ../src/empathy-streamed-media-window.c:2261 -#: ../src/empathy-call-window.c:3039 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 msgid "There was a failure on the network" msgstr "Det oppsto en feil på nettverket" -#: ../src/empathy-streamed-media-window.c:2265 -#: ../src/empathy-call-window.c:3043 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "Lydformatene som kreves for denne samtalen er ikke installert på din " "datamaskin" -#: ../src/empathy-streamed-media-window.c:2268 -#: ../src/empathy-call-window.c:3046 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Videoformatene som kreves for denne samtalen er ikke installert på din " "datamaskin" -#: ../src/empathy-streamed-media-window.c:2278 -#: ../src/empathy-call-window.c:3058 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please rapporter denne feilen og legg ved loggene som samles inn i " "«Feilsøking»-vinduet i Hjelp-menyen." -#: ../src/empathy-streamed-media-window.c:2286 -#: ../src/empathy-call-window.c:3067 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 msgid "There was a failure in the call engine" msgstr "Det oppsto en feil i samtalemotoren" -#: ../src/empathy-streamed-media-window.c:2289 -#: ../src/empathy-call-window.c:3070 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 msgid "The end of the stream was reached" msgstr "Slutt på strømmen ble nådd" -#: ../src/empathy-streamed-media-window.c:2329 -#: ../src/empathy-call-window.c:3110 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 msgid "Can't establish audio stream" msgstr "Kan ikke etablere lydstrøm" -#: ../src/empathy-streamed-media-window.c:2339 -#: ../src/empathy-call-window.c:3120 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 msgid "Can't establish video stream" msgstr "Kan ikke etablere videostrøm" -#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2 +#: ../src/empathy-call-window.ui.h:1 #: ../src/empathy-streamed-media-window.ui.h:1 -msgid "Audio" -msgstr "Lyd" +msgid "_Call" +msgstr "_Ring" #: ../src/empathy-call-window.ui.h:3 -#: ../src/empathy-streamed-media-window.ui.h:5 -msgid "Decoding Codec:" -msgstr "Kodek for dekoding:" +msgid "_Microphone" +msgstr "_Mikrofon" #: ../src/empathy-call-window.ui.h:4 -msgid "Disable camera" -msgstr "Slå av kamera" +msgid "_Camera" +msgstr "_Kamera" #: ../src/empathy-call-window.ui.h:5 -msgid "Display the dialpad" -msgstr "Vis ringetastatur" +msgid "_Settings" +msgstr "Inn_stillinger" #: ../src/empathy-call-window.ui.h:6 -#: ../src/empathy-streamed-media-window.ui.h:9 -msgid "Encoding Codec:" -msgstr "Kodek for koding:" +#: ../src/empathy-roster-window-menubar.ui.h:17 +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "_View" +msgstr "_Vis" -#: ../src/empathy-call-window.ui.h:7 -#: ../src/empathy-streamed-media-window.ui.h:10 -msgid "Hang up" -msgstr "Legg på" +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:27 +msgid "_Help" +msgstr "_Hjelp" -#: ../src/empathy-call-window.ui.h:8 -#: ../src/empathy-streamed-media-window.ui.h:11 -msgid "Hang up current call" -msgstr "Legg på denne samtalen" +#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:28 +msgid "_Contents" +msgstr "_Innhold" #: ../src/empathy-call-window.ui.h:9 -#: ../src/empathy-streamed-media-window.ui.h:12 -msgid "Local Candidate:" -msgstr "Lokal kandidat:" +#: ../src/empathy-roster-window-menubar.ui.h:29 +msgid "_Debug" +msgstr "_Feilsøk" #: ../src/empathy-call-window.ui.h:10 -msgid "Maximise me" -msgstr "Maksimer meg" +msgid "Swap camera" +msgstr "Bytt kamera" #: ../src/empathy-call-window.ui.h:11 msgid "Minimise me" msgstr "Minimer meg" #: ../src/empathy-call-window.ui.h:12 -#: ../src/empathy-streamed-media-window.ui.h:15 -msgid "Remote Candidate:" -msgstr "Ekstern kandidat:" +msgid "Maximise me" +msgstr "Maksimer meg" #: ../src/empathy-call-window.ui.h:13 -#: ../src/empathy-streamed-media-window.ui.h:16 -msgid "Send Audio" -msgstr "Send lyd" +msgid "Disable camera" +msgstr "Slå av kamera" #: ../src/empathy-call-window.ui.h:14 -msgid "Send Video" -msgstr "Send video" +#: ../src/empathy-streamed-media-window.ui.h:2 +msgid "Hang up" +msgstr "Legg på" #: ../src/empathy-call-window.ui.h:15 -msgid "Show dialpad" -msgstr "Vis ringetastatur" +#: ../src/empathy-streamed-media-window.ui.h:9 +msgid "Hang up current call" +msgstr "Legg på denne samtalen" #: ../src/empathy-call-window.ui.h:16 +msgid "Video call" +msgstr "Videosamtale" + +#: ../src/empathy-call-window.ui.h:17 msgid "Start a video call" msgstr "Start en videosamtale" -#: ../src/empathy-call-window.ui.h:17 +#: ../src/empathy-call-window.ui.h:19 msgid "Start an audio call" msgstr "Start en lydsamtale" -#: ../src/empathy-call-window.ui.h:18 -msgid "Swap camera" -msgstr "Bytt kamera" +#: ../src/empathy-call-window.ui.h:20 +msgid "Show dialpad" +msgstr "Vis ringetastatur" -#: ../src/empathy-call-window.ui.h:19 -#: ../src/empathy-streamed-media-window.ui.h:17 -msgid "Toggle audio transmission" -msgstr "Slå av/på overføring av lyd" +#: ../src/empathy-call-window.ui.h:21 +msgid "Display the dialpad" +msgstr "Vis ringetastatur" -#: ../src/empathy-call-window.ui.h:20 +#: ../src/empathy-call-window.ui.h:22 +msgid "Send Video" +msgstr "Send video" + +#: ../src/empathy-call-window.ui.h:23 msgid "Toggle video transmission" msgstr "Slå av/på overføring av video" -#: ../src/empathy-call-window.ui.h:21 -#: ../src/empathy-streamed-media-window.ui.h:18 +#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Send Audio" +msgstr "Send lyd" + +#: ../src/empathy-call-window.ui.h:25 +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Toggle audio transmission" +msgstr "Slå av/på overføring av lyd" + +#: ../src/empathy-call-window.ui.h:27 +#: ../src/empathy-streamed-media-window.ui.h:20 +msgid "Encoding Codec:" +msgstr "Kodek for koding:" + +#: ../src/empathy-call-window.ui.h:28 +#: ../src/empathy-streamed-media-window.ui.h:21 #: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581 #: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 msgid "Unknown" msgstr "Ukjent" -#: ../src/empathy-call-window.ui.h:23 -msgid "Video call" -msgstr "Videosamtale" +#: ../src/empathy-call-window.ui.h:29 +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Decoding Codec:" +msgstr "Kodek for dekoding:" -#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-call-window.ui.h:30 +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Remote Candidate:" +msgstr "Ekstern kandidat:" + +#: ../src/empathy-call-window.ui.h:31 #: ../src/empathy-streamed-media-window.ui.h:24 -msgid "_Call" -msgstr "_Ring" +msgid "Local Candidate:" +msgstr "Lokal kandidat:" -#: ../src/empathy-call-window.ui.h:25 -msgid "_Camera" -msgstr "_Kamera" +#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:25 +msgid "Audio" +msgstr "Lyd" -#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 -msgid "_Contents" -msgstr "_Innhold" +#: ../src/empathy-chat-window.c:285 +msgid "Close this window?" +msgstr "Lukk dette vinduet?" -#: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 -msgid "_Debug" -msgstr "_Feilsøk" +#: ../src/empathy-chat-window.c:290 +#, c-format +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "" +"Hvis du lukker dette vinduet vil du forlate %s. Du vil ikke motta videre " +"meldinger før du blir med igjen." -#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 -msgid "_Help" -msgstr "_Hjelp" +#: ../src/empathy-chat-window.c:301 +#, 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] "" +"Hvis du lukker dette vinduet vil du forlate praterommet. Du vil ikke motta " +"videre meldinger før du blir med igjen." +msgstr[1] "" +"Hvis du lukker dette vinduet vil du forlate %u praterom. Du vil ikke motta " +"videre meldinger før du blir med igjen." + +#: ../src/empathy-chat-window.c:310 +#, c-format +msgid "Leave %s?" +msgstr "Forlat %s?" -#: ../src/empathy-call-window.ui.h:30 -msgid "_Microphone" -msgstr "_Mikrofon" +#: ../src/empathy-chat-window.c:311 +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "" +"Du vil ikke motta videre meldinger fra dette praterommet før du blir med " +"igjen." -#: ../src/empathy-call-window.ui.h:31 -msgid "_Settings" -msgstr "Inn_stillinger" +#: ../src/empathy-chat-window.c:330 +msgid "Close window" +msgstr "Lukk vindu" -#: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 -#: ../src/empathy-streamed-media-window.ui.h:25 -msgid "_View" -msgstr "_Vis" +#: ../src/empathy-chat-window.c:330 +msgid "Leave room" +msgstr "Forlat rom" -#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 +#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d ulest)" msgstr[1] "%s (%d uleste)" -#: ../src/empathy-chat-window.c:493 +#: ../src/empathy-chat-window.c:648 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (og %u annen)" msgstr[1] "%s (og %u andre)" -#: ../src/empathy-chat-window.c:509 +#: ../src/empathy-chat-window.c:664 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d ulest fra andre)" msgstr[1] "%s (%d uleste fra andre)" -#: ../src/empathy-chat-window.c:518 +#: ../src/empathy-chat-window.c:673 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d ulest fra alle)" msgstr[1] "%s (%d uleste fra alle)" -#: ../src/empathy-chat-window.c:733 +#: ../src/empathy-chat-window.c:888 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:743 +#: ../src/empathy-chat-window.c:898 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "Sender %d melding" msgstr[1] "Sender %d meldinger" -#: ../src/empathy-chat-window.c:765 +#: ../src/empathy-chat-window.c:920 msgid "Typing a message." msgstr "Skriver en melding" #: ../src/empathy-chat-window.ui.h:1 -msgid "C_lear" -msgstr "_Tøm" +msgid "_Conversation" +msgstr "_Samtale" #: ../src/empathy-chat-window.ui.h:2 -msgid "C_ontact" -msgstr "K_ontakt" +msgid "C_lear" +msgstr "_Tøm" -#: ../src/empathy-chat-window.ui.h:4 +#: ../src/empathy-chat-window.ui.h:3 msgid "Insert _Smiley" msgstr "Sett inn _smilefjes" +#: ../src/empathy-chat-window.ui.h:4 +msgid "_Favorite Chat Room" +msgstr "_Favoritt-praterom" + #: ../src/empathy-chat-window.ui.h:5 -msgid "Invite _Participant…" -msgstr "Inviter _deltaker …" +msgid "Notify for All Messages" +msgstr "Varsle for alle meldinger" -#: ../src/empathy-chat-window.ui.h:6 -msgid "Move Tab _Left" -msgstr "Flytt fane til _venstre" +#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1 +msgid "_Show Contact List" +msgstr "Vi_s kontaktliste" #: ../src/empathy-chat-window.ui.h:7 -msgid "Move Tab _Right" -msgstr "Flytt fane til høy_re" +msgid "Invite _Participant…" +msgstr "Inviter _deltaker …" #: ../src/empathy-chat-window.ui.h:8 -msgid "Notify for All Messages" -msgstr "Varsle for alle meldinger" +msgid "C_ontact" +msgstr "K_ontakt" #: ../src/empathy-chat-window.ui.h:10 -msgid "_Conversation" -msgstr "_Samtale" +msgid "_Tabs" +msgstr "_Faner" #: ../src/empathy-chat-window.ui.h:11 -msgid "_Detach Tab" -msgstr "Riv _løs fane" - -#: ../src/empathy-chat-window.ui.h:13 -msgid "_Favorite Chat Room" -msgstr "_Favoritt-praterom" +msgid "_Previous Tab" +msgstr "_Forrige samtaler" -#: ../src/empathy-chat-window.ui.h:15 +#: ../src/empathy-chat-window.ui.h:12 msgid "_Next Tab" msgstr "_Neste fane" -#: ../src/empathy-chat-window.ui.h:16 -msgid "_Previous Tab" -msgstr "_Forrige samtaler" +#: ../src/empathy-chat-window.ui.h:13 +msgid "_Undo Close Tab" +msgstr "Angre l_ukk fane" -#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5 -msgid "_Show Contact List" -msgstr "Vi_s kontaktliste" +#: ../src/empathy-chat-window.ui.h:14 +msgid "Move Tab _Left" +msgstr "Flytt fane til _venstre" -#: ../src/empathy-chat-window.ui.h:18 -msgid "_Tabs" -msgstr "_Faner" +#: ../src/empathy-chat-window.ui.h:15 +msgid "Move Tab _Right" +msgstr "Flytt fane til høy_re" -#: ../src/empathy-chat-window.ui.h:19 -msgid "_Undo Close Tab" -msgstr "Angre l_ukk fane" +#: ../src/empathy-chat-window.ui.h:16 +msgid "_Detach Tab" +msgstr "Riv _løs fane" #: ../src/empathy-chatrooms-window.c:251 msgid "Name" @@ -3783,100 +3792,100 @@ msgstr "Rom" msgid "Auto-Connect" msgstr "Koble til automatisk" -#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-chatrooms-window.ui.h:1 msgid "Manage Favorite Rooms" msgstr "Håndter favorittrom" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Innkommende videosamtale" -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1552 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "Innkommende samtale" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s ringer deg med video. Vil du svare?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s ringer deg. Vil du svare?" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1558 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "Innkommende samtale fra %s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "Av_vis" -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "Sv_ar" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "Sv_ar med video" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1558 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" msgstr "Innkommende videosamtale fra %s" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Invitasjon til rom" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Invitasjon til å bli med i %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s inviterer deg til å bli med i %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_Avslå" -#: ../src/empathy-event-manager.c:858 -#: ../src/empathy-new-chatroom-dialog.ui.h:7 +#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "_Join" msgstr "_Bli med" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s inviterte deg til å bli med i %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "Du har blitt invitert til å bli med i %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Innkommende filoverføring fra %s" -#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372 msgid "Password required" msgstr "Passord kreves" -#: ../src/empathy-event-manager.c:1210 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s ønsker rettigheter til å se når du er tilkoblet" -#: ../src/empathy-event-manager.c:1214 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3886,105 +3895,105 @@ msgstr "" "Melding: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Ukjent" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s av %s med %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s av %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Mottar «%s» fra %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Sender «%s» til %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Feil ved mottak av «%s» fra %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Feil ved mottak av en fil" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Feil ved sending av «%s» til %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Feil ved sending av en fil" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "«%s» mottatt fra %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "«%s» sendt til %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Filoverføring fullført" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Venter på svar fra motparten" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Sjekker integriteten for «%s»" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Hasher «%s»" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Fil" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Gjenstår" @@ -4007,163 +4016,178 @@ msgid "Import Accounts" msgstr "Importer kontoer" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "Importer" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Protokoll" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Kilde" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-roster-window.c:389 msgid "Provide Password" msgstr "Oppgi passord" -#: ../src/empathy-main-window.c:401 +#: ../src/empathy-roster-window.c:395 msgid "Disconnect" msgstr "Koble fra" -#: ../src/empathy-main-window.c:642 +#: ../src/empathy-roster-window.c:644 +msgid "You need to setup an account to see contacts here." +msgstr "Du må sette opp en konto for å se kontakter her." + +#: ../src/empathy-roster-window.c:660 msgid "No match found" msgstr "Ingen treff funnet" -#: ../src/empathy-main-window.c:750 +#: ../src/empathy-roster-window.c:765 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "Beklager %s-kontoer kan ikke brukes før %s-programvaren er oppdatert." -#: ../src/empathy-main-window.c:818 +#: ../src/empathy-roster-window.c:831 msgid "Update software..." msgstr "Oppdater programvare …" -#: ../src/empathy-main-window.c:824 ../src/empathy-main-window.c:949 +#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954 msgid "Close" msgstr "Lukk" -#: ../src/empathy-main-window.c:937 +#: ../src/empathy-roster-window.c:942 msgid "Reconnect" msgstr "Koble til på nytt" -#: ../src/empathy-main-window.c:943 +#: ../src/empathy-roster-window.c:948 msgid "Edit Account" msgstr "Rediger konto" #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:1088 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1092 #, c-format msgid "Top up %s (%s)..." msgstr "Fyll opp %s (%s) …" -#: ../src/empathy-main-window.c:1135 +#: ../src/empathy-roster-window.c:1138 msgid "Top up account credit" msgstr "Fyll opp kreditt for konto" #. top up button -#: ../src/empathy-main-window.c:1206 +#: ../src/empathy-roster-window.c:1210 msgid "Top Up..." msgstr "Fyll opp …" -#: ../src/empathy-main-window.c:1949 +#: ../src/empathy-roster-window.c:1933 msgid "Contact" msgstr "Kontakt" -#: ../src/empathy-main-window.c:2324 +#: ../src/empathy-roster-window.c:2131 +msgid "You need to enable one of your accounts to see contacts here." +msgstr "Du må slå på en av kontoene for å se kontakter her." + +#. translators: argument is an account name +#: ../src/empathy-roster-window.c:2139 +#, c-format +msgid "You need to enable %s to see contacts here." +msgstr "Du må slå på %s for å se kontakter her." + +#: ../src/empathy-roster-window.c:2419 msgid "Contact List" msgstr "Kontaktliste" -#: ../src/empathy-main-window-menubar.ui.h:1 -msgid "Contacts on a _Map" -msgstr "Kontakter på et _kart" +#: ../src/empathy-roster-window.ui.h:1 +msgid "Account settings" +msgstr "Innstillinger for konto" -#: ../src/empathy-main-window-menubar.ui.h:2 -msgid "Credit Balance" -msgstr "Kredittsaldo" +#: ../src/empathy-roster-window-menubar.ui.h:2 +#: ../src/empathy-status-icon.ui.h:2 +msgid "_New Conversation…" +msgstr "_Ny samtale …" -#: ../src/empathy-main-window-menubar.ui.h:3 -msgid "Find in Contact _List" -msgstr "Finn i kontakt_liste" +#: ../src/empathy-roster-window-menubar.ui.h:3 +#: ../src/empathy-status-icon.ui.h:3 +msgid "New _Call…" +msgstr "Ny _samtale …" -#: ../src/empathy-main-window-menubar.ui.h:4 -msgid "Join _Favorites" -msgstr "Bli med i _favoritter" +#: ../src/empathy-roster-window-menubar.ui.h:6 +msgid "_Search for Contacts…" +msgstr "_Søk etter kontakter …" -#: ../src/empathy-main-window-menubar.ui.h:5 -msgid "Manage Favorites" -msgstr "Håndter favoritter" +#: ../src/empathy-roster-window-menubar.ui.h:7 +msgid "_File Transfers" +msgstr "_Filoverføringer" -#: ../src/empathy-main-window-menubar.ui.h:6 -msgid "N_ormal Size" -msgstr "N_ormal størrelse" +#: ../src/empathy-roster-window-menubar.ui.h:8 +msgid "_Offline Contacts" +msgstr "Frak_oblede kontakter" -#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 -msgid "New _Call…" -msgstr "Ny _samtale …" +#: ../src/empathy-roster-window-menubar.ui.h:9 +msgid "Show P_rotocols" +msgstr "Vis p_rotokoller" -#: ../src/empathy-main-window-menubar.ui.h:8 -msgid "Normal Size With _Avatars" -msgstr "Normal størrelse med _avatarer" +#: ../src/empathy-roster-window-menubar.ui.h:10 +msgid "Credit Balance" +msgstr "Kredittsaldo" + +#: ../src/empathy-roster-window-menubar.ui.h:11 +msgid "Contacts on a _Map" +msgstr "Kontakter på et _kart" + +#: ../src/empathy-roster-window-menubar.ui.h:13 +msgid "_Accounts" +msgstr "_Kontoer" + +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Blocked Contacts" +msgstr "_Blokkerte kontakter" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "P_references" msgstr "B_rukervalg" -#: ../src/empathy-main-window-menubar.ui.h:10 -msgid "Show P_rotocols" -msgstr "Vis p_rotokoller" +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "Find in Contact _List" +msgstr "Finn i kontakt_liste" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "Sort by _Name" msgstr "Sorter på _navn" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "Sort by _Status" msgstr "Sorter på _status" -#: ../src/empathy-main-window-menubar.ui.h:13 -msgid "_Accounts" -msgstr "_Kontoer" +#: ../src/empathy-roster-window-menubar.ui.h:20 +msgid "Normal Size With _Avatars" +msgstr "Normal størrelse med _avatarer" -#: ../src/empathy-main-window-menubar.ui.h:15 -msgid "_Blocked Contacts" -msgstr "_Blokkerte kontakter" +#: ../src/empathy-roster-window-menubar.ui.h:21 +msgid "N_ormal Size" +msgstr "N_ormal størrelse" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Compact Size" msgstr "_Kompakt størrelse" -#: ../src/empathy-main-window-menubar.ui.h:21 -msgid "_File Transfers" -msgstr "_Filoverføringer" +#: ../src/empathy-roster-window-menubar.ui.h:23 +msgid "_Room" +msgstr "_Rom" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:24 msgid "_Join…" msgstr "_Bli med …" -#: ../src/empathy-main-window-menubar.ui.h:24 -#: ../src/empathy-status-icon.ui.h:3 -msgid "_New Conversation…" -msgstr "_Ny samtale …" - -#: ../src/empathy-main-window-menubar.ui.h:25 -msgid "_Offline Contacts" -msgstr "Frak_oblede kontakter" - -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "Personlig _informasjon" - -#: ../src/empathy-main-window-menubar.ui.h:28 -msgid "_Room" -msgstr "_Rom" +#: ../src/empathy-roster-window-menubar.ui.h:25 +msgid "Join _Favorites" +msgstr "Bli med i _favoritter" -#: ../src/empathy-main-window-menubar.ui.h:29 -msgid "_Search for Contacts…" -msgstr "_Søk etter kontakter …" +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "Manage Favorites" +msgstr "Håndter favoritter" #: ../src/empathy-new-chatroom-dialog.c:369 msgid "Chat Room" @@ -4175,7 +4199,7 @@ msgstr "Medlemmer" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:623 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4188,22 +4212,22 @@ msgstr "" "Passord kreves: %s\n" "Medlemmer: %s" -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "Nei" -#: ../src/empathy-new-chatroom-dialog.c:654 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "Kunne ikke starte romliste" -#: ../src/empathy-new-chatroom-dialog.c:664 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "Kune ikke stoppe romliste" -#: ../src/empathy-new-chatroom-dialog.ui.h:2 -msgid "Couldn't load room list" -msgstr "Kunne ikke laste romliste" +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Join Room" +msgstr "Bli med i rom" #: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "" @@ -4213,6 +4237,10 @@ msgstr "" "listen." #: ../src/empathy-new-chatroom-dialog.ui.h:4 +msgid "_Room:" +msgstr "_Rom:" + +#: ../src/empathy-new-chatroom-dialog.ui.h:5 msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" @@ -4220,316 +4248,312 @@ msgstr "" "Oppgi tjener som er vert for rommet, eller la stå tom hvis rommet er på " "aktiv kontos tjener" -#: ../src/empathy-new-chatroom-dialog.ui.h:5 -msgid "Join Room" -msgstr "Bli med i rom" +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "Couldn't load room list" +msgstr "Kunne ikke laste romliste" -#: ../src/empathy-new-chatroom-dialog.ui.h:6 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 msgid "Room List" msgstr "Romliste" -#: ../src/empathy-new-chatroom-dialog.ui.h:8 -msgid "_Room:" -msgstr "_Rom:" - -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Melding mottatt" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Melding sendt" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Ny samtale" -#: ../src/empathy-preferences.c:172 -msgid "Contact goes online" +#: ../src/empathy-preferences.c:169 +msgid "Contact comes online" msgstr "Kontakt kobler til" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "Kontakt kobler fra" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Konto koblet til" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Konto koblet fra" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Språk" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:726 msgid "Juliet" msgstr "Juliet" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:733 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:739 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "O Romeo, Romeo, wherefore art thou Romeo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:743 msgid "Deny thy father and refuse thy name;" msgstr "Deny thy father and refuse thy name;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:746 msgid "Or if thou wilt not, be but sworn my love" msgstr "Or if thou wilt not, be but sworn my love" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:749 msgid "And I'll no longer be a Capulet." msgstr "And I'll no longer be a Capulet." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:752 msgid "Shall I hear more, or shall I speak at this?" msgstr "Shall I hear more, or shall I speak at this?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" msgstr "Juliet har koblet fra" -#: ../src/empathy-preferences.c:1175 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "Brukervalg" #: ../src/empathy-preferences.ui.h:1 +msgid "Show _smileys as images" +msgstr "Vis _smilefjes som bilder" + +#: ../src/empathy-preferences.ui.h:2 +msgid "Show contact _list in rooms" +msgstr "Vis kontakt_liste i rom" + +#: ../src/empathy-preferences.ui.h:3 msgid "Appearance" msgstr "Utseende" -#: ../src/empathy-preferences.ui.h:3 -msgid "Behavior" -msgstr "Oppførsel" +#: ../src/empathy-preferences.ui.h:4 +msgid "Start chats in:" +msgstr "Start prat om:" #: ../src/empathy-preferences.ui.h:5 -msgid "Chat Th_eme:" -msgstr "Samtale_tema:" +msgid "new ta_bs" +msgstr "nye fa_ner" #: ../src/empathy-preferences.ui.h:6 -msgid "Disable notifications when _away or busy" -msgstr "Slå av varsling når du er borte eller oppt_att" +msgid "new _windows" +msgstr "nye _vinduer" #: ../src/empathy-preferences.ui.h:7 -msgid "Disable sounds when _away or busy" -msgstr "Slå av lyder når du er b_orte eller opptatt" - -#: ../src/empathy-preferences.ui.h:8 msgid "Display incoming events in the notification area" msgstr "Vis innkommende hendelser i varslingsområdet" +#: ../src/empathy-preferences.ui.h:8 +msgid "_Automatically connect on startup" +msgstr "Koble til _automatisk ved oppstart" + #: ../src/empathy-preferences.ui.h:9 -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 "" -"Utlikning av ekko kan hjelpe å gjøre lyd for tale klarere for den andre " -"personene, men kan forårsake problemer på noen datamaskiner. Hvis du eller " -"den andre personen hører rare lyder eller feil under samtaler kan du prøve å " -"slå av utlikning av ekko og starte samtalen på nytt." +msgid "Log conversations" +msgstr "Logg samtaler" #: ../src/empathy-preferences.ui.h:10 -msgid "Enable notifications when a contact comes online" -msgstr "Slå på varsling når en kontakt kobler seg til" +msgid "Behavior" +msgstr "Oppførsel" #: ../src/empathy-preferences.ui.h:11 -msgid "Enable notifications when a contact goes offline" -msgstr "Slå på varsling når en kontakt kobler seg fra" +msgid "General" +msgstr "Generelt" #: ../src/empathy-preferences.ui.h:12 -msgid "Enable notifications when the _chat is not focused" -msgstr "Aktiver varsling når _prat ikke er fokusert" +msgid "_Enable bubble notifications" +msgstr "_Aktiver varsling med bobler" #: ../src/empathy-preferences.ui.h:13 -msgid "Enable spell checking for languages:" -msgstr "Slå på stavekontroll for språk:" +msgid "Disable notifications when _away or busy" +msgstr "Slå av varsling når du er borte eller oppt_att" #: ../src/empathy-preferences.ui.h:14 -msgid "General" -msgstr "Generelt" +msgid "Enable notifications when the _chat is not focused" +msgstr "Aktiver varsling når _prat ikke er fokusert" #: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "Inngangsnivå:" +msgid "Enable notifications when a contact comes online" +msgstr "Slå på varsling når en kontakt kobler seg til" #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "Volum for inngang:" +msgid "Enable notifications when a contact goes offline" +msgstr "Slå på varsling når en kontakt kobler seg fra" + +#: ../src/empathy-preferences.ui.h:17 +msgid "Notifications" +msgstr "Varsling" #: ../src/empathy-preferences.ui.h:18 -msgid "Location sources:" -msgstr "Kilder for steder:" +msgid "_Enable sound notifications" +msgstr "_Aktiver varsling med lyder" #: ../src/empathy-preferences.ui.h:19 -msgid "Log conversations" -msgstr "Logg samtaler" +msgid "Disable sounds when _away or busy" +msgstr "Slå av lyder når du er b_orte eller opptatt" #: ../src/empathy-preferences.ui.h:20 -msgid "Notifications" -msgstr "Varsling" - -#: ../src/empathy-preferences.ui.h:21 msgid "Play sound for events" msgstr "Spill av lyd for hendelser" +#: ../src/empathy-preferences.ui.h:21 +msgid "Sounds" +msgstr "Lyder" + #: ../src/empathy-preferences.ui.h:22 -msgid "Privacy" -msgstr "Personvern" +msgid "Use _echo cancellation to improve call quality" +msgstr "Bruk _ekkokansellering for å forbedre kvaliteten på samtalen" #: ../src/empathy-preferences.ui.h:23 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." +"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 "" -"Redusert nøyaktighet for plassering betyr at kun by, område og land vil " -"publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass." - -#: ../src/empathy-preferences.ui.h:24 -msgid "Show _smileys as images" -msgstr "Vis _smilefjes som bilder" - -#: ../src/empathy-preferences.ui.h:25 -msgid "Show contact _list in rooms" -msgstr "Vis kontakt_liste i rom" +"Utlikning av ekko kan hjelpe å gjøre lyd for tale klarere for den andre " +"personene, men kan forårsake problemer på noen datamaskiner. Hvis du eller " +"den andre personen hører rare lyder eller feil under samtaler kan du prøve å " +"slå av utlikning av ekko og starte samtalen på nytt." #: ../src/empathy-preferences.ui.h:26 -msgid "Sounds" -msgstr "Lyder" +msgid "_Publish location to my contacts" +msgstr "_Publiser plassering til mine kontakter" #: ../src/empathy-preferences.ui.h:27 -msgid "Spell Checking" -msgstr "Stavekontroll" - -#: ../src/empathy-preferences.ui.h:28 msgid "" -"The list of languages reflects only the languages for which you have a " -"dictionary installed." +"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 "" -"Listen med språk viser bare de språkene det er installert ordliste for." +"Redusert nøyaktighet for plassering betyr at kun by, område og land vil " +"publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass." +#. 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:29 -msgid "Themes" -msgstr "Temaer" +msgid "_Reduce location accuracy" +msgstr "_Reduser nøyaktighet for plassering" #: ../src/empathy-preferences.ui.h:30 -msgid "Use _echo cancellation to improve call quality" -msgstr "Bruk _ekkokansellering for å forbedre kvaliteten på samtalen" +msgid "Privacy" +msgstr "Personvern" #: ../src/empathy-preferences.ui.h:31 -msgid "Variant:" -msgstr "Variant:" +msgid "_GPS" +msgstr "_GPS" #: ../src/empathy-preferences.ui.h:32 -msgid "_Automatically connect on startup" -msgstr "Koble til _automatisk ved oppstart" - -#: ../src/empathy-preferences.ui.h:33 msgid "_Cellphone" msgstr "_Mobiltelefon" -#: ../src/empathy-preferences.ui.h:34 -msgid "_Enable bubble notifications" -msgstr "_Aktiver varsling med bobler" +#: ../src/empathy-preferences.ui.h:33 +msgid "_Network (IP, Wi-Fi)" +msgstr "_Nettverk (IP, Wi-Fi)" -#: ../src/empathy-preferences.ui.h:35 -msgid "_Enable sound notifications" -msgstr "_Aktiver varsling med lyder" +#: ../src/empathy-preferences.ui.h:34 +msgid "Location sources:" +msgstr "Kilder for steder:" #: ../src/empathy-preferences.ui.h:36 -msgid "_GPS" -msgstr "_GPS" +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "" +"Listen med språk viser bare de språkene det er installert ordliste for." #: ../src/empathy-preferences.ui.h:37 -msgid "_Network (IP, Wi-Fi)" -msgstr "_Nettverk (IP, Wi-Fi)" +msgid "Enable spell checking for languages:" +msgstr "Slå på stavekontroll for språk:" #: ../src/empathy-preferences.ui.h:38 -msgid "_Open new chats in separate windows" -msgstr "_Åpne nye samtaler i egne vinduer" +msgid "Spell Checking" +msgstr "Stavekontroll" #: ../src/empathy-preferences.ui.h:39 -msgid "_Publish location to my contacts" -msgstr "_Publiser plassering til mine kontakter" +msgid "Chat Th_eme:" +msgstr "Samtale_tema:" + +#: ../src/empathy-preferences.ui.h:40 +msgid "Variant:" +msgstr "Variant:" -#. 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:41 -msgid "_Reduce location accuracy" -msgstr "_Reduser nøyaktighet for plassering" +msgid "Themes" +msgstr "Temaer" -#: ../src/empathy-status-icon.ui.h:2 +#: ../src/empathy-status-icon.ui.h:4 msgid "Status" msgstr "Status" -#: ../src/empathy-status-icon.ui.h:4 +#: ../src/empathy-status-icon.ui.h:5 msgid "_Quit" msgstr "_Avslutt" -#: ../src/empathy-streamed-media-window.ui.h:2 -msgid "Call the contact again" -msgstr "Ring kontakten igjen" - #: ../src/empathy-streamed-media-window.ui.h:3 -msgid "Camera Off" -msgstr "Kamera av" +msgid "Redial" +msgstr "Ring på nytt" #: ../src/empathy-streamed-media-window.ui.h:4 -msgid "Camera On" -msgstr "Kamera på" +msgid "V_ideo" +msgstr "V_ideo" + +#: ../src/empathy-streamed-media-window.ui.h:5 +msgid "Video Off" +msgstr "Video av" #: ../src/empathy-streamed-media-window.ui.h:6 -msgid "Disable camera and stop sending video" -msgstr "Slå av kamera og stopp sending av video" +msgid "Video Preview" +msgstr "Forhåndsvis video" #: ../src/empathy-streamed-media-window.ui.h:7 -msgid "Enable camera and send video" -msgstr "Slå på kamera og send video" +msgid "Video On" +msgstr "Video på" -#: ../src/empathy-streamed-media-window.ui.h:8 -msgid "Enable camera but don't send video" -msgstr "Slå på kamera men ikke send video" +#: ../src/empathy-streamed-media-window.ui.h:10 +msgid "Call the contact again" +msgstr "Ring kontakten igjen" #: ../src/empathy-streamed-media-window.ui.h:13 -msgid "Preview" -msgstr "Forhåndsvis" +msgid "Camera Off" +msgstr "Kamera av" #: ../src/empathy-streamed-media-window.ui.h:14 -msgid "Redial" -msgstr "Ring på nytt" +msgid "Disable camera and stop sending video" +msgstr "Slå av kamera og stopp sending av video" -#: ../src/empathy-streamed-media-window.ui.h:19 -msgid "V_ideo" -msgstr "V_ideo" +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Preview" +msgstr "Forhåndsvis" -#: ../src/empathy-streamed-media-window.ui.h:21 -msgid "Video Off" -msgstr "Video av" +#: ../src/empathy-streamed-media-window.ui.h:16 +msgid "Enable camera but don't send video" +msgstr "Slå på kamera men ikke send video" -#: ../src/empathy-streamed-media-window.ui.h:22 -msgid "Video On" -msgstr "Video på" +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Camera On" +msgstr "Kamera på" -#: ../src/empathy-streamed-media-window.ui.h:23 -msgid "Video Preview" -msgstr "Forhåndsvis video" +#: ../src/empathy-streamed-media-window.ui.h:18 +msgid "Enable camera and send video" +msgstr "Slå på kamera og send video" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Kartvisning for kontakter" @@ -4596,60 +4620,60 @@ msgid "" msgstr "" "Valgt tilkoblingshåndterer støtter ikke utvidelse for ekstern feilsøking." -#: ../src/empathy-invite-participant-dialog.c:186 -#: ../src/empathy-invite-participant-dialog.c:214 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Inviter deltaker" -#: ../src/empathy-invite-participant-dialog.c:187 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Velg en kontakt å invitere til samtalen:" -#: ../src/empathy-invite-participant-dialog.c:210 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Inviter" -#: ../src/empathy-accounts.c:184 +#: ../src/empathy-accounts.c:183 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "Ikke vis noen dialoger. Utfør arbeid (f.eks import) og avslutt" -#: ../src/empathy-accounts.c:188 +#: ../src/empathy-accounts.c:187 msgid "" "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "" "Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-" "kontoer" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:191 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "Velg en gitt konto ved oppstart (f.eks. gabble/jabber/foo_40eksempel_2eorg0)" -#: ../src/empathy-accounts.c:194 +#: ../src/empathy-accounts.c:193 msgid "" msgstr "" -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:196 msgid "Show account assistant" msgstr "Vis kontoassistent" -#: ../src/empathy-accounts.c:203 +#: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" msgstr "- Empathy-kontoer" -#: ../src/empathy-accounts.c:242 +#: ../src/empathy-accounts.c:238 msgid "Empathy Accounts" msgstr "Empathy-kontoer" -#: ../src/empathy-debugger.c:70 +#: ../src/empathy-debugger.c:69 msgid "Show a particular service" msgstr "Vis en spesiell tjeneste" -#: ../src/empathy-debugger.c:75 +#: ../src/empathy-debugger.c:74 msgid "- Empathy Debugger" msgstr "- Empathy feilsøking" -#: ../src/empathy-debugger.c:114 +#: ../src/empathy-debugger.c:113 msgid "Empathy Debugger" msgstr "Empathy feilsøking" @@ -4657,39 +4681,39 @@ msgstr "Empathy feilsøking" msgid "- Empathy Chat Client" msgstr "- Empathy lynmeldingsprogram" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Svar" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1562 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 msgid "Reject" msgstr "Avvis" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1563 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 msgid "Answer" msgstr "Svar" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Svar med video" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Avslå" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Godta" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Oppgi" @@ -4704,37 +4728,41 @@ msgstr "%s prøvde å ringe deg, men du var i en annen samtale." msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2879 +#: ../src/empathy-call-window.c:2929 msgid "On hold" msgstr "På vent" -#: ../src/empathy-call-window.c:2882 +#: ../src/empathy-call-window.c:2932 msgid "Mute" msgstr "Demp" -#: ../src/empathy-call-window.c:2884 +#: ../src/empathy-call-window.c:2934 msgid "Duration" msgstr "Varighet" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2887 +#: ../src/empathy-call-window.c:2937 #, c-format msgid "%s — %d:%02dm" msgstr "%s – %d:%02dm" -#: ../src/empathy-call-window.c:3157 +#: ../src/empathy-call-window.c:3207 #, c-format msgid "Your current balance is %s." msgstr "Din saldo er %s." -#: ../src/empathy-call-window.c:3161 +#: ../src/empathy-call-window.c:3211 msgid "Sorry, you don’t have enough credit for that call." msgstr "Du har ikke nok kreditt til å starte denne samtalen." -#: ../src/empathy-call-window.c:3163 +#: ../src/empathy-call-window.c:3213 msgid "Top Up" msgstr "Fyll opp" #: ../libempathy-gtk/empathy-search-bar.c:243 msgid "_Match case" msgstr "Skill _mellom små/store bokstaver" + +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Legger til ny konto" diff --git a/po/nl.po b/po/nl.po index 7bfe9992..a38668de 100644 --- a/po/nl.po +++ b/po/nl.po @@ -20,19 +20,20 @@ # Freek de Kruijf , 2006–2008. # Reinout van Schouwen , 2007. # Wouter Bolsterlee , 2006—2011. -# Hannie Dumoleyn , 2010—2011. +# Hannie Dumoleyn , 2010—2011, 2012. msgid "" msgstr "" "Project-Id-Version: empathy\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-21 23:37+0200\n" -"PO-Revision-Date: 2011-09-17 09:39+0200\n" -"Last-Translator: Hannie Dumoleyn \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=empathy&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2012-01-02 15:24+0000\n" +"PO-Revision-Date: 2012-01-02 16:50+0100\n" +"Last-Translator: Hannie Dumoleyn \n" "Language-Team: Dutch \n" -"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Launchpad-Export-Date: 2010-09-28 11:24+0000\n" "X-Generator: Lokalize 1.2\n" @@ -58,22 +59,14 @@ msgid "Always open a separate chat window for new chats." msgstr "Altijd een nieuw scherm openen voor nieuwe gesprekken." #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Oproepvolume" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Oproepvolume, als percentage" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "Camera device" msgstr "Camera" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 msgid "Camera position" msgstr "Camerapositie" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." @@ -81,57 +74,63 @@ msgstr "" "Te gebruiken achtervoegsel bij auto-aanvullen (tab) van bijnaam in " "groepschat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 msgid "Chat window theme" msgstr "Thema voor chatvensters" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "Chat window theme variant" msgstr "Themavariant voor chatvensters" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" "Door komma's gescheiden lijst van talen die door de spellingcontrole " "gebruikt kunnen worden (bijv. ‘en, fr, nl’)." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Compact contact list" msgstr "Compacte contactenlijst" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 msgid "Connection managers should be used" msgstr "Er moeten verbindingsbeheerprogramma's gebruikt worden" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Contact list sort criterion" msgstr "Sorteercriterium contactenlijst" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +msgid "D-Bus object path of the last account selected to join a room." +msgstr "" +"D-Bus-objectpad van het laatste account dat werd geselecteerd om een " +"chatruimte binnen te gaan." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "" "De camera die standaard gebruikt moet worden bij videogesprekken, bijv. /dev/" "video0." # avatar? :s (Wouter Bolsterlee) -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Default directory to select an avatar image from" msgstr "Standaardmap voor het kiezen van gebruikersafbeeldingen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Disable popup notifications when away" msgstr "Notificatieberichten uitschakelen indien afwezig" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Disable sounds when away" msgstr "Geluid uitschakelen indien afwezig" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Display incoming events in the status area" msgstr "Inkomende gebeurtenissen in het statusgebied weergeven" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "" "Display incoming events in the status area. If false, present them to the " "user immediately." @@ -139,251 +138,248 @@ msgstr "" "Toon inkomende gebeurtenissen in het mededelingengebied. Toon deze direct " "aan de gebruiker als dit niet is ingesteld." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Echo cancellation support" msgstr "Ondersteuning voor echo-onderdrukking" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy can publish the user's location" msgstr "Empathy mag de locatie van de gebruiker bekend maken" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy mag GPS gebruiken om de locatie te bepalen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy can use the cellular network to guess the location" msgstr "Empathy mag het mobiele netwerk gebruiken om de locatie te bepalen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy can use the network to guess the location" msgstr "Empathy mag via het netwerk proberen om de locatie te bepalen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Empathy default download folder" msgstr "Standaard downloadmap voor Empathy" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 -msgid "Empathy has migrated butterfly logs" -msgstr "Empathy heeft butterfly-logs gemigreerd" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Empathy should auto-away when idle" msgstr "Empathy automatisch op 'afwezig' instellen bij inactiviteit" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Empathy should auto-connect on startup" msgstr "Empathy automatisch laten verbinden bij starten" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Empathy should reduce the location's accuracy" msgstr "Empathy moet de nauwkeurigheid van de locatie beperken" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "De gebruikersafbeelding gebruiken als pictogram van het chatvenster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Enable WebKit Developer Tools" msgstr "WebKit-ontwikkelhulpprogramma's inschakelen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Enable popup notifications for new messages" msgstr "Notificatieberichten tonen voor nieuwe berichten" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Enable spell checker" msgstr "Spellingcontrole inschakelen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Hide main window" msgstr "Hoofdvenster verbergen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Hide the main window." msgstr "Het hoofdvenster verbergen." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +msgid "Last account selected in Join Room dialog" +msgstr "" +"Account dat het laatst geselecteerd werd in dialoog \"Chatruimte binnengaan\"" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Nick completed character" msgstr "Achtervoegsel auto-afmaken" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Open new chats in separate windows" msgstr "Nieuwe chats in aparte vensters openen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Path of the Adium theme to use" msgstr "Pad van het te gebruiken Adium-thema" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "" "Pad van het te gebruiken Adium-thema als het thema voor chatten Adium is." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound for incoming messages" msgstr "Geluid afspelen bij nieuwe berichten" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for new conversations" msgstr "Geluid afspelen bij nieuwe gesprekken" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for outgoing messages" msgstr "Geluid afspelen bij uitgaande berichten" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Play a sound when a contact logs in" msgstr "Geluid afspelen wanneer contactpersonen zich aanmelden" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound when a contact logs out" msgstr "Geluid afspelen wanneer contactpersonen zich afmelden" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when we log in" msgstr "Geluid afspelen bij aanmelden" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound when we log out" msgstr "Geluid afspelen bij afmelden" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Pop up notifications if the chat isn't focused" msgstr "Notificatieberichten tonen als het chatvenster geen focus heeft" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Pop up notifications when a contact logs in" msgstr "Notificatiebericht tonen wanneer een contact zich aanmeldt" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Pop up notifications when a contact logs out" msgstr "Notificatiebericht tonen wanneer een contact zich afmeldt" # Dit is een kromme Engelse zin. Ik probeer er iets van te maken. -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Position the camera preview should be during a call." msgstr "Positie van het camerabeeld tijdens een gesprek." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "Show Balance in contact list" msgstr "Saldo in contactenlijst tonen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Show avatars" msgstr "Gebruikersafbeeldingen tonen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Show contact list in rooms" msgstr "Contactenlijst in chatruimtes tonen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Show hint about closing the main window" msgstr "Tip tonen bij het sluiten van het hoofdvenster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Show offline contacts" msgstr "Offline-contacten tonen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Show protocols" msgstr "Protocollen tonen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Spell checking languages" msgstr "Talen voor de spellingcontrole" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "The default folder to save file transfers in." msgstr "De standaardmap waar ontvangen bestanden opgeslagen worden." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "The last directory that an avatar image was chosen from." msgstr "De laatst gebruikte map voor gebruikersafbeeldingen." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "The position for the chat window side pane" msgstr "De positie van het chatvenster-zijpaneel" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "The stored position (in pixels) of the chat window side pane." msgstr "De opgeslagen positie (in pixels) van het chatvenster-zijpaneel." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "The theme that is used to display the conversation in chat windows." msgstr "Het thema dat gebruikt wordt voor het tonen van chats in chatvensters." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "" "De themavariant die gebruikt wordt voor het tonen van chats in chatvensters." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "Smileys grafisch tonen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Use notification sounds" msgstr "Waarschuwingsgeluiden gebruiken" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use theme for chat rooms" msgstr "Thema voor chatruimtes gebruiken" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "" "Of Empathy de locatie van de gebruiker aan de contacten mag bekend maken." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Of Empathy gps mag gebruiken om de locatie te bepalen." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "Of Empathy het mobiele netwerk mag gebruiken om de locatie te bepalen." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether Empathy can use the network to guess the location." msgstr "Of Empathy het netwerk mag gebruiken om de locatie te bepalen." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "Whether Empathy has migrated butterfly logs." -msgstr "Of Empathy butterfly-logs gemigreerd heeft." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "Of Empathy u automatisch moet aanmelden bij opstarten." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "" "Whether Empathy should go into away mode automatically if the user is idle." msgstr "" "Of Empathy automatisch op 'afwezig' ingesteld moet worden wanneer de " "gebruiker niets doet." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" "Of Empathy de nauwkeurigheid van de locatie moet beperken vanwege de privacy." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" "Of Empathy gebruikersafbeeldingen moet gebruiken als pictogram voor de " "chatvensters." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" "Of WebKit-ontwikkelhulpprogramma's, zoals de Web Inspector, ingeschakeld " "moeten worden." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." @@ -392,75 +388,75 @@ msgstr "" "verbinding te maken of de verbinding te verbreken." # Bah, wat een lelijke vertaling (Wouter Bolsterlee) -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "" "Whether to check words typed against the languages you want to check with." msgstr "" "Of ingetypte woorden gecontroleerd moeten worden met de talen die u op " "spelling wilt controleren." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Whether to convert smileys into graphical images in conversations." msgstr "Of smileys in gesprekken grafisch moeten worden getoond." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "" "Bepaalt of het echo-onderdrukkingsfilter van Pulseaudio moet worden " "ingeschakeld." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "Of er geluid afgespeeld moet worden als een contact zich aanmeldt." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "Of er geluid afgespeeld moet worden als een contact zich afmeldt." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Whether to play a sound to notify of events." msgstr "Of er geluid afgespeeld moet worden om gebeurtenissen te melden." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to play a sound to notify of incoming messages." msgstr "Of er geluid afgespeeld moet worden bij binnenkomende berichten." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Whether to play a sound to notify of new conversations." msgstr "" "Of er geluid afgespeeld moet worden om u op de hoogte te stellen van nieuwe " "gesprekken." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to play a sound to notify of outgoing messages." msgstr "Of er geluid afgespeeld moet worden bij uitgaande berichten." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Whether to play a sound when logging into a network." msgstr "Of er geluid afgespeeld moet worden bij aanmelden bij een netwerk." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to play a sound when logging out of a network." msgstr "Of er geluid afgespeeld moet worden bij afmelden bij een netwerk." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to play sound notifications when away or busy." msgstr "Of er geluid afgespeeld moet worden indien afwezig of bezig." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to show a popup notification when a contact goes offline." msgstr "" "Of er een notificatiebericht getoond moet worden wanneer een contact zich " "afmeldt." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Whether to show a popup notification when a contact goes online." msgstr "" "Of er een notificatiebericht getoond moet worden wanneer een contact zich " "aanmeldt." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." @@ -468,49 +464,49 @@ msgstr "" "Of er een notificatiebericht getoond moet worden bij het ontvangen van een " "bericht, ook als de chat geopend is, maar geen focus heeft." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Whether to show a popup notification when receiving a new message." msgstr "" "Of er een notificatiebericht getoond moet worden bij het ontvangen van een " "bericht." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Whether to show account balances in the contact list." msgstr "Of saldi getoond moeten worden in de contactenlijst." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "" "Of gebruikersafbeeldingen van contactpersonen getoond moeten worden in de " "contactenlijst en chatvensters." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Whether to show contacts that are offline in the contact list." msgstr "" "Of contactpersonen die offline zijn in de contactenlijst moeten worden " "getoond." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Whether to show popup notifications when away or busy." msgstr "" "Of er een notificatiebericht getoond moet worden indien afwezig of bezig." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to show protocols for contacts in the contact list." msgstr "" "Of er protocollen moeten worden getoond voor contactpersonen in de " "contactenlijst." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Whether to show the contact list in chat rooms." msgstr "Of de contactenlijst in chatruimtes getoond moet worden." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "Whether to show the contact list in compact mode." msgstr "Of de contactenlijst in compacte modus moet worden getoond." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." @@ -518,11 +514,11 @@ msgstr "" "Of het dialoogvenster over het sluiten van het hoofdvenster met de knop ‘x’ " "in de titelbalk getoond moet worden." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether to use the theme for chat rooms." msgstr "Of een thema gebruikt moet worden voor chatruimtes." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's name with the value \"name\". A value of \"state\" will sort " @@ -538,23 +534,51 @@ msgstr "Beheer Messaging- en VoIP-accounts" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2324 +#: ../src/empathy-accounts-dialog.c:2406 msgid "Messaging and VoIP Accounts" msgstr "Messaging- en VoIP-accounts" -#: ../libempathy/empathy-ft-handler.c:825 +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Geen reden opgegeven" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Een statuswijziging was aangevraagd" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "U heeft de bestandsoverdracht geannuleerd" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "De andere deelnemer heeft de bestandsoverdracht geannuleerd" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Fout bij versturen van bestand" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "De andere deelnemer kan het bestand niet versturen" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311 +msgid "Unknown reason" +msgstr "Reden onbekend" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Bestandsoverdracht voltooid, maar het bestand was beschadigd" -#: ../libempathy/empathy-ft-handler.c:1111 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Bestandsoverdracht wordt niet ondersteund door extern contact" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Het geselecteerde bestand is geen normaal bestand" -#: ../libempathy/empathy-ft-handler.c:1176 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Het geselecteerde bestand is leeg" @@ -574,169 +598,138 @@ msgstr "Gebeld met %s" msgid "Call from %s" msgstr "Oproep van %s" -#: ../libempathy/empathy-tp-file.c:268 -msgid "Socket type not supported" -msgstr "Sockettype niet ondersteund" - -#: ../libempathy/empathy-tp-file.c:387 -msgid "No reason was specified" -msgstr "Geen reden opgegeven" - -#: ../libempathy/empathy-tp-file.c:390 -msgid "The change in state was requested" -msgstr "Een statuswijziging was aangevraagd" - -#: ../libempathy/empathy-tp-file.c:393 -msgid "You canceled the file transfer" -msgstr "U heeft de bestandsoverdracht geannuleerd" - -#: ../libempathy/empathy-tp-file.c:396 -msgid "The other participant canceled the file transfer" -msgstr "De andere deelnemer heeft de bestandsoverdracht geannuleerd" - -#: ../libempathy/empathy-tp-file.c:399 -msgid "Error while trying to transfer the file" -msgstr "Fout bij versturen van bestand" - -#: ../libempathy/empathy-tp-file.c:402 -msgid "The other participant is unable to transfer the file" -msgstr "De andere deelnemer kan het bestand niet versturen" - -#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Reden onbekend" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:231 msgid "Available" msgstr "Beschikbaar" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:233 msgid "Busy" msgstr "Bezet" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:236 msgid "Away" msgstr "Afwezig" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:238 msgid "Invisible" msgstr "Onzichtbaar" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:240 msgid "Offline" msgstr "Offline" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:243 msgctxt "presence" msgid "Unknown" msgstr "Onbekend" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:283 msgid "No reason specified" msgstr "Geen reden opgegeven" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341 msgid "Status is set to offline" msgstr "Status is ingesteld op offline" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321 #: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Netwerkprobleem" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 msgid "Authentication failed" msgstr "Authenticatie is mislukt" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Encryption error" msgstr "Versleutelingsfout" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:293 msgid "Name in use" msgstr "Naam in gebruik" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327 msgid "Certificate not provided" msgstr "Geen certificaat gegeven" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate untrusted" msgstr "Onbetrouwbaar certificaat" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate expired" msgstr "Verlopen certificaat" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate not activated" msgstr "Certificaat nog niet geldig" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate hostname mismatch" msgstr "Certificaat is niet voor deze server" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate fingerprint mismatch" msgstr "Vingerafdruk van certificaat klopt niet" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate self-signed" msgstr "Zelfondertekend certificaat" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:309 msgid "Certificate error" msgstr "Certificaatfout" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:343 msgid "Encryption is not available" msgstr "Encryptie is niet beschikbaar" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:345 msgid "Certificate is invalid" msgstr "Certificaat is ongeldig" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:347 msgid "Connection has been refused" msgstr "Verbinding geweigerd" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:349 msgid "Connection can't be established" msgstr "Er kan geen verbinding gemaakt worden" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:351 msgid "Connection has been lost" msgstr "Verbinding verbroken" -#: ../libempathy/empathy-utils.c:354 +#: ../libempathy/empathy-utils.c:353 msgid "This resource is already connected to the server" msgstr "Er is al een verbinding met de server" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:355 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "" "Verbinding is vervangen door een nieuwe verbinding met dezelfde gegevens" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:358 msgid "The account already exists on the server" msgstr "Dit account bestaat al op de server" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:360 msgid "Server is currently too busy to handle the connection" msgstr "De server is te druk om de verbinding af te handelen" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:362 msgid "Certificate has been revoked" msgstr "Certificaat is ingetrokken" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:364 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "Het certificaat gebuikt een zwak algoritme, of is slecht beveiligd" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:367 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -744,20 +737,23 @@ msgstr "" "De lengte van het server-certificaat of de diepte van de certificaat-chain " "overschrijdt de grenzen, opgelegd door de cryptografische bibliotheek" -#: ../libempathy/empathy-utils.c:529 -#: ../libempathy-gtk/empathy-contact-list-store.h:73 +#: ../libempathy/empathy-utils.c:371 +msgid "Your software is too old" +msgstr "Uw software is te oud" + +#: ../libempathy/empathy-utils.c:530 msgid "People Nearby" msgstr "Mensen in uw omgeving" -#: ../libempathy/empathy-utils.c:534 +#: ../libempathy/empathy-utils.c:535 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:563 +#: ../libempathy/empathy-utils.c:564 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:564 +#: ../libempathy/empathy-utils.c:565 msgid "Facebook Chat" msgstr "Facebook-chat" @@ -807,102 +803,74 @@ msgstr[1] "%d maanden geleden" msgid "in the future" msgstr "in de toekomst" -#: ../libempathy-gtk/empathy-account-chooser.c:540 +#: ../libempathy-gtk/empathy-account-chooser.c:688 msgid "All accounts" msgstr "Alle Accounts" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Account" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Wachtwoord" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Server" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Poort" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:763 +#: ../libempathy-gtk/empathy-account-widget.c:815 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -msgid "My Web Accounts" -msgstr "Mijn webaccounts" - -#: ../libempathy-gtk/empathy-account-widget.c:1208 -#, c-format -msgid "The account %s is edited via %s." -msgstr "Account %s wordt bewerkt via %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1214 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Account %s kan niet worden bewerkt in Empathy." - -#: ../libempathy-gtk/empathy-account-widget.c:1233 -msgid "Launch My Web Accounts" -msgstr "Mijn webaccounts starten" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1241 -#, c-format -msgid "Edit %s" -msgstr "%s bewerken" - -#: ../libempathy-gtk/empathy-account-widget.c:1591 +#: ../libempathy-gtk/empathy-account-widget.c:1396 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "Gebruikersnaam:" -#: ../libempathy-gtk/empathy-account-widget.c:1909 +#: ../libempathy-gtk/empathy-account-widget.c:1708 msgid "A_pply" msgstr "Toe_passen" -#: ../libempathy-gtk/empathy-account-widget.c:1939 +#: ../libempathy-gtk/empathy-account-widget.c:1737 msgid "L_og in" msgstr "_Aanmelden" -#: ../libempathy-gtk/empathy-account-widget.c:2013 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "Deze account bestaat al op de server" -#: ../libempathy-gtk/empathy-account-widget.c:2016 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "Nieuwe account aanmaken op de server" -#: ../libempathy-gtk/empathy-account-widget.c:2208 -msgid "Ca_ncel" -msgstr "_Annuleren" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2486 +#: ../libempathy-gtk/empathy-account-widget.c:2239 #, c-format msgid "%1$s on %2$s" msgstr "%1$s op %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:2512 +#: ../libempathy-gtk/empathy-account-widget.c:2265 #, c-format msgid "%s Account" msgstr "%s account" -#: ../libempathy-gtk/empathy-account-widget.c:2516 +#: ../libempathy-gtk/empathy-account-widget.c:2269 msgid "New account" msgstr "Nieuwe account" @@ -950,7 +918,7 @@ msgstr "Wachtwoord onthouden" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 msgid "Remember password" msgstr "Wachtwoord onthouden" @@ -1275,7 +1243,7 @@ msgid "STUN Server:" msgstr "STUN-server:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contact-widget.c:347 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 msgid "Server:" msgstr "Server:" @@ -1359,7 +1327,7 @@ msgid "Click to enlarge" msgstr "Klik om te vergroten" #: ../libempathy-gtk/empathy-call-utils.c:44 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:62 msgid "There was an error starting the call" msgstr "Er is een fout opgetreden bij het doen van de oproep" @@ -1379,40 +1347,44 @@ msgstr "Het opgegeven contact is ongeldig" msgid "Emergency calls are not supported on this protocol" msgstr "Noodoproepen worden niet ondersteund bij dit protocol" -#: ../libempathy-gtk/empathy-chat.c:704 +#: ../libempathy-gtk/empathy-call-utils.c:59 +msgid "You don't have enough credit in order to place this call" +msgstr "U heeft onvoldoende tegoed voor deze gespreksoproep" + +#: ../libempathy-gtk/empathy-chat.c:705 msgid "Failed to open private chat" msgstr "Openen van privé-chat is mislukt" -#: ../libempathy-gtk/empathy-chat.c:765 +#: ../libempathy-gtk/empathy-chat.c:763 msgid "Topic not supported on this conversation" msgstr "Onderwerp niet ondersteund bij dit gesprek" -#: ../libempathy-gtk/empathy-chat.c:771 +#: ../libempathy-gtk/empathy-chat.c:769 msgid "You are not allowed to change the topic" msgstr "U mag het onderwerp niet wijzigen" -#: ../libempathy-gtk/empathy-chat.c:975 +#: ../libempathy-gtk/empathy-chat.c:970 #, c-format msgid "“%s” is not a valid contact ID" msgstr "‘%s’ is geen geldig contact-ID" -#: ../libempathy-gtk/empathy-chat.c:1060 +#: ../libempathy-gtk/empathy-chat.c:1065 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: alle berichten van de huidige conversatie wissen" -#: ../libempathy-gtk/empathy-chat.c:1063 +#: ../libempathy-gtk/empathy-chat.c:1068 msgid "/topic : set the topic of the current conversation" msgstr "/topic : bepaal het onderwerp van de huidige conversatie" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/join : join a new chat room" msgstr "/join : een nieuwe chatruimte binnengaan" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1074 msgid "/j : join a new chat room" msgstr "/j : een nieuwe chatruimte binnengaan" -#: ../libempathy-gtk/empathy-chat.c:1073 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "" "/part [] []: leave the chat room, by default the " "current one" @@ -1420,23 +1392,23 @@ msgstr "" "/part [] []: de chatruimte verlaten, standaard de " "huidige" -#: ../libempathy-gtk/empathy-chat.c:1077 +#: ../libempathy-gtk/empathy-chat.c:1082 msgid "/query []: open a private chat" msgstr "/query []: een privé-gesprek beginnen" -#: ../libempathy-gtk/empathy-chat.c:1080 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/msg : open a private chat" msgstr "/msg : een privé-gesprek beginnen" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/nick : change your nickname on the current server" msgstr "/nick : wijzig uw bijnaam op de huidige server" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/me : send an ACTION message to the current conversation" msgstr "/me : stuur een ACTIE-bericht naar de huidige conversatie" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1446,11 +1418,11 @@ msgstr "" "gebruikt om een bericht beginnend met een '/' te versturen. Bijvoorbeeld: \"/" "say /join wordt gebruikt om een nieuwe chatruimte binnen te gaan\"" -#: ../libempathy-gtk/empathy-chat.c:1094 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "/whois : display information about a contact" msgstr "/whois : informatie over een contact weergeven" -#: ../libempathy-gtk/empathy-chat.c:1097 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1458,113 +1430,121 @@ msgstr "" "/help []: toon alle bestaande opdrachten. Als bestaat, " "wordt de uitleg ervan weergegeven." -#: ../libempathy-gtk/empathy-chat.c:1114 +#: ../libempathy-gtk/empathy-chat.c:1121 #, c-format msgid "Usage: %s" msgstr "Gebruik: %s" -#: ../libempathy-gtk/empathy-chat.c:1159 +#: ../libempathy-gtk/empathy-chat.c:1166 msgid "Unknown command" msgstr "Onbekende opdracht" -#: ../libempathy-gtk/empathy-chat.c:1285 +#: ../libempathy-gtk/empathy-chat.c:1292 msgid "Unknown command; see /help for the available commands" msgstr "Onbekende opdracht; zie /help voor de beschikbare opdrachten" -#. translators: error used when user doesn't have enough credit on his -#. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1455 +#: ../libempathy-gtk/empathy-chat.c:1456 msgid "insufficient balance to send message" msgstr "Onvoldoende saldo om een bericht te versturen" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474 +#: ../libempathy-gtk/empathy-chat.c:1537 +#, c-format +msgid "Error sending message '%s': %s" +msgstr "Fout bij versturen van bericht ‘%s’: %s" + +#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479 +#: ../libempathy-gtk/empathy-chat.c:1541 +#, c-format +msgid "Error sending message: %s" +msgstr "Fout bij versturen van bericht: %s" + +#. translators: error used when user doesn't have enough credit on his +#. * account to send the message. +#: ../libempathy-gtk/empathy-chat.c:1468 +#, c-format +msgid "insufficient balance to send message. Top up." +msgstr "" +"Onvoldoende saldo om bericht te versturen. Vul het aan." + +#: ../libempathy-gtk/empathy-chat.c:1508 msgid "not capable" msgstr "kan niet" -#: ../libempathy-gtk/empathy-chat.c:1464 +#: ../libempathy-gtk/empathy-chat.c:1515 msgid "offline" msgstr "offline" -#: ../libempathy-gtk/empathy-chat.c:1467 +#: ../libempathy-gtk/empathy-chat.c:1518 msgid "invalid contact" msgstr "ongeldig contact" -#: ../libempathy-gtk/empathy-chat.c:1470 +#: ../libempathy-gtk/empathy-chat.c:1521 msgid "permission denied" msgstr "toestemming geweigerd" -#: ../libempathy-gtk/empathy-chat.c:1473 +#: ../libempathy-gtk/empathy-chat.c:1524 msgid "too long message" msgstr "bericht te lang" -#: ../libempathy-gtk/empathy-chat.c:1476 +#: ../libempathy-gtk/empathy-chat.c:1527 msgid "not implemented" msgstr "niet geïmplementeerd" -#: ../libempathy-gtk/empathy-chat.c:1480 +#: ../libempathy-gtk/empathy-chat.c:1531 msgid "unknown" msgstr "onbekend" -#: ../libempathy-gtk/empathy-chat.c:1486 -#, c-format -msgid "Error sending message '%s': %s" -msgstr "Fout bij versturen van bericht ‘%s’: %s" - -#: ../libempathy-gtk/empathy-chat.c:1490 -#, c-format -msgid "Error sending message: %s" -msgstr "Fout bij versturen van bericht: %s" - -#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761 msgid "Topic:" msgstr "Onderwerp:" -#: ../libempathy-gtk/empathy-chat.c:1563 +#: ../libempathy-gtk/empathy-chat.c:1610 #, c-format msgid "Topic set to: %s" msgstr "Onderwerp ingesteld: %s" -#: ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "No topic defined" msgstr "Geen onderwerp" -#: ../libempathy-gtk/empathy-chat.c:2074 +#: ../libempathy-gtk/empathy-chat.c:2125 msgid "(No Suggestions)" msgstr "(Geen suggesties)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2142 +#: ../libempathy-gtk/empathy-chat.c:2193 #, c-format msgid "Add '%s' to Dictionary" msgstr "‘%s’ toevoegen aan woordenboek" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2179 +#: ../libempathy-gtk/empathy-chat.c:2230 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "‘%s’ toevoegen aan woordenboek %s" -#: ../libempathy-gtk/empathy-chat.c:2249 +#: ../libempathy-gtk/empathy-chat.c:2300 msgid "Insert Smiley" msgstr "Smiley invoegen" #. send button -#: ../libempathy-gtk/empathy-chat.c:2267 -#: ../libempathy-gtk/empathy-ui-utils.c:1839 +#: ../libempathy-gtk/empathy-chat.c:2318 +#: ../libempathy-gtk/empathy-ui-utils.c:1868 msgid "_Send" msgstr "_Sturen" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2321 +#: ../libempathy-gtk/empathy-chat.c:2375 msgid "_Spelling Suggestions" msgstr "_Spellingsuggesties" -#: ../libempathy-gtk/empathy-chat.c:2410 +#: ../libempathy-gtk/empathy-chat.c:2464 msgid "Failed to retrieve recent logs" msgstr "Terughalen van recente logs is mislukt" -#: ../libempathy-gtk/empathy-chat.c:2547 +#: ../libempathy-gtk/empathy-chat.c:2601 #, c-format msgid "%s has disconnected" msgstr "%s heeft de verbinding verbroken" @@ -1572,12 +1552,12 @@ msgstr "%s heeft de verbinding verbroken" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2554 +#: ../libempathy-gtk/empathy-chat.c:2608 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s werd door %2$s verwijderd" -#: ../libempathy-gtk/empathy-chat.c:2557 +#: ../libempathy-gtk/empathy-chat.c:2611 #, c-format msgid "%s was kicked" msgstr "%s werd verwijderd" @@ -1585,17 +1565,17 @@ msgstr "%s werd verwijderd" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2565 +#: ../libempathy-gtk/empathy-chat.c:2619 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s werd verbannen door %2$s" -#: ../libempathy-gtk/empathy-chat.c:2568 +#: ../libempathy-gtk/empathy-chat.c:2622 #, c-format msgid "%s was banned" msgstr "%s werd verbannen" -#: ../libempathy-gtk/empathy-chat.c:2572 +#: ../libempathy-gtk/empathy-chat.c:2626 #, c-format msgid "%s has left the room" msgstr "%s heeft de chatruimte verlaten" @@ -1605,17 +1585,17 @@ msgstr "%s heeft de chatruimte verlaten" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2581 +#: ../libempathy-gtk/empathy-chat.c:2635 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2606 +#: ../libempathy-gtk/empathy-chat.c:2660 #, c-format msgid "%s has joined the room" msgstr "%s is de chatruimte binnengekomen" -#: ../libempathy-gtk/empathy-chat.c:2631 +#: ../libempathy-gtk/empathy-chat.c:2685 #, c-format msgid "%s is now known as %s" msgstr "%s is nu bekend als %s" @@ -1623,88 +1603,88 @@ msgstr "%s is nu bekend als %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:2784 -#: ../src/empathy-streamed-media-window.c:1894 -#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432 -#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527 +#: ../libempathy-gtk/empathy-chat.c:2846 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "Verbinding verbroken" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3428 +#: ../libempathy-gtk/empathy-chat.c:3492 msgid "Would you like to store this password?" msgstr "Wilt u dit wachtwoord opslaan?" -#: ../libempathy-gtk/empathy-chat.c:3434 +#: ../libempathy-gtk/empathy-chat.c:3498 msgid "Remember" msgstr "Onthouden" -#: ../libempathy-gtk/empathy-chat.c:3444 +#: ../libempathy-gtk/empathy-chat.c:3508 msgid "Not now" msgstr "Niet nu" -#: ../libempathy-gtk/empathy-chat.c:3488 +#: ../libempathy-gtk/empathy-chat.c:3552 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Opnieuw proberen" -#: ../libempathy-gtk/empathy-chat.c:3492 +#: ../libempathy-gtk/empathy-chat.c:3556 msgid "Wrong password; please try again:" msgstr "Verkeerd wachtwoord; probeer het opnieuw:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3622 +#: ../libempathy-gtk/empathy-chat.c:3686 msgid "This room is protected by a password:" msgstr "Deze ruimte is met een wachtwoord beveiligd:" -#: ../libempathy-gtk/empathy-chat.c:3649 +#: ../libempathy-gtk/empathy-chat.c:3713 msgid "Join" msgstr "Binnengaan" -#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261 +#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Verbonden" -#: ../libempathy-gtk/empathy-chat.c:3906 +#: ../libempathy-gtk/empathy-chat.c:3956 msgid "Conversation" msgstr "Gesprek" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3911 +#: ../libempathy-gtk/empathy-chat.c:3961 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Onbekende of ongeldige identifier" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Blokkeren van contact tijdelijk niet beschikbaar" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Blokkeren van contact niet beschikbaar" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Toestemming geweigerd" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Contact kon niet worden geblokkeerd" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Geblokkeerde contacten bewerken" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1489 -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" @@ -1722,56 +1702,51 @@ msgid "Remove" msgstr "Verwijderen" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "Koppelingsadres _kopiëren" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 +#: ../libempathy-gtk/empathy-chat-text-view.c:329 #: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "Koppeling _openen" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:417 msgid "%A %B %d %Y" msgstr "%A %d %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Contactinformatie bewerken" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 +#: ../libempathy-gtk/empathy-contact-dialogs.c:278 msgid "Personal Information" msgstr "Persoonlijke informatie" -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:379 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "Nieuw contact" -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 +#: ../libempathy-gtk/empathy-contact-dialogs.c:448 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "%s blokkeren?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 +#: ../libempathy-gtk/empathy-contact-dialogs.c:453 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "Weet u zeker dat u niet meer wilt dat ‘%s’ nog contact met u opneemt?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 +#: ../libempathy-gtk/empathy-contact-dialogs.c:458 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 msgid "_Block" msgstr "_Blokkeren" -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 +#: ../libempathy-gtk/empathy-contact-dialogs.c:476 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Melden dat dit contact beledigend is" @@ -1789,344 +1764,253 @@ msgstr "Inschrijvingsverzoek" msgid "_Block User" msgstr "Gebruiker _blokkeren" -#: ../libempathy-gtk/empathy-contact-list-store.h:71 -msgid "Ungrouped" -msgstr "Groep opgeheven" - -#: ../libempathy-gtk/empathy-contact-list-store.h:72 -msgid "Favorite People" -msgstr "Favoriete personen" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-individual-view.c:2376 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Wilt u echt de groep ‘%s’ verwijderen?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1988 -#: ../libempathy-gtk/empathy-individual-view.c:2379 -msgid "Removing group" -msgstr "Groep verwijderen" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:2037 -#: ../libempathy-gtk/empathy-contact-list-view.c:2114 -#: ../libempathy-gtk/empathy-individual-view.c:2434 -#: ../libempathy-gtk/empathy-individual-view.c:2637 -msgid "_Remove" -msgstr "_Verwijderen" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2067 -#: ../libempathy-gtk/empathy-individual-view.c:2501 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Wilt u het contact ‘%s’ echt verwijderen?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2069 -#: ../libempathy-gtk/empathy-individual-view.c:2522 -msgid "Removing contact" -msgstr "Contact wordt verwijderd" - -#: ../libempathy-gtk/empathy-contact-menu.c:220 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "Cont_act toevoegen..." - -#: ../libempathy-gtk/empathy-contact-menu.c:300 -msgid "_Block Contact" -msgstr "Contact _blokkeren" - -#: ../libempathy-gtk/empathy-contact-menu.c:329 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "_Chatten" - -#: ../libempathy-gtk/empathy-contact-menu.c:361 -#: ../libempathy-gtk/empathy-individual-menu.c:849 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Audiogesprek" - -#: ../libempathy-gtk/empathy-contact-menu.c:394 -#: ../libempathy-gtk/empathy-individual-menu.c:894 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Videogesprek" - -#: ../libempathy-gtk/empathy-contact-menu.c:440 -#: ../libempathy-gtk/empathy-individual-menu.c:947 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "_Eerdere gesprekken" - -#: ../libempathy-gtk/empathy-contact-menu.c:462 -#: ../libempathy-gtk/empathy-individual-menu.c:988 -msgid "Send File" -msgstr "Bestand versturen" - -#: ../libempathy-gtk/empathy-contact-menu.c:485 -#: ../libempathy-gtk/empathy-individual-menu.c:1030 -msgid "Share My Desktop" -msgstr "Mijn bureaublad delen" - -# hmmmm (Wouter Bolsterlee) -#: ../libempathy-gtk/empathy-contact-menu.c:525 -#: ../libempathy-gtk/empathy-contact-widget.c:1886 -#: ../libempathy-gtk/empathy-individual-menu.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:1372 -msgid "Favorite" -msgstr "Favoriet" - -#: ../libempathy-gtk/empathy-contact-menu.c:554 -#: ../libempathy-gtk/empathy-individual-menu.c:1093 -msgid "Infor_mation" -msgstr "Infor_matie" - -#: ../libempathy-gtk/empathy-contact-menu.c:600 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "Be_werken" - -#: ../libempathy-gtk/empathy-contact-menu.c:654 -#: ../libempathy-gtk/empathy-individual-menu.c:1284 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Nodigt u uit naar deze ruimte" - -#: ../libempathy-gtk/empathy-contact-menu.c:685 -#: ../libempathy-gtk/empathy-individual-menu.c:1330 -msgid "_Invite to Chat Room" -msgstr "_Uitnodigen naar gespreksruimte" - #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Zoeken naar contacten" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Zoeken: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "Cont_act toevoegen..." -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Geen contacten gevonden" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "Uw introductiebericht:" # Geen idee of dit zinnig is. (Wouter Bolsterlee) -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "Laat me het maar weten als je online bent. Bedankt!" -#: ../libempathy-gtk/empathy-contact-selector.c:129 -msgid "Select a contact" -msgstr "Selecteer een contact" - -#: ../libempathy-gtk/empathy-contact-widget.c:336 -#: ../libempathy-gtk/empathy-individual-widget.c:153 -msgid "Full name:" -msgstr "Volledige naam:" - -#: ../libempathy-gtk/empathy-contact-widget.c:337 -#: ../libempathy-gtk/empathy-individual-widget.c:154 -msgid "Phone number:" -msgstr "Telefoonnummer:" - -#: ../libempathy-gtk/empathy-contact-widget.c:338 -#: ../libempathy-gtk/empathy-individual-widget.c:155 -msgid "E-mail address:" -msgstr "E-mailadres:" - -#: ../libempathy-gtk/empathy-contact-widget.c:339 -#: ../libempathy-gtk/empathy-individual-widget.c:156 -msgid "Website:" -msgstr "Website:" - -#: ../libempathy-gtk/empathy-contact-widget.c:340 -#: ../libempathy-gtk/empathy-individual-widget.c:157 -msgid "Birthday:" -msgstr "Geboortedatum:" - -#. 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-contact-widget.c:346 -msgid "Last seen:" -msgstr "Voor het laatst gezien:" - -#: ../libempathy-gtk/empathy-contact-widget.c:348 -msgid "Connected from:" -msgstr "Verbonden via:" - -#. FIXME: once Idle implements SimplePresence using this information, we can -#. * and should bin this. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:353 -msgid "Away message:" -msgstr "Afwezigheidsbericht:" - -#: ../libempathy-gtk/empathy-contact-widget.c:606 +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Kanalen:" -#: ../libempathy-gtk/empathy-contact-widget.c:897 -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "Land-ISO-code:" -#: ../libempathy-gtk/empathy-contact-widget.c:899 -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Land:" -#: ../libempathy-gtk/empathy-contact-widget.c:901 -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Provincie:" -#: ../libempathy-gtk/empathy-contact-widget.c:903 -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Woonplaats:" -#: ../libempathy-gtk/empathy-contact-widget.c:905 -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Regio:" -#: ../libempathy-gtk/empathy-contact-widget.c:907 -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Postcode:" -#: ../libempathy-gtk/empathy-contact-widget.c:909 -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Straat:" -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Gebouw:" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Verdieping:" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Ruimte:" -#: ../libempathy-gtk/empathy-contact-widget.c:917 -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Tekst:" -#: ../libempathy-gtk/empathy-contact-widget.c:919 -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Omschrijving:" -#: ../libempathy-gtk/empathy-contact-widget.c:921 -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:923 -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Nauwkeurigheidsniveau:" -#: ../libempathy-gtk/empathy-contact-widget.c:925 -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Fout:" -#: ../libempathy-gtk/empathy-contact-widget.c:927 -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Verticale fout (meters):" -#: ../libempathy-gtk/empathy-contact-widget.c:929 -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Horizontale fout (meters):" -#: ../libempathy-gtk/empathy-contact-widget.c:931 -#: ../libempathy-gtk/empathy-individual-widget.c:503 +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Snelheid:" -#: ../libempathy-gtk/empathy-contact-widget.c:933 -#: ../libempathy-gtk/empathy-individual-widget.c:505 +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Koers:" -#: ../libempathy-gtk/empathy-contact-widget.c:935 -#: ../libempathy-gtk/empathy-individual-widget.c:507 +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Klimsnelheid:" -#: ../libempathy-gtk/empathy-contact-widget.c:937 -#: ../libempathy-gtk/empathy-individual-widget.c:509 +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Voor het laatst bijgewerkt op:" -#: ../libempathy-gtk/empathy-contact-widget.c:939 -#: ../libempathy-gtk/empathy-individual-widget.c:511 +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Lengtegraad:" -#: ../libempathy-gtk/empathy-contact-widget.c:941 -#: ../libempathy-gtk/empathy-individual-widget.c:513 +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Breedtegraad:" -#: ../libempathy-gtk/empathy-contact-widget.c:943 -#: ../libempathy-gtk/empathy-individual-widget.c:515 -msgid "Altitude:" -msgstr "Hoogte:" +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 +msgid "Altitude:" +msgstr "Hoogte:" + +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:15 +msgid "Location" +msgstr "Locatie" + +#. translators: format is "Location, $date" +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 +#, c-format +msgid "%s, %s" +msgstr "%s, %s" + +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 +msgid "%B %e, %Y at %R UTC" +msgstr "%e %B %Y om %R UTC" + +# hier geen 'gebruikersafbeelding', want dat is te groot (Wouter Bolsterlee) +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 +msgid "Save Avatar" +msgstr "Gebruikersafbeelding opslaan" + +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 +msgid "Unable to save avatar" +msgstr "Kan gebruikersafbeelding niet opslaan" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +msgid "Full name" +msgstr "Volledige naam" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "Telefoonnummer" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "E-mailadres" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +msgid "Website" +msgstr "Website" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +msgid "Birthday" +msgstr "Geboortedatum" + +#. 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:113 +msgid "Last seen:" +msgstr "Voor het laatst gezien:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +msgid "Connected from:" +msgstr "Verbonden via:" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +msgid "Away message:" +msgstr "Afwezigheidsbericht:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +msgid "work" +msgstr "Werk" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +msgid "home" +msgstr "thuis" -#: ../libempathy-gtk/empathy-contact-widget.c:996 -#: ../libempathy-gtk/empathy-contact-widget.c:1011 -#: ../libempathy-gtk/empathy-individual-widget.c:607 -#: ../libempathy-gtk/empathy-individual-widget.c:622 -#: ../src/empathy-preferences.ui.h:17 -msgid "Location" -msgstr "Locatie" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +msgid "mobile" +msgstr "Mobiel" -#. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:1013 -#: ../libempathy-gtk/empathy-individual-widget.c:624 -#, c-format -msgid "%s, %s" -msgstr "%s, %s" +# hmmmm (Wouter Bolsterlee) +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +msgid "voice" +msgstr "spraak" -#: ../libempathy-gtk/empathy-contact-widget.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:673 -msgid "%B %e, %Y at %R UTC" -msgstr "%e %B %Y om %R UTC" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +msgid "preferred" +msgstr "voorkeur" -# hier geen 'gebruikersafbeelding', want dat is te groot (Wouter Bolsterlee) -#: ../libempathy-gtk/empathy-contact-widget.c:1147 -#: ../libempathy-gtk/empathy-individual-widget.c:915 -msgid "Save Avatar" -msgstr "Gebruikersafbeelding opslaan" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "post" -#: ../libempathy-gtk/empathy-contact-widget.c:1203 -#: ../libempathy-gtk/empathy-individual-widget.c:973 -msgid "Unable to save avatar" -msgstr "Kan gebruikersafbeelding niet opslaan" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +msgid "parcel" +msgstr "pakje" #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 msgid "Location at (date)\t" @@ -2134,7 +2018,7 @@ msgstr "Locatie op (datum)\t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1308 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "Alias:" @@ -2154,7 +2038,7 @@ msgstr "Gegevens contact" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1517 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "Identificatie:" @@ -2193,95 +2077,177 @@ msgid "Select" msgstr "Selecteren" #: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1807 +#: ../src/empathy-main-window.c:1949 msgid "Group" msgstr "Groep" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "De volgende identiteit zal worden geblokkeerd:" msgstr[1] "De volgende identiteiten zullen worden geblokkeerd:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "De volgende identiteit kan niet worden geblokkeerd:" msgstr[1] "De volgende identiteiten kunnen niet worden geblokkeerd:" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Contactinformatie bewerken" + #. Translators: the heading at the top of the Information dialogue #: ../libempathy-gtk/empathy-individual-information-dialog.c:288 msgid "Linked Contacts" msgstr "Verbonden contacten" -#: ../libempathy-gtk/empathy-individual-linker.c:370 +#: ../libempathy-gtk/empathy-individual-linker.c:372 msgid "Select contacts to link" msgstr "Selecteer contacten om te verbinden" -#: ../libempathy-gtk/empathy-individual-linker.c:444 +#: ../libempathy-gtk/empathy-individual-linker.c:447 msgid "New contact preview" msgstr "Nieuw contact inzien" -#: ../libempathy-gtk/empathy-individual-linker.c:488 +#: ../libempathy-gtk/empathy-individual-linker.c:491 msgid "Contacts selected in the list on the left will be linked together." msgstr "Contactpersonen aan de linkerzijde zullen met elkaar worden verbonden." #. 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:145 +#: ../libempathy-gtk/empathy-individual-menu.c:181 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:363 msgid "Select account to use to place the call" msgstr "Het te gebruiken account om de oproep te plaatsen selecteren" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 +#: ../libempathy-gtk/empathy-individual-menu.c:367 #: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1299 +#: ../src/empathy-streamed-media-window.c:1288 #: ../src/empathy-call-window.ui.h:2 msgid "Call" msgstr "Oproep" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:432 msgid "Mobile" msgstr "Mobiel" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:434 msgid "Work" msgstr "Werk" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:436 msgid "HOME" msgstr "THUIS" -#. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:804 -#: ../libempathy-gtk/empathy-new-message-dialog.c:215 +#: ../libempathy-gtk/empathy-individual-menu.c:677 +msgid "_Block Contact" +msgstr "Contact _blokkeren" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-main-window-menubar.ui.h:16 +msgid "_Chat" +msgstr "_Chatten" + +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1142 +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Audiogesprek" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Videogesprek" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-main-window-menubar.ui.h:27 +msgid "_Previous Conversations" +msgstr "_Eerdere gesprekken" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +msgid "Send File" +msgstr "Bestand versturen" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "Mijn bureaublad delen" + +# hmmmm (Wouter Bolsterlee) +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Favoriet" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "Infor_matie" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "Be_werken" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1168 +#: ../libempathy-gtk/empathy-individual-menu.c:1385 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "Contacten _verbinden…" -#: ../libempathy-gtk/empathy-individual-view.c:2341 +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1011 +msgid "Inviting you to this room" +msgstr "Nodigt u uit naar deze ruimte" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +msgid "_Invite to Chat Room" +msgstr "_Uitnodigen naar gespreksruimte" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-main-window-menubar.ui.h:14 +msgid "_Add Contact…" +msgstr "Cont_act toevoegen..." + +#: ../libempathy-gtk/empathy-individual-view.c:2355 msgid "Delete and _Block" msgstr "Verwijderen en _blokkeren" -#: ../libempathy-gtk/empathy-individual-view.c:2510 +#: ../libempathy-gtk/empathy-individual-view.c:2390 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Wilt u echt de groep ‘%s’ verwijderen?" + +#: ../libempathy-gtk/empathy-individual-view.c:2393 +msgid "Removing group" +msgstr "Groep verwijderen" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2448 +#: ../libempathy-gtk/empathy-individual-view.c:2665 +msgid "_Remove" +msgstr "_Verwijderen" + +#: ../libempathy-gtk/empathy-individual-view.c:2525 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Wilt u het contact ‘%s’ echt verwijderen?" + +#: ../libempathy-gtk/empathy-individual-view.c:2534 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2290,7 +2256,11 @@ msgstr "" "Wilt u echt het meta-contact ‘%s’ verwijderen? Dit zal tevens alle contacten " "die bij dit meta-contact horen verwijderen." -#: ../libempathy-gtk/empathy-individual-widget.c:1656 +#: ../libempathy-gtk/empathy-individual-view.c:2546 +msgid "Removing contact" +msgstr "Contact wordt verwijderd" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2374,135 +2344,135 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "_Verbinding verbreken" -#: ../libempathy-gtk/empathy-log-window.c:634 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Geschiedenis" -#: ../libempathy-gtk/empathy-log-window.c:689 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Tonen" -#: ../libempathy-gtk/empathy-log-window.c:711 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Zoeken" -#: ../libempathy-gtk/empathy-log-window.c:1159 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Chatten in %s" -#: ../libempathy-gtk/empathy-log-window.c:1161 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Chatten met %s" -#: ../libempathy-gtk/empathy-log-window.c:1211 -#: ../libempathy-gtk/empathy-log-window.c:1358 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 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:1300 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1306 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s seconde" msgstr[1] "%s seconden" -#: ../libempathy-gtk/empathy-log-window.c:1389 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s minuut" msgstr[1] "%s minuten" -#: ../libempathy-gtk/empathy-log-window.c:1397 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Gesprek duurde %s, eindigde om %s" -#: ../libempathy-gtk/empathy-log-window.c:1729 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Vandaag" -#: ../libempathy-gtk/empathy-log-window.c:1733 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Gisteren" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1748 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%d %B %Y" #: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3444 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Altijd" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2372 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Iedereen" -#: ../libempathy-gtk/empathy-log-window.c:2685 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Wie" -#: ../libempathy-gtk/empathy-log-window.c:2889 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Wanneer" -#: ../libempathy-gtk/empathy-log-window.c:3005 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Alles" -#: ../libempathy-gtk/empathy-log-window.c:3007 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Tekstchats" -#: ../libempathy-gtk/empathy-log-window.c:3009 +#: ../libempathy-gtk/empathy-log-window.c:3044 #: ../src/empathy-preferences.ui.h:4 msgid "Calls" msgstr "Gesprekken" -#: ../libempathy-gtk/empathy-log-window.c:3014 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Binnenkomende gesprekken" -#: ../libempathy-gtk/empathy-log-window.c:3015 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Uitgaande gesprekken" -#: ../libempathy-gtk/empathy-log-window.c:3016 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Gemiste oproepen" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Wat" -#: ../libempathy-gtk/empathy-log-window.c:3747 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Weet u zeker dat u alle logs van vorige gesprekken wilt verwijderen?" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Alles wissen" -#: ../libempathy-gtk/empathy-log-window.c:3758 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Verwijderen uit:" @@ -2543,36 +2513,82 @@ msgstr "_Bestand" msgid "page 2" msgstr "pagina 2" -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 -msgid "Contact ID:" -msgstr "Contact-ID:" +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 +msgid "The contact is offline" +msgstr "Het contact is offline" -#. add chat button -#: ../libempathy-gtk/empathy-new-message-dialog.c:225 -msgid "C_hat" -msgstr "_Chatten" +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 +msgid "The specified contact is either invalid or unknown" +msgstr "Het opgegeven contact is ongeldig of onbekend" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 +msgid "The contact does not support this kind of conversation" +msgstr "Het contact ondersteunt dit soort gesprek niet" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 +msgid "The requested functionality is not implemented for this protocol" +msgstr "De verzochte functionaliteit is niet geïmplementeerd voor dit protocol" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 +msgid "Could not start a conversation with the given contact" +msgstr "Kon geen gesprek starten met opgegeven contact" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 +msgid "You are banned from this channel" +msgstr "U bent verbannen uit dit kanaal" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 +msgid "This channel is full" +msgstr "Dit kanaal is vol" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 +msgid "You must be invited to join this channel" +msgstr "U moet uitgenodigd zijn om dit kanaal binnen te kunnen gaan" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 +msgid "Can't proceed while disconnected" +msgstr "Kan niet verdergaan zonder verbinding" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 +msgid "Permission denied" +msgstr "Toestemming geweigerd" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 +msgid "There was an error starting the conversation" +msgstr "Er is een fout opgetreden bij het starten van het gesprek" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 +msgid "Enter a contact identifier or phone number:" +msgstr "Voer een contact-identifier of telefoonnummer in:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:244 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Nieuw gesprek" -#. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:204 -msgid "Send _Video" -msgstr "_Video sturen" +#. add video button +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +msgid "_Video Call" +msgstr "_Videogesprek" -#. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:215 -msgid "C_all" -msgstr "_Opbellen" +#. add audio button +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 +msgid "_Audio Call" +msgstr "_Audiogesprek" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Nieuwe oproep" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Authenticatie is mislukt voor account %s" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2609,12 +2625,8 @@ msgstr "Klik om deze status als favoriet in te stellen" msgid "Set status" msgstr "Status instellen" -#: ../libempathy-gtk/empathy-presence-chooser.c:943 -msgid "Set your presence and current status" -msgstr "Uw aanwezigheid en huidige status instellen" - #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1131 +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 msgid "Custom messages…" msgstr "Aangepaste berichten…" @@ -2691,12 +2703,12 @@ msgstr "Spraakoproep beëindigd" msgid "Edit Custom Messages" msgstr "Aangepaste berichten bewerken" -#: ../libempathy-gtk/empathy-theme-adium.c:1036 +#: ../libempathy-gtk/empathy-theme-adium.c:1047 #, c-format msgid "Message edited at %s" msgstr "Bericht bijgewerkt op %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1726 +#: ../libempathy-gtk/empathy-theme-adium.c:1752 msgid "Normal" msgstr "Normaal" @@ -2790,19 +2802,19 @@ msgstr "Onthoud deze instelling voor toekomstige verbindingen" msgid "Certificate Details" msgstr "Certificaatdetails" -#: ../libempathy-gtk/empathy-ui-utils.c:1735 +#: ../libempathy-gtk/empathy-ui-utils.c:1742 msgid "Unable to open URI" msgstr "Kan URI niet openen" -#: ../libempathy-gtk/empathy-ui-utils.c:1831 +#: ../libempathy-gtk/empathy-ui-utils.c:1860 msgid "Select a file" msgstr "Bestand selecteren" -#: ../libempathy-gtk/empathy-ui-utils.c:1903 +#: ../libempathy-gtk/empathy-ui-utils.c:1935 msgid "Insufficient free space to save file" msgstr "Onvoldoende vrije schijfruimte om het bestand op te slaan" -#: ../libempathy-gtk/empathy-ui-utils.c:1911 +#: ../libempathy-gtk/empathy-ui-utils.c:1943 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2811,7 +2823,7 @@ msgstr "" "Er is %s vrije schijfruimte vereist om dit bestand op te slaan, maar er is " "slechts %s beschikbaar. Kies een andere locatie." -#: ../libempathy-gtk/empathy-ui-utils.c:1955 +#: ../libempathy-gtk/empathy-ui-utils.c:1987 #, c-format msgid "Incoming file from %s" msgstr "Binnenkomend bestand van %s" @@ -2983,40 +2995,32 @@ msgstr "Westers" msgid "Vietnamese" msgstr "Vietnamees" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 -msgid "The selected contact cannot receive files." -msgstr "Het geselecteerde contact kan geen bestanden ontvangen." - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 -msgid "The selected contact is offline." -msgstr "Het geselecteerde contact is offline." - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Geen foutmelding" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Instant Message (Empathy)" -#: ../src/empathy.c:431 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Niet verbinden bij opstarten" -#: ../src/empathy.c:435 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "" "De contactenlijst en andere dialoogvensters niet weergeven bij opstarten" -#: ../src/empathy.c:450 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "- Empathy chatprogramma" -#: ../src/empathy.c:637 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Er is een fout opgetreden bij het contact opnemen met accountbeheer" -#: ../src/empathy.c:639 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3060,14 +3064,14 @@ msgid "" msgstr "" "U zou een kopie van de GNU General Public License moeten hebben ontvangen " "bij Empathy; is dit niet het geval, dan kunt u schrijven naar de Free " -"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " -"02110-130159 USA" +"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-" +"130159 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Een chatclient voor GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Vincent van Adrighem\n" @@ -3141,35 +3145,36 @@ msgstr "" "assistent verlaten en later accounts toevoegen via het menu Bewerken." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1274 msgid "An error occurred" msgstr "Er is een fout opgetreden" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Wat voor een chataccount heeft u?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "Wilt u nog andere chataccounts instellen?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Voer de details van uw account in" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Wat voor een chataccount wilt u aanmaken?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Wilt u nog andere chataccounts aanmaken?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Voer de details voor het nieuwe account in" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3180,41 +3185,41 @@ msgstr "" "AIM, Windows Live en vele andere chatprogramma's gebruiken. Met een " "microfoon of een webcam kunt u ook audio- of videogesprekken voeren." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "Heeft u een account dat u gebruikt met een ander chatprogramma?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Ja, importeer de details van mijn account uit " -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Ja, ik voer nu de details van mijn account in" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Nee, ik wil een nieuw account" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Nee, ik wil nu alleen mensen in de buurt die online zijn zien" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Selecteer de accounts die u wilt importeren:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:625 +#: ../src/empathy-new-chatroom-dialog.c:626 msgid "Yes" msgstr "Ja" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Nee, dat is voorlopig alles" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3226,16 +3231,16 @@ msgstr "" "gebruiken. U kunt deze details later makkelijk aanpassen en eventueel deze " "functie uitschakelen via het dialoogvenster ‘Accounts’" -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1150 msgid "Edit->Accounts" msgstr "Bewerken->Accounts" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "Ik wil deze functie nu _niet inschakelen" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1146 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3247,85 +3252,95 @@ msgstr "" "inschakelen dient u het pakket telepathy-salut te installeren en een account " "voor ‘Mensen in de buurt’ aan te maken via het dialoogvenster Accounts" -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1152 msgid "telepathy-salut not installed" msgstr "telepathy-salut is niet geïnstalleerd" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1198 msgid "Messaging and VoIP Accounts Assistant" msgstr "Assistent voor Messaging- en VoIP-accounts" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1232 msgid "Welcome to Empathy" msgstr "Welkom bij Empathy" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1241 msgid "Import your existing accounts" msgstr "Uw bestaande accounts importeren" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1259 msgid "Please enter personal details" msgstr "Voer uw persoonlijke gegevens in" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Er zijn wijzigingen in uw %s account die nog niet zijn opgeslagen." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Uw nieuwe account is nog niet opgeslagen." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:754 -#: ../src/empathy-call-window.c:1216 +#: ../src/empathy-accounts-dialog.c:352 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "Verbinden…" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:393 #, c-format msgid "Offline — %s" msgstr "Offline — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:405 #, c-format msgid "Disconnected — %s" msgstr "Verbinding verbroken — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:416 msgid "Offline — No Network Connection" msgstr "Offline — Geen netwerkverbinding" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:423 msgid "Unknown Status" msgstr "Onbekende status" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:435 msgid "Offline — Account Disabled" msgstr "Offline — Account uitgeschakeld" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" +#: ../src/empathy-accounts-dialog.c:538 +#, fuzzy +#| msgid "Connection has been refused" +msgid "Edit Connection Parameters" +msgstr "Verbinding geweigerd" + +#: ../src/empathy-accounts-dialog.c:701 +msgid "Failed to retrieve your personal information from the server." +msgstr "" + +#: ../src/empathy-accounts-dialog.c:707 +msgid "Go online to edit your personal information." msgstr "" -"U staat op het punt een nieuw account aan te maken, waardoor uw wijzigingen\n" -"verloren gaan. Weet u zeker dat u door wilt gaan?" -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:792 +msgid "_Edit Connection Parameters..." +msgstr "" + +#: ../src/empathy-accounts-dialog.c:1293 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Wilt u %s van uw computer verwijderen?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1297 msgid "This will not remove your account on the server." msgstr "Dit zal niet uw account op de server verwijderen." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1533 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3334,15 +3349,15 @@ msgstr "" "verloren gaan. Weet u zeker dat u door wilt gaan?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1744 msgid "_Enable" msgstr "Inscha_kelen" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1745 msgid "_Disable" msgstr "_Uitschakelen" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2255 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3378,11 +3393,11 @@ msgstr "" msgid "_Import…" msgstr "I_mporteren…" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr " - Empathy authenticatieclient" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Empathy authenticatieclient" @@ -3390,116 +3405,104 @@ msgstr "Empathy authenticatieclient" msgid "People nearby" msgstr "Mensen in de buurt" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:192 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:193 msgid "- Empathy Audio/Video Client" msgstr "- Empathy audio/video-client" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:217 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:218 msgid "Empathy Audio/Video Client" msgstr "Empathy audio/video-client" -#: ../src/empathy-streamed-media-window.c:431 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Contrast" -#: ../src/empathy-streamed-media-window.c:434 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Helderheid" -#: ../src/empathy-streamed-media-window.c:437 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-streamed-media-window.c:542 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Volume" -#: ../src/empathy-streamed-media-window.c:1110 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "_Zijpaneel" -#: ../src/empathy-streamed-media-window.c:1130 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Audio-input" -#: ../src/empathy-streamed-media-window.c:1134 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Video-input" -#: ../src/empathy-streamed-media-window.c:1140 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Kiestoetsen" -#: ../src/empathy-streamed-media-window.c:1151 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Details" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1220 -#: ../src/empathy-call-window.c:1825 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format msgid "Call with %s" msgstr "Bellen met %s" -#: ../src/empathy-streamed-media-window.c:1453 -#: ../src/empathy-call-window.c:2069 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 msgid "The IP address as seen by the machine" msgstr "Het IP-adres zoals gezien door het systeem" -#: ../src/empathy-streamed-media-window.c:1455 -#: ../src/empathy-call-window.c:2071 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 msgid "The IP address as seen by a server on the Internet" msgstr "Het IP-adres zoals gezien door een server op het internet" -#: ../src/empathy-streamed-media-window.c:1457 -#: ../src/empathy-call-window.c:2073 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 msgid "The IP address of the peer as seen by the other side" msgstr "Het IP-adres zoals gezien door de andere zijde" -#: ../src/empathy-streamed-media-window.c:1459 -#: ../src/empathy-call-window.c:2075 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 msgid "The IP address of a relay server" msgstr "Het IP-adres van een relay-server" -#: ../src/empathy-streamed-media-window.c:1461 -#: ../src/empathy-call-window.c:2077 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 msgid "The IP address of the multicast group" msgstr "Het IP-adres van de multicast groep" -#: ../src/empathy-streamed-media-window.c:1843 -msgctxt "encoding video codec" -msgid "Unknown" -msgstr "Onbekend" - -#: ../src/empathy-streamed-media-window.c:1846 -msgctxt "encoding audio codec" -msgid "Unknown" -msgstr "Onbekend" - -#: ../src/empathy-streamed-media-window.c:1849 -msgctxt "decoding video codec" -msgid "Unknown" -msgstr "Onbekend" - -#: ../src/empathy-streamed-media-window.c:1852 -msgctxt "decoding audio codec" +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 +msgctxt "codec" msgid "Unknown" msgstr "Onbekend" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2144 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "Verbonden — %d:%02dm" -#: ../src/empathy-streamed-media-window.c:2205 -#: ../src/empathy-call-window.c:2846 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 msgid "Technical Details" msgstr "Technische details" -#: ../src/empathy-streamed-media-window.c:2243 -#: ../src/empathy-call-window.c:2884 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3508,8 +3511,8 @@ msgstr "" "De software van %s kent geen van de audioformaten die door uw computer " "worden ondersteund" -#: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:2889 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3518,8 +3521,8 @@ msgstr "" "De software van %s kent geen van de videoformaten die door uw computer " "worden ondersteund" -#: ../src/empathy-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:2895 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3528,29 +3531,29 @@ msgstr "" "Kan geen verbinding maken met %s. Een van u zit mogelijk op een netwerk dat " "geen directe verbindingen toestaat." -#: ../src/empathy-streamed-media-window.c:2260 -#: ../src/empathy-call-window.c:2901 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 msgid "There was a failure on the network" msgstr "Er is een netwerkstoring opgetreden" -#: ../src/empathy-streamed-media-window.c:2264 -#: ../src/empathy-call-window.c:2905 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "De audioformaten, nodig voor dit gesprek, zijn niet geïnstalleerd op uw " "computer" -#: ../src/empathy-streamed-media-window.c:2267 -#: ../src/empathy-call-window.c:2908 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "De videoformaten, nodig voor dit gesprek, zijn niet geïnstalleerd op uw " "computer" -#: ../src/empathy-streamed-media-window.c:2277 -#: ../src/empathy-call-window.c:2920 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please Een programmafout melden en stuur logs mee uit het venster " "‘Foutopsporing’ in het menu Hulp." -#: ../src/empathy-streamed-media-window.c:2285 -#: ../src/empathy-call-window.c:2929 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 msgid "There was a failure in the call engine" msgstr "Er is een fout in de call-engine opgetreden" -#: ../src/empathy-streamed-media-window.c:2288 -#: ../src/empathy-call-window.c:2932 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 msgid "The end of the stream was reached" msgstr "Het einde van de stream is bereikt" -#: ../src/empathy-streamed-media-window.c:2328 -#: ../src/empathy-call-window.c:2972 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 msgid "Can't establish audio stream" msgstr "Kan geen audiostream tot stand brengen" -#: ../src/empathy-streamed-media-window.c:2338 -#: ../src/empathy-call-window.c:2982 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 msgid "Can't establish video stream" msgstr "Kan geen videostream tot stand brengen" @@ -3668,8 +3671,8 @@ msgstr "Schakel videotransmissie in/uit" #: ../src/empathy-call-window.ui.h:21 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477 -#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479 +#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 msgid "Unknown" msgstr "Onbekend" @@ -3834,96 +3837,96 @@ msgstr "Automatisch verbinden" msgid "Manage Favorite Rooms" msgstr "Favoriete chatruimtes beheren" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Binnenkomende video-oproep" -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "Binnenkomende oproep" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "Er is een video-oproep voor u van %s. Wilt u opnemen?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "U wordt gebeld door %s. Wilt u opnemen?" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "Binnenkomende oproep van %s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "_Afwijzen" -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_Opnemen" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "Met video be_antwoorden" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1455 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" msgstr "Binnenkomende video-oproep van %s" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Uitnodiging voor groepsgesprek" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Uitnodiging om mee te doen met %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s nodigt u uit deel te nemen aan %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_Weigeren" -#: ../src/empathy-event-manager.c:858 +#: ../src/empathy-event-manager.c:860 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Binnengaan" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s heeft u uitgenodigd om deel te nemen aan %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "U bent uitgenodigd om %s binnen te gaan" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Binnenkomende bestandsoverdracht van %s" -#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375 msgid "Password required" msgstr "Wachtwoord vereist" -#: ../src/empathy-event-manager.c:1190 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s wil graag toestemming om te kunnen zien wanneer u online bent" -#: ../src/empathy-event-manager.c:1194 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3933,105 +3936,105 @@ msgstr "" "Bericht: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u:%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u:%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Onbekend" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s van %s met %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s van %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Bezig met ontvangen van ‘%s’ van %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Verzenden van ‘%s’ naar %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Fout bij het ontvangen van ‘%s’ van %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Fout bij het ontvangen van een bestand" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Fout bij het verzenden van ‘%s’ naar %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Fout bij het versturen van een bestand" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "‘%s’ ontvangen van %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "‘%s’ verzonden naar %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Bestandsoverdracht voltooid" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Wachten op antwoord van de andere deelnemer" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Integriteit van ‘%s’ controleren" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Controlebestand van ‘%s’ maken" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Bestand" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Resterend" @@ -4058,15 +4061,15 @@ msgid "Import Accounts" msgstr "Accounts importeren" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "Importeren" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Protocol" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Bron" @@ -4078,43 +4081,54 @@ msgstr "Voorzien van wachtwoord" msgid "Disconnect" msgstr "Verbinding verbreken" -#: ../src/empathy-main-window.c:622 +#: ../src/empathy-main-window.c:635 msgid "No match found" msgstr "Geen resultaten" -#: ../src/empathy-main-window.c:777 +#: ../src/empathy-main-window.c:743 +#, c-format +msgid "Sorry, %s accounts can’t be used until your %s software is updated." +msgstr "" +"Helaas, %s-accounts kunnen niet worden gebruikt zolang uw %s-software niet " +"is bijgewerkt." + +#: ../src/empathy-main-window.c:811 +msgid "Update software..." +msgstr "Software bijwerken…" + +#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938 +msgid "Close" +msgstr "Sluiten" + +#: ../src/empathy-main-window.c:926 msgid "Reconnect" msgstr "Opnieuw verbinden" -#: ../src/empathy-main-window.c:783 +#: ../src/empathy-main-window.c:932 msgid "Edit Account" msgstr "Account bewerken" -#: ../src/empathy-main-window.c:789 -msgid "Close" -msgstr "Sluiten" - #. Translators: this string will be something like: #. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:928 +#: ../src/empathy-main-window.c:1071 #, c-format msgid "Top up %s (%s)..." msgstr "Aanvullen van %s (%s)…" -#: ../src/empathy-main-window.c:975 +#: ../src/empathy-main-window.c:1118 msgid "Top up account credit" msgstr "Tegoed aanvullen" #. top up button -#: ../src/empathy-main-window.c:1046 +#: ../src/empathy-main-window.c:1189 msgid "Top Up..." msgstr "Aanvullen…" -#: ../src/empathy-main-window.c:1789 +#: ../src/empathy-main-window.c:1931 msgid "Contact" msgstr "Contact" -#: ../src/empathy-main-window.c:2121 +#: ../src/empathy-main-window.c:2306 msgid "Contact List" msgstr "Contactenlijst" @@ -4207,17 +4221,17 @@ msgstr "_Ruimte" msgid "_Search for Contacts…" msgstr "Contacten _zoeken…" -#: ../src/empathy-new-chatroom-dialog.c:337 +#: ../src/empathy-new-chatroom-dialog.c:369 msgid "Chat Room" msgstr "Chatruimte" -#: ../src/empathy-new-chatroom-dialog.c:353 +#: ../src/empathy-new-chatroom-dialog.c:385 msgid "Members" msgstr "Leden" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:553 +#: ../src/empathy-new-chatroom-dialog.c:623 #, c-format msgid "" "%s\n" @@ -4230,16 +4244,16 @@ msgstr "" "Wachtwoord vereist: %s\n" "Leden: %s" -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-new-chatroom-dialog.c:625 +#: ../src/empathy-new-chatroom-dialog.c:626 msgid "No" msgstr "Nee" -#: ../src/empathy-new-chatroom-dialog.c:584 +#: ../src/empathy-new-chatroom-dialog.c:654 msgid "Could not start room listing" msgstr "Kan aanwezigen in chatruimte niet bepalen" -#: ../src/empathy-new-chatroom-dialog.c:594 +#: ../src/empathy-new-chatroom-dialog.c:664 msgid "Could not stop room listing" msgstr "Ophalen van aanwezigen kan niet worden beëindigd" @@ -4273,79 +4287,79 @@ msgstr "Chatruimtelijst" msgid "_Room:" msgstr "_Ruimte:" -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Bericht ontvangen" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Bericht verzonden" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Nieuw gesprek" -#: ../src/empathy-preferences.c:172 +#: ../src/empathy-preferences.c:169 msgid "Contact goes online" msgstr "Contact komt online" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "Contact gaat offline" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Account verbonden" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Account niet verbonden" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Taal" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:725 msgid "Juliet" msgstr "Juliet" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:732 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:738 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "O Romeo, Romeo, wherefore art thou Romeo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "Deny thy father and refuse thy name;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "Or if thou wilt not, be but sworn my love" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "And I'll no longer be a Capulet." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "Shall I hear more, or shall I speak at this?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "Juliet heeft de verbinding verbroken" -#: ../src/empathy-preferences.c:1166 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "Voorkeuren" @@ -4405,35 +4419,27 @@ msgstr "Spelling controleren voor de volgende talen:" msgid "General" msgstr "Algemeen" -#: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "Invoerniveau:" - #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "Invoervolume:" - -#: ../src/empathy-preferences.ui.h:18 msgid "Location sources:" msgstr "Locatiebronnen:" -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:17 msgid "Log conversations" msgstr "Gesprekken opslaan" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:18 msgid "Notifications" msgstr "Notificatieberichten" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:19 msgid "Play sound for events" msgstr "Geluid afspelen voor gebeurtenissen" -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:20 msgid "Privacy" msgstr "Privacy" -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:21 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 " @@ -4443,23 +4449,23 @@ msgstr "" "provincie en land bekend gemaakt zullen worden. GPS-coördinaten zullen tot 1 " "decimaal nauwkeurig zijn." -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:22 msgid "Show _smileys as images" msgstr "_Smileys als afbeeldingen tonen" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:23 msgid "Show contact _list in rooms" msgstr "Contactenlijst in chatruimtes _tonen" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:24 msgid "Sounds" msgstr "Geluiden" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:25 msgid "Spell Checking" msgstr "Spellingcontrole" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:26 msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." @@ -4467,48 +4473,52 @@ msgstr "" "De lijst met talen toont alleen de talen waarvoor u een woordenboek heeft " "geïnstalleerd." -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:27 msgid "Themes" msgstr "Thema's" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:28 +msgid "Use _echo cancellation to improve call quality" +msgstr "Gebruik _echo-onderdrukking om de gesprekskwaliteit te verbeteren" + +#: ../src/empathy-preferences.ui.h:29 msgid "Variant:" msgstr "Variant:" -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:30 msgid "_Automatically connect on startup" msgstr "_Automatisch verbinden bij opstarten" -#: ../src/empathy-preferences.ui.h:32 +#: ../src/empathy-preferences.ui.h:31 msgid "_Cellphone" msgstr "_Mobiele telefoon" -#: ../src/empathy-preferences.ui.h:33 +#: ../src/empathy-preferences.ui.h:32 msgid "_Enable bubble notifications" msgstr "Ballon-notificatieberichten inscha_kelen" -#: ../src/empathy-preferences.ui.h:34 +#: ../src/empathy-preferences.ui.h:33 msgid "_Enable sound notifications" msgstr "_Geluidswaarschuwingen inschakelen" -#: ../src/empathy-preferences.ui.h:35 +#: ../src/empathy-preferences.ui.h:34 msgid "_GPS" msgstr "_GPS" -#: ../src/empathy-preferences.ui.h:36 +#: ../src/empathy-preferences.ui.h:35 msgid "_Network (IP, Wi-Fi)" msgstr "_Netwerk (IP, Wi-Fi)" -#: ../src/empathy-preferences.ui.h:37 +#: ../src/empathy-preferences.ui.h:36 msgid "_Open new chats in separate windows" msgstr "_Nieuwe chats in eigen vensters openen" -#: ../src/empathy-preferences.ui.h:38 +#: ../src/empathy-preferences.ui.h:37 msgid "_Publish location to my contacts" msgstr "_Locatie aan mijn contacten bekendmaken" #. 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:40 +#: ../src/empathy-preferences.ui.h:39 msgid "_Reduce location accuracy" msgstr "_Nauwkeurigheid van locatie beperken" @@ -4568,7 +4578,7 @@ msgstr "Video aan" msgid "Video Preview" msgstr "Videovoorbeeld" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Kaartweergave van contactpersonen" @@ -4636,16 +4646,16 @@ msgstr "" "Het geselecteerde verbindingsbeheerprogramma heeft geen ondersteuning voor " "de plug-in voor foutopsporing op afstand." -#: ../src/empathy-invite-participant-dialog.c:179 -#: ../src/empathy-invite-participant-dialog.c:205 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Deelnemer uitnodigen" -#: ../src/empathy-invite-participant-dialog.c:180 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Een contact uitnodigen om deel te nemen aan het gesprek:" -#: ../src/empathy-invite-participant-dialog.c:201 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Uitnodigen" @@ -4672,23 +4682,27 @@ msgstr "" msgid "" msgstr "" -#: ../src/empathy-accounts.c:198 +#: ../src/empathy-accounts.c:196 +msgid "Show account assistant" +msgstr "Accountassistent tonen" + +#: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" msgstr "- Empathy-accounts" -#: ../src/empathy-accounts.c:237 +#: ../src/empathy-accounts.c:238 msgid "Empathy Accounts" msgstr "Empathy-accounts" -#: ../src/empathy-debugger.c:70 +#: ../src/empathy-debugger.c:69 msgid "Show a particular service" msgstr "Een bepaalde dienst tonen" -#: ../src/empathy-debugger.c:75 +#: ../src/empathy-debugger.c:74 msgid "- Empathy Debugger" msgstr "- Empathy foutopsporing" -#: ../src/empathy-debugger.c:114 +#: ../src/empathy-debugger.c:113 msgid "Empathy Debugger" msgstr "Empathy foutopsporing" @@ -4696,39 +4710,39 @@ msgstr "Empathy foutopsporing" msgid "- Empathy Chat Client" msgstr "- Chatprogramma Empathy" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Beantwoorden" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1459 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 msgid "Reject" msgstr "Weigeren" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1460 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 msgid "Answer" msgstr "Antwoord" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Met video beantwoorden" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Afslaan" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Accepteren" #. 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:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Voorzien" @@ -4740,32 +4754,148 @@ msgstr "" #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111 +#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2775 +#: ../src/empathy-call-window.c:2929 msgid "On hold" msgstr "In de wacht" -#: ../src/empathy-call-window.c:2778 +#: ../src/empathy-call-window.c:2932 msgid "Mute" msgstr "Dempen" -#: ../src/empathy-call-window.c:2780 +#: ../src/empathy-call-window.c:2934 msgid "Duration" msgstr "Duur" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2783 +#: ../src/empathy-call-window.c:2937 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" +#: ../src/empathy-call-window.c:3207 +#, c-format +msgid "Your current balance is %s." +msgstr "Uw huidige saldo is %s." + +#: ../src/empathy-call-window.c:3211 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "Helaas, u heeft niet genoeg saldo voor dat gesprek." + +#: ../src/empathy-call-window.c:3213 +msgid "Top Up" +msgstr "Opwaarderen" + #: ../libempathy-gtk/empathy-search-bar.c:243 msgid "_Match case" msgstr "_Hoofdlettergevoelig" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +#, fuzzy +#| msgid "New account" +msgid "Adding new account" +msgstr "Nieuwe account" + +#~ msgid "My Web Accounts" +#~ msgstr "Mijn webaccounts" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "Account %s wordt bewerkt via %s." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "Account %s kan niet worden bewerkt in Empathy." + +#~ msgid "Launch My Web Accounts" +#~ msgstr "Mijn webaccounts starten" + +#~ msgid "Edit %s" +#~ msgstr "%s bewerken" + +#~ msgid "Ca_ncel" +#~ msgstr "_Annuleren" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "U staat op het punt een nieuw account aan te maken, waardoor uw " +#~ "wijzigingen\n" +#~ "verloren gaan. Weet u zeker dat u door wilt gaan?" + +#~ msgid "Call volume" +#~ msgstr "Oproepvolume" + +#~ msgid "Call volume, as a percentage." +#~ msgstr "Oproepvolume, als percentage" + +#~ msgid "Empathy has migrated butterfly logs" +#~ msgstr "Empathy heeft butterfly-logs gemigreerd" + +#~ msgid "Whether Empathy has migrated butterfly logs." +#~ msgstr "Of Empathy butterfly-logs gemigreerd heeft." + +#~ msgid "Socket type not supported" +#~ msgstr "Sockettype niet ondersteund" + +#~ msgid "Ungrouped" +#~ msgstr "Groep opgeheven" + +#~ msgid "Favorite People" +#~ msgstr "Favoriete personen" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "Be_werken" + +#~ msgid "Select a contact" +#~ msgstr "Selecteer een contact" + +#~ msgid "Contact ID:" +#~ msgstr "Contact-ID:" + +#~ msgid "C_hat" +#~ msgstr "_Chatten" + +#~ msgid "Send _Video" +#~ msgstr "_Video sturen" + +#~ msgid "C_all" +#~ msgstr "_Opbellen" + +#~ msgid "Set your presence and current status" +#~ msgstr "Uw aanwezigheid en huidige status instellen" + +#~ msgid "The selected contact cannot receive files." +#~ msgstr "Het geselecteerde contact kan geen bestanden ontvangen." + +#~ msgid "The selected contact is offline." +#~ msgstr "Het geselecteerde contact is offline." + +#~ msgctxt "encoding video codec" +#~ msgid "Unknown" +#~ msgstr "Onbekend" + +#~ msgctxt "encoding audio codec" +#~ msgid "Unknown" +#~ msgstr "Onbekend" + +#~ msgctxt "decoding video codec" +#~ msgid "Unknown" +#~ msgstr "Onbekend" + +#~ msgctxt "decoding audio codec" +#~ msgid "Unknown" +#~ msgstr "Onbekend" + +#~ msgid "Input level:" +#~ msgstr "Invoerniveau:" + +#~ msgid "Input volume:" +#~ msgstr "Invoervolume:" + #~ msgid "Find Next" #~ msgstr "Volgende zoeken" diff --git a/po/ru.po b/po/ru.po index 242f3d4c..f9a3f274 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy trunk\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2011-09-15 13:17+0000\n" -"PO-Revision-Date: 2011-09-17 12:33+0300\n" +"POT-Creation-Date: 2012-02-13 13:31+0000\n" +"PO-Revision-Date: 2012-02-16 01:20+0300\n" "Last-Translator: Yuri Myasoedov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -25,452 +25,496 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "Общайтесь в Google Talk, Facebook, MSN и во многих других службах" - -#: ../data/empathy.desktop.in.in.h:2 msgid "Empathy" msgstr "Empathy" +#: ../data/empathy.desktop.in.in.h:2 +msgid "IM Client" +msgstr "Клиент обмена мгновенными сообщениями" + #: ../data/empathy.desktop.in.in.h:3 msgid "Empathy Internet Messaging" msgstr "Программа обмена сообщениями Empathy" #: ../data/empathy.desktop.in.in.h:4 -msgid "IM Client" -msgstr "Клиент обмена мгновенными сообщениями" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "Общайтесь в Google Talk, Facebook, MSN и во многих других службах" #: ../data/org.gnome.Empathy.gschema.xml.in.h:1 -msgid "Always open a separate chat window for new chats." -msgstr "Всегда открывать новую беседу в новом окне." +msgid "Connection managers should be used" +msgstr "Используемые диспетчеры соединений" #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Громкость вызова" +msgid "Whether connectivity managers should be used to automatically disconnect/reconnect." +msgstr "Использовать ли менеджеры связности для автоматического отключения или переподключения." #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Громкость вызова в процентах" +msgid "Empathy should auto-connect on startup" +msgstr "Присоединяться при запуске" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -msgid "Camera device" -msgstr "Камера" +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "Должен ли Empathy автоматически входить в ваши учётные записи при запуске." #: ../data/org.gnome.Empathy.gschema.xml.in.h:5 -msgid "Camera position" -msgstr "Положение камеры" +msgid "Empathy should auto-away when idle" +msgstr "Устанавливать статус «отсутствует» при бездействии" #: ../data/org.gnome.Empathy.gschema.xml.in.h:6 -msgid "Character to add after nickname when using nick completion (tab) in group chat." -msgstr "Символ для добавления после псевдонима, если в беседе используется автодополнение псевдонимов по клавише Tab." +msgid "Whether Empathy should go into away mode automatically if the user is idle." +msgstr "Должен ли Empathy автоматически устанавливать статус «отсутствует» при бездействии пользователя." #: ../data/org.gnome.Empathy.gschema.xml.in.h:7 -msgid "Chat window theme" -msgstr "Тема окна беседы" +msgid "Empathy default download folder" +msgstr "Папка Empathy для загрузки файлов" #: ../data/org.gnome.Empathy.gschema.xml.in.h:8 -msgid "Chat window theme variant" -msgstr "Вариант тема для окна беседы" +msgid "The default folder to save file transfers in." +msgstr "Каталог по умолчанию для сохранения присланных файлов." #: ../data/org.gnome.Empathy.gschema.xml.in.h:9 -msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "Список языков, используемых при проверке орфографии, разделённых запятыми (например «en, fr, ru»)." +msgid "Show offline contacts" +msgstr "Показывать отсутствующих собеседников" #: ../data/org.gnome.Empathy.gschema.xml.in.h:10 -msgid "Compact contact list" -msgstr "Компактный список собеседников" +msgid "Whether to show contacts that are offline in the contact list." +msgstr "Показывать ли собеседников не в сети." #: ../data/org.gnome.Empathy.gschema.xml.in.h:11 -msgid "Connection managers should be used" -msgstr "Используемые диспетчеры соединений" +msgid "Show avatars" +msgstr "Показывать аватары" #: ../data/org.gnome.Empathy.gschema.xml.in.h:12 -msgid "Contact list sort criterion" -msgstr "Критерий упорядочивания списка собеседников" +msgid "Whether to show avatars for contacts in the contact list and chat windows." +msgstr "Показывать ли аватары собеседников в списке собеседников и окнах беседы." #: ../data/org.gnome.Empathy.gschema.xml.in.h:13 -msgid "Default camera device to use in video calls, e.g. /dev/video0." -msgstr "Камера, используемая по умолчанию для видеовызовов, напр. /dev/video0." +msgid "Show protocols" +msgstr "Показывать протоколы" #: ../data/org.gnome.Empathy.gschema.xml.in.h:14 -msgid "Default directory to select an avatar image from" -msgstr "Каталог, используемый для выбора изображений аватаров" +msgid "Whether to show protocols for contacts in the contact list." +msgstr "Показывать ли протоколы для собеседников в списке собеседников." #: ../data/org.gnome.Empathy.gschema.xml.in.h:15 -msgid "Disable popup notifications when away" -msgstr "Выключить всплывающие уведомления в состоянии «отсутствует»" +msgid "Show Balance in contact list" +msgstr "Показывать баланс в списке собеседников" #: ../data/org.gnome.Empathy.gschema.xml.in.h:16 -msgid "Disable sounds when away" -msgstr "Выключить звуки в состоянии «отсутствует»" +msgid "Whether to show account balances in the contact list." +msgstr "Показывать ли балансы учётных записей в списке собеседников." #: ../data/org.gnome.Empathy.gschema.xml.in.h:17 -msgid "Display incoming events in the status area" -msgstr "Показывать наступающие события в области состояния" +msgid "Compact contact list" +msgstr "Компактный список собеседников" #: ../data/org.gnome.Empathy.gschema.xml.in.h:18 -msgid "Display incoming events in the status area. If false, present them to the user immediately." -msgstr "Показывать наступающие события в области состояния. Если ключ не установлен, показывать их непосредственно пользователю." +msgid "Whether to show the contact list in compact mode." +msgstr "Показывать ли компактный список собеседников." #: ../data/org.gnome.Empathy.gschema.xml.in.h:19 -msgid "Echo cancellation support" -msgstr "Поддержка подавления эха" +msgid "Hide main window" +msgstr "Скрывать главное окно" #: ../data/org.gnome.Empathy.gschema.xml.in.h:20 -msgid "Empathy can publish the user's location" -msgstr "Empathy может публиковать местоположение пользователя" +msgid "Hide the main window." +msgstr "Скрывать главное окно." #: ../data/org.gnome.Empathy.gschema.xml.in.h:21 -msgid "Empathy can use the GPS to guess the location" -msgstr "Empathy может использовать GPS для определения местоположения" +msgid "Default directory to select an avatar image from" +msgstr "Каталог, используемый для выбора изображений аватаров" #: ../data/org.gnome.Empathy.gschema.xml.in.h:22 -msgid "Empathy can use the cellular network to guess the location" -msgstr "Empathy может использовать сотовую сеть для определения местоположения" +msgid "The last directory that an avatar image was chosen from." +msgstr "Последний каталог, из которого выбирались изображения аватаров." #: ../data/org.gnome.Empathy.gschema.xml.in.h:23 -msgid "Empathy can use the network to guess the location" -msgstr "Empathy может использовать сеть для определения местоположения" +msgid "Open new chats in separate windows" +msgstr "Открывать новые беседы в новом окне" #: ../data/org.gnome.Empathy.gschema.xml.in.h:24 -msgid "Empathy default download folder" -msgstr "Папка Empathy для загрузки файлов" +msgid "Always open a separate chat window for new chats." +msgstr "Всегда открывать новую беседу в новом окне." #: ../data/org.gnome.Empathy.gschema.xml.in.h:25 -msgid "Empathy has migrated butterfly logs" -msgstr "Empathy перенёс журнал сообщений MSN" +msgid "Display incoming events in the status area" +msgstr "Показывать наступающие события в области состояния" #: ../data/org.gnome.Empathy.gschema.xml.in.h:26 -msgid "Empathy should auto-away when idle" -msgstr "Устанавливать статус «отсутствует» при бездействии" +msgid "Display incoming events in the status area. If false, present them to the user immediately." +msgstr "Показывать наступающие события в области состояния. Если ключ не установлен, показывать их непосредственно пользователю." #: ../data/org.gnome.Empathy.gschema.xml.in.h:27 -msgid "Empathy should auto-connect on startup" -msgstr "Присоединяться при запуске" +msgid "The position for the chat window side pane" +msgstr "Положение боковой панели окна беседы" #: ../data/org.gnome.Empathy.gschema.xml.in.h:28 -msgid "Empathy should reduce the location's accuracy" -msgstr "Empathy должен снижать точность местоположения" +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "Положение боковой панели окна беседы (в пикселах)." #: ../data/org.gnome.Empathy.gschema.xml.in.h:29 -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "Empathy должен использовать аватар контакта как значок окна с беседой" +#| msgid "Show contact list in rooms" +msgid "Show contact groups" +msgstr "Показывать группы" #: ../data/org.gnome.Empathy.gschema.xml.in.h:30 -msgid "Enable WebKit Developer Tools" -msgstr "Включить инструменты разработчика WebKit" +#| msgid "Whether to show account balances in the contact list." +msgid "Whether to show groups in the contact list." +msgstr "Показывать ли группы в списке собеседников." #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 -msgid "Enable popup notifications for new messages" -msgstr "Включить всплывающие уведомления о новых сообщениях" +msgid "Contact list sort criterion" +msgstr "Критерий упорядочивания списка собеседников" #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 -msgid "Enable spell checker" -msgstr "Включить проверку орфографии" +#, fuzzy +#| msgid "" +#| "Which criterion to use when sorting the contact list. Default is to sort " +#| "by the contact's name with the value \"name\". A value of \"state\" will " +#| "sort the contact list by state." +msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name." +msgstr "Критерий упорядочивания списка собеседников. По умолчанию упорядочивается по имени собеседника — «name». При значении «state» список будет упорядочен по статусу." #: ../data/org.gnome.Empathy.gschema.xml.in.h:33 -msgid "Hide main window" -msgstr "Скрывать главное окно" +msgid "Use notification sounds" +msgstr "Использовать звуки" #: ../data/org.gnome.Empathy.gschema.xml.in.h:34 -msgid "Hide the main window." -msgstr "Скрывать главное окно." +msgid "Whether to play a sound to notify of events." +msgstr "Воспроизводить ли звук для уведомления о событиях." #: ../data/org.gnome.Empathy.gschema.xml.in.h:35 -msgid "Nick completed character" -msgstr "Символ автодополнения псевдонима" +msgid "Disable sounds when away" +msgstr "Выключить звуки в состоянии «отсутствует»" #: ../data/org.gnome.Empathy.gschema.xml.in.h:36 -msgid "Open new chats in separate windows" -msgstr "Открывать новые беседы в новом окне" +msgid "Whether to play sound notifications when away or busy." +msgstr "Воспроизводить ли звуковые уведомления в состояниях «отсутствует» или «не беспокоить»." #: ../data/org.gnome.Empathy.gschema.xml.in.h:37 -msgid "Path of the Adium theme to use" -msgstr "Путь к используемой теме Adium" +msgid "Play a sound for incoming messages" +msgstr "Воспроизводить ли звук при получении сообщения" #: ../data/org.gnome.Empathy.gschema.xml.in.h:38 -msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "Путь к используемой теме Adium, если тема, используемая для беседы — Adium." +msgid "Whether to play a sound to notify of incoming messages." +msgstr "Воспроизводить ли звук для уведомления о входящих сообщениях." #: ../data/org.gnome.Empathy.gschema.xml.in.h:39 -msgid "Play a sound for incoming messages" -msgstr "Воспроизводить ли звук при получении сообщения" +msgid "Play a sound for outgoing messages" +msgstr "Воспроизводить ли звук при отправке сообщения" #: ../data/org.gnome.Empathy.gschema.xml.in.h:40 -msgid "Play a sound for new conversations" -msgstr "Воспроизводить ли звук при начале беседы" +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "Воспроизводить ли звук для уведомления об исходящих сообщениях." #: ../data/org.gnome.Empathy.gschema.xml.in.h:41 -msgid "Play a sound for outgoing messages" -msgstr "Воспроизводить ли звук при отправке сообщения" +msgid "Play a sound for new conversations" +msgstr "Воспроизводить ли звук при начале беседы" #: ../data/org.gnome.Empathy.gschema.xml.in.h:42 -msgid "Play a sound when a contact logs in" -msgstr "Воспроизводить ли звук при входе контакта в сеть" +msgid "Whether to play a sound to notify of new conversations." +msgstr "Воспроизводить ли звук для уведомления о начале новой беседы." #: ../data/org.gnome.Empathy.gschema.xml.in.h:43 -msgid "Play a sound when a contact logs out" -msgstr "Воспроизводить ли звук при выходе контакта из сети" +msgid "Play a sound when a contact logs in" +msgstr "Воспроизводить ли звук при входе контакта в сеть" #: ../data/org.gnome.Empathy.gschema.xml.in.h:44 -msgid "Play a sound when we log in" -msgstr "Воспроизводить звук при входе в сеть" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "Воспроизводить ли звук для уведомления о входе собеседников в сеть." #: ../data/org.gnome.Empathy.gschema.xml.in.h:45 -msgid "Play a sound when we log out" -msgstr "Воспроизводить звук при выходе из сети" +msgid "Play a sound when a contact logs out" +msgstr "Воспроизводить ли звук при выходе контакта из сети" #: ../data/org.gnome.Empathy.gschema.xml.in.h:46 -msgid "Pop up notifications if the chat isn't focused" -msgstr "Показывать всплывающие уведомления, если беседа находится не в фокусе" +msgid "Whether to play a sound to notify of contacts logging out of the network." +msgstr "Воспроизводить ли звук для уведомления о выходе собеседников из сети." #: ../data/org.gnome.Empathy.gschema.xml.in.h:47 -msgid "Pop up notifications when a contact logs in" -msgstr "Показывать всплывающие уведомления, когда появляется собеседник" +msgid "Play a sound when we log in" +msgstr "Воспроизводить звук при входе в сеть" #: ../data/org.gnome.Empathy.gschema.xml.in.h:48 -msgid "Pop up notifications when a contact logs out" -msgstr "Показывать всплывающие уведомления, когда собеседник уходит" +msgid "Whether to play a sound when logging into a network." +msgstr "Воспроизводить ли звук при входе в сеть." #: ../data/org.gnome.Empathy.gschema.xml.in.h:49 -msgid "Position the camera preview should be during a call." -msgstr "Предварительный просмотр положения камеры должен выполняться в течение вызова." +msgid "Play a sound when we log out" +msgstr "Воспроизводить звук при выходе из сети" #: ../data/org.gnome.Empathy.gschema.xml.in.h:50 -msgid "Show Balance in contact list" -msgstr "Показывать баланс в списке собеседников" +msgid "Whether to play a sound when logging out of a network." +msgstr "Воспроизводить ли звук при выходе из сети." #: ../data/org.gnome.Empathy.gschema.xml.in.h:51 -msgid "Show avatars" -msgstr "Показывать аватары" +msgid "Enable popup notifications for new messages" +msgstr "Включить всплывающие уведомления о новых сообщениях" #: ../data/org.gnome.Empathy.gschema.xml.in.h:52 -msgid "Show contact list in rooms" -msgstr "Показывать список собеседников в комнатах" +msgid "Whether to show a popup notification when receiving a new message." +msgstr "Показывать ли всплывающее уведомление при получении нового сообщения." #: ../data/org.gnome.Empathy.gschema.xml.in.h:53 -msgid "Show hint about closing the main window" -msgstr "Показывать подсказку о закрытии главного окна" +msgid "Disable popup notifications when away" +msgstr "Выключить всплывающие уведомления в состоянии «отсутствует»" #: ../data/org.gnome.Empathy.gschema.xml.in.h:54 -msgid "Show offline contacts" -msgstr "Показывать отсутствующих собеседников" +msgid "Whether to show popup notifications when away or busy." +msgstr "Показывать ли всплывающие уведомления в состояниях «отсутствует» или «не беспокоить»." #: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -msgid "Show protocols" -msgstr "Показывать протоколы" +msgid "Pop up notifications if the chat isn't focused" +msgstr "Показывать всплывающие уведомления, если беседа находится не в фокусе" #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 -msgid "Spell checking languages" -msgstr "Языки для проверки орфографии" +msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused." +msgstr "Показывать ли всплывающее уведомление о получении нового сообщения, когда беседа уже ведётся, но не находится в фокусе." #: ../data/org.gnome.Empathy.gschema.xml.in.h:57 -msgid "The default folder to save file transfers in." -msgstr "Каталог по умолчанию для сохранения присланных файлов." +msgid "Pop up notifications when a contact logs in" +msgstr "Показывать всплывающие уведомления, когда появляется собеседник" #: ../data/org.gnome.Empathy.gschema.xml.in.h:58 -msgid "The last directory that an avatar image was chosen from." -msgstr "Последний каталог, из которого выбирались изображения аватаров." +msgid "Whether to show a popup notification when a contact goes online." +msgstr "Показывать ли всплывающее уведомление, когда собеседник выходит в сеть." #: ../data/org.gnome.Empathy.gschema.xml.in.h:59 -msgid "The position for the chat window side pane" -msgstr "Положение боковой панели окна беседы" +msgid "Pop up notifications when a contact logs out" +msgstr "Показывать всплывающие уведомления, когда собеседник уходит" #: ../data/org.gnome.Empathy.gschema.xml.in.h:60 -msgid "The stored position (in pixels) of the chat window side pane." -msgstr "Положение боковой панели окна беседы (в пикселах)." +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "Показывать ли всплывающее уведомление, когда собеседник выходит из сети." #: ../data/org.gnome.Empathy.gschema.xml.in.h:61 -msgid "The theme that is used to display the conversation in chat windows." -msgstr "Эта тема используется для отображения диалога в окне беседы." +msgid "Use graphical smileys" +msgstr "Использовать графические улыбки" #: ../data/org.gnome.Empathy.gschema.xml.in.h:62 -msgid "The theme variant that is used to display the conversation in chat windows." -msgstr "Вариант темы, используемый для отображения бесед." +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "Преобразовывать ли текстовые улыбки (смайлы) в беседах в графические изображения." #: ../data/org.gnome.Empathy.gschema.xml.in.h:63 -msgid "Use graphical smileys" -msgstr "Использовать графические улыбки" +msgid "Show contact list in rooms" +msgstr "Показывать список собеседников в комнатах" #: ../data/org.gnome.Empathy.gschema.xml.in.h:64 -msgid "Use notification sounds" -msgstr "Использовать звуки" +msgid "Whether to show the contact list in chat rooms." +msgstr "Показывать ли список собеседников в комнатах." #: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "Use theme for chat rooms" -msgstr "Использовать тему для бесед" +msgid "Chat window theme" +msgstr "Тема окна беседы" #: ../data/org.gnome.Empathy.gschema.xml.in.h:66 -msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "Может ли Empathy публиковать местоположение пользователя для его собеседников." +msgid "The theme that is used to display the conversation in chat windows." +msgstr "Эта тема используется для отображения диалога в окне беседы." #: ../data/org.gnome.Empathy.gschema.xml.in.h:67 -msgid "Whether Empathy can use the GPS to guess the location." -msgstr "Может ли Empathy использовать GPS для определения местоположения." +msgid "Chat window theme variant" +msgstr "Вариант тема для окна беседы" #: ../data/org.gnome.Empathy.gschema.xml.in.h:68 -msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "Может ли Empathy использовать сотовую сеть для определения местоположения." +msgid "The theme variant that is used to display the conversation in chat windows." +msgstr "Вариант темы, используемый для отображения бесед." #: ../data/org.gnome.Empathy.gschema.xml.in.h:69 -msgid "Whether Empathy can use the network to guess the location." -msgstr "Может ли Empathy использовать сеть для определения местоположения." +msgid "Path of the Adium theme to use" +msgstr "Путь к используемой теме Adium" #: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "Whether Empathy has migrated butterfly logs." -msgstr "Был ли перенос журнала сообщений MSN." +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "Путь к используемой теме Adium, если тема, используемая для беседы — Adium." #: ../data/org.gnome.Empathy.gschema.xml.in.h:71 -msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "Должен ли Empathy автоматически входить в ваши учётные записи при запуске." +msgid "Enable WebKit Developer Tools" +msgstr "Включить инструменты разработчика WebKit" #: ../data/org.gnome.Empathy.gschema.xml.in.h:72 -msgid "Whether Empathy should go into away mode automatically if the user is idle." -msgstr "Должен ли Empathy автоматически устанавливать статус «отсутствует» при бездействии пользователя." +msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled." +msgstr "Должны ли быть включены инструменты разработчика WebKit, например Web Inspector." #: ../data/org.gnome.Empathy.gschema.xml.in.h:73 -msgid "Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "Должен ли Empathy уменьшать точность определения местоположения по причинам приватности." +msgid "Inform other users when you are typing to them" +msgstr "Уведомлять пользователей о наборе сообщений" #: ../data/org.gnome.Empathy.gschema.xml.in.h:74 -msgid "Whether Empathy should use the avatar of the contact as the chat window icon." -msgstr "Использовать ли аватар собеседника в качестве значка окна беседы." +msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state." +msgstr "" #: ../data/org.gnome.Empathy.gschema.xml.in.h:75 -msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "Должны ли быть включены инструменты разработчика WebKit, например Web Inspector." +msgid "Use theme for chat rooms" +msgstr "Использовать тему для бесед" #: ../data/org.gnome.Empathy.gschema.xml.in.h:76 -msgid "Whether connectivity managers should be used to automatically disconnect/reconnect." -msgstr "Использовать ли менеджеры связности для автоматического отключения или переподключения." +msgid "Whether to use the theme for chat rooms." +msgstr "Использовать ли темы для комнат." #: ../data/org.gnome.Empathy.gschema.xml.in.h:77 -msgid "Whether to check words typed against the languages you want to check with." -msgstr "Проверять ли введённые слова из списка языков для проверки орфографии." +msgid "Spell checking languages" +msgstr "Языки для проверки орфографии" #: ../data/org.gnome.Empathy.gschema.xml.in.h:78 -msgid "Whether to convert smileys into graphical images in conversations." -msgstr "Преобразовывать ли текстовые улыбки (смайлы) в беседах в графические изображения." +msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +msgstr "Список языков, используемых при проверке орфографии, разделённых запятыми (например «en, fr, ru»)." #: ../data/org.gnome.Empathy.gschema.xml.in.h:79 -msgid "Whether to enable Pulseaudio's echo cancellation filter." -msgstr "Включить ли фильтр подавления эха Pulseaudio." +msgid "Enable spell checker" +msgstr "Включить проверку орфографии" #: ../data/org.gnome.Empathy.gschema.xml.in.h:80 -msgid "Whether to play a sound to notify of contacts logging into the network." -msgstr "Воспроизводить ли звук для уведомления о входе собеседников в сеть." +msgid "Whether to check words typed against the languages you want to check with." +msgstr "Проверять ли введённые слова из списка языков для проверки орфографии." #: ../data/org.gnome.Empathy.gschema.xml.in.h:81 -msgid "Whether to play a sound to notify of contacts logging out of the network." -msgstr "Воспроизводить ли звук для уведомления о выходе собеседников из сети." +msgid "Nick completed character" +msgstr "Символ автодополнения псевдонима" #: ../data/org.gnome.Empathy.gschema.xml.in.h:82 -msgid "Whether to play a sound to notify of events." -msgstr "Воспроизводить ли звук для уведомления о событиях." +msgid "Character to add after nickname when using nick completion (tab) in group chat." +msgstr "Символ для добавления после псевдонима, если в беседе используется автодополнение псевдонимов по клавише Tab." #: ../data/org.gnome.Empathy.gschema.xml.in.h:83 -msgid "Whether to play a sound to notify of incoming messages." -msgstr "Воспроизводить ли звук для уведомления о входящих сообщениях." +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "Empathy должен использовать аватар контакта как значок окна с беседой" #: ../data/org.gnome.Empathy.gschema.xml.in.h:84 -msgid "Whether to play a sound to notify of new conversations." -msgstr "Воспроизводить ли звук для уведомления о начале новой беседы." +msgid "Whether Empathy should use the avatar of the contact as the chat window icon." +msgstr "Использовать ли аватар собеседника в качестве значка окна беседы." #: ../data/org.gnome.Empathy.gschema.xml.in.h:85 -msgid "Whether to play a sound to notify of outgoing messages." -msgstr "Воспроизводить ли звук для уведомления об исходящих сообщениях." +msgid "Last account selected in Join Room dialog" +msgstr "Последняя учётная запись, выбранная в диалоге присоединения к комнате." #: ../data/org.gnome.Empathy.gschema.xml.in.h:86 -msgid "Whether to play a sound when logging into a network." -msgstr "Воспроизводить ли звук при входе в сеть." +msgid "D-Bus object path of the last account selected to join a room." +msgstr "Путь к объекту D-Bus последней учётной записи, выбранной для присоединения к комнате." #: ../data/org.gnome.Empathy.gschema.xml.in.h:87 -msgid "Whether to play a sound when logging out of a network." -msgstr "Воспроизводить ли звук при выходе из сети." +msgid "Camera device" +msgstr "Камера" #: ../data/org.gnome.Empathy.gschema.xml.in.h:88 -msgid "Whether to play sound notifications when away or busy." -msgstr "Воспроизводить ли звуковые уведомления в состояниях «отсутствует» или «не беспокоить»." +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "Камера, используемая по умолчанию для видеовызовов, напр. /dev/video0." #: ../data/org.gnome.Empathy.gschema.xml.in.h:89 -msgid "Whether to show a popup notification when a contact goes offline." -msgstr "Показывать ли всплывающее уведомление, когда собеседник выходит из сети." +msgid "Camera position" +msgstr "Положение камеры" #: ../data/org.gnome.Empathy.gschema.xml.in.h:90 -msgid "Whether to show a popup notification when a contact goes online." -msgstr "Показывать ли всплывающее уведомление, когда собеседник выходит в сеть." +msgid "Position the camera preview should be during a call." +msgstr "Предварительный просмотр положения камеры должен выполняться в течение вызова." #: ../data/org.gnome.Empathy.gschema.xml.in.h:91 -msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused." -msgstr "Показывать ли всплывающее уведомление о получении нового сообщения, когда беседа уже ведётся, но не находится в фокусе." +msgid "Echo cancellation support" +msgstr "Поддержка подавления эха" #: ../data/org.gnome.Empathy.gschema.xml.in.h:92 -msgid "Whether to show a popup notification when receiving a new message." -msgstr "Показывать ли всплывающее уведомление при получении нового сообщения." +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "Включить ли фильтр подавления эха Pulseaudio." #: ../data/org.gnome.Empathy.gschema.xml.in.h:93 -msgid "Whether to show account balances in the contact list." -msgstr "Показывать ли балансы учётных записей в списке собеседников." +msgid "Show hint about closing the main window" +msgstr "Показывать подсказку о закрытии главного окна" #: ../data/org.gnome.Empathy.gschema.xml.in.h:94 -msgid "Whether to show avatars for contacts in the contact list and chat windows." -msgstr "Показывать ли аватары собеседников в списке собеседников и окнах беседы." +msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar." +msgstr "Показывать ли диалоговое окно при закрытии главного окна с помощью кнопки «x» в строке заголовка." #: ../data/org.gnome.Empathy.gschema.xml.in.h:95 -msgid "Whether to show contacts that are offline in the contact list." -msgstr "Показывать ли собеседников не в сети." +msgid "Empathy can publish the user's location" +msgstr "Empathy может публиковать местоположение пользователя" #: ../data/org.gnome.Empathy.gschema.xml.in.h:96 -msgid "Whether to show popup notifications when away or busy." -msgstr "Показывать ли всплывающие уведомления в состояниях «отсутствует» или «не беспокоить»." +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "Может ли Empathy публиковать местоположение пользователя для его собеседников." #: ../data/org.gnome.Empathy.gschema.xml.in.h:97 -msgid "Whether to show protocols for contacts in the contact list." -msgstr "Показывать ли протоколы для собеседников в списке собеседников." +msgid "Empathy can use the network to guess the location" +msgstr "Empathy может использовать сеть для определения местоположения" #: ../data/org.gnome.Empathy.gschema.xml.in.h:98 -msgid "Whether to show the contact list in chat rooms." -msgstr "Показывать ли список собеседников в комнатах." +msgid "Whether Empathy can use the network to guess the location." +msgstr "Может ли Empathy использовать сеть для определения местоположения." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy может использовать сотовую сеть для определения местоположения" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "Может ли Empathy использовать сотовую сеть для определения местоположения." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy может использовать GPS для определения местоположения" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Может ли Empathy использовать GPS для определения местоположения." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy должен снижать точность местоположения" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 +msgid "Whether Empathy should reduce the location's accuracy for privacy reasons." +msgstr "Должен ли Empathy уменьшать точность определения местоположения по причинам приватности." + +#. Tweak the dialog +#: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2327 +msgid "Messaging and VoIP Accounts" +msgstr "Учётные записи обмена сообщениями и VoIP" + +#: ../data/empathy-accounts.desktop.in.in.h:2 +msgid "Manage Messaging and VoIP accounts" +msgstr "Управление учётными записями для обмена сообщениями и VoIP" + +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Причина не указана" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 -msgid "Whether to show the contact list in compact mode." -msgstr "Показывать ли компактный список собеседников." +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Получен запрос об изменении состояния" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 -msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar." -msgstr "Показывать ли диалоговое окно при закрытии главного окна с помощью кнопки «x» в строке заголовка." +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Передача файла была прервана" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 -msgid "Whether to use the theme for chat rooms." -msgstr "Использовать ли темы для комнат." +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Собеседник прервал передачу файла" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 -msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state." -msgstr "Критерий упорядочивания списка собеседников. По умолчанию упорядочивается по имени собеседника — «name». При значении «state» список будет упорядочен по статусу." +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Во время передачи файла возникла ошибка" -#: ../data/empathy-accounts.desktop.in.in.h:1 -msgid "Manage Messaging and VoIP accounts" -msgstr "Управление учётными записями для обмена сообщениями и VoIP" +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Собеседник не может передавать файлы" -#. Tweak the dialog -#: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2324 -msgid "Messaging and VoIP Accounts" -msgstr "Учётные записи обмена сообщениями и VoIP" +#: ../libempathy/empathy-ft-handler.c:754 +#: ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "Неизвестная причина" -#: ../libempathy/empathy-ft-handler.c:825 +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Передача файла завершена, но файл был повреждён" -#: ../libempathy/empathy-ft-handler.c:1111 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Удалённый собеседник не поддерживает передачу файлов" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Выбранный файл не является обычным файлом" -#: ../libempathy/empathy-ft-handler.c:1176 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Выбранный файл пуст" @@ -491,199 +535,176 @@ msgstr "Разговор с %s" msgid "Call from %s" msgstr "Вызов от %s" -#: ../libempathy/empathy-tp-file.c:268 -msgid "Socket type not supported" -msgstr "Тип «сокет» не поддерживается" - -#: ../libempathy/empathy-tp-file.c:387 -msgid "No reason was specified" -msgstr "Причина не указана" - -#: ../libempathy/empathy-tp-file.c:390 -msgid "The change in state was requested" -msgstr "Получен запрос об изменении состояния" - -#: ../libempathy/empathy-tp-file.c:393 -msgid "You canceled the file transfer" -msgstr "Передача файла была прервана" - -#: ../libempathy/empathy-tp-file.c:396 -msgid "The other participant canceled the file transfer" -msgstr "Собеседник прервал передачу файла" - -#: ../libempathy/empathy-tp-file.c:399 -msgid "Error while trying to transfer the file" -msgstr "Во время передачи файла возникла ошибка" - -#: ../libempathy/empathy-tp-file.c:402 -msgid "The other participant is unable to transfer the file" -msgstr "Собеседник не может передавать файлы" - -#: ../libempathy/empathy-tp-file.c:405 -#: ../libempathy/empathy-utils.c:302 -msgid "Unknown reason" -msgstr "Неизвестная причина" - -#: ../libempathy/empathy-utils.c:222 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "В сети" -#: ../libempathy/empathy-utils.c:224 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "Не беспокоить" -#: ../libempathy/empathy-utils.c:227 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "Отсутствует" -#: ../libempathy/empathy-utils.c:229 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "Невидимость" -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "Не в сети" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "Неизвестно" -#: ../libempathy/empathy-utils.c:274 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "Причина не указана" -#: ../libempathy/empathy-utils.c:276 -#: ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:287 +#: ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "Установлен статус «не в сети»" -#: ../libempathy/empathy-utils.c:278 -#: ../libempathy/empathy-utils.c:312 +#: ../libempathy/empathy-utils.c:289 +#: ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Ошибка сети" -#: ../libempathy/empathy-utils.c:280 -#: ../libempathy/empathy-utils.c:314 +#: ../libempathy/empathy-utils.c:291 +#: ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "Аутентификация не удалась" -#: ../libempathy/empathy-utils.c:282 -#: ../libempathy/empathy-utils.c:316 +#: ../libempathy/empathy-utils.c:293 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "Ошибка шифрования" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "Имя уже занято" -#: ../libempathy/empathy-utils.c:286 -#: ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:297 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "Сертификат недоступен" -#: ../libempathy/empathy-utils.c:288 -#: ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:299 +#: ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "Сертификат не является доверенным" -#: ../libempathy/empathy-utils.c:290 -#: ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:301 +#: ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "Сертификат устарел" -#: ../libempathy/empathy-utils.c:292 -#: ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:303 +#: ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "Сертификат не активирован" -#: ../libempathy/empathy-utils.c:294 -#: ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:305 +#: ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "Имена узлов сертификатов не совпадают" -#: ../libempathy/empathy-utils.c:296 -#: ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:307 +#: ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "Отпечатки сертификатов не совпадают" -#: ../libempathy/empathy-utils.c:298 -#: ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:309 +#: ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "Сертификат подписан самостоятельно" -#: ../libempathy/empathy-utils.c:300 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "Ошибка сертификата" -#: ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "Шифрование недоступно" -#: ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "Неверный сертификат" -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "Запрос на подключение отклонён" -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "Не удалось установить соединение" -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "Соединение разорвано" -#: ../libempathy/empathy-utils.c:344 -msgid "This resource is already connected to the server" -msgstr "Этот ресурс уже подключён к серверу" +#: ../libempathy/empathy-utils.c:355 +#| msgid "This resource is already connected to the server" +msgid "This account is already connected to the server" +msgstr "Эта учётная запись уже подключена к серверу" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:357 msgid "Connection has been replaced by a new connection using the same resource" msgstr "Подключение было замещено новым подключение с этим же ресурсом" -#: ../libempathy/empathy-utils.c:349 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "Учётная запись уже существует на сервере" -#: ../libempathy/empathy-utils.c:351 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "В настоящий момент сервер слишком загружен, чтобы обработать подключение." -#: ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "Сертификат аннулирован" -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:366 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "Сертификат использует небезопасный алгоритм шифра или криптографически слаб" -#: ../libempathy/empathy-utils.c:358 +#: ../libempathy/empathy-utils.c:369 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library" msgstr "Длина сертификата сервера или глубина цепочки сертификатов сервера превышает предел, установленный криптографической библиотекой" -#: ../libempathy/empathy-utils.c:519 -#: ../libempathy-gtk/empathy-contact-list-store.h:73 +#: ../libempathy/empathy-utils.c:373 +msgid "Your software is too old" +msgstr "Слишком старая версия приложения" + +#: ../libempathy/empathy-utils.c:375 +#| msgid "Interval (seconds)" +msgid "Internal error" +msgstr "Внутренняя ошибка" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "Люди поблизости" -#: ../libempathy/empathy-utils.c:524 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Yahoo! Япония" -#: ../libempathy/empathy-utils.c:553 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:554 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Беседа Facebook" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" @@ -691,7 +712,7 @@ msgstr[0] "%d секунду назад" msgstr[1] "%d секунды назад" msgstr[2] "%d секунд назад" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -699,7 +720,7 @@ msgstr[0] "%d минуту назад" msgstr[1] "%d минуты назад" msgstr[2] "%d минут назад" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -707,7 +728,7 @@ msgstr[0] "%d час назад" msgstr[1] "%d часа назад" msgstr[2] "%d часов назад" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -715,7 +736,7 @@ msgstr[0] "%d день назад" msgstr[1] "%d дня назад" msgstr[2] "%d дней назад" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -723,7 +744,7 @@ msgstr[0] "%d неделю назад" msgstr[1] "%d недели назад" msgstr[2] "%d недель назад" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -731,224 +752,196 @@ msgstr[0] "%d месяц назад" msgstr[1] "%d месяца назад" msgstr[2] "%d месяцев назад" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "в будущем" -#: ../libempathy-gtk/empathy-account-chooser.c:540 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "Все учётные записи" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Учётная запись" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Пароль" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Сервер" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Порт" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:765 +#: ../libempathy-gtk/empathy-account-widget.c:817 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -msgid "My Web Accounts" -msgstr "Мои сетевые учётные записи" - -#: ../libempathy-gtk/empathy-account-widget.c:1208 -#, c-format -msgid "The account %s is edited via %s." -msgstr "Учётная запись %s изменена посредством %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1214 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Учётную запись %s нельзя изменить в Empathy." - -#: ../libempathy-gtk/empathy-account-widget.c:1233 -msgid "Launch My Web Accounts" -msgstr "Запустить «Мои учётные записи»" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1241 -#, c-format -msgid "Edit %s" -msgstr "Изменить %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1591 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget.c:1398 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Username:" msgstr "Имя пользователя:" -#: ../libempathy-gtk/empathy-account-widget.c:1909 +#: ../libempathy-gtk/empathy-account-widget.c:1710 msgid "A_pply" msgstr "П_рименить" -#: ../libempathy-gtk/empathy-account-widget.c:1939 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "L_og in" msgstr "_Войти" -#: ../libempathy-gtk/empathy-account-widget.c:2013 +#: ../libempathy-gtk/empathy-account-widget.c:1812 msgid "This account already exists on the server" msgstr "Эта учётная запись уже существует на сервере" -#: ../libempathy-gtk/empathy-account-widget.c:2016 +#: ../libempathy-gtk/empathy-account-widget.c:1816 msgid "Create a new account on the server" msgstr "Создать новую учётную запись на сервере" -#: ../libempathy-gtk/empathy-account-widget.c:2208 -msgid "Ca_ncel" -msgstr "О_тменить" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2486 +#: ../libempathy-gtk/empathy-account-widget.c:2241 #, c-format msgid "%1$s on %2$s" msgstr "%1$s на %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2512 +#: ../libempathy-gtk/empathy-account-widget.c:2267 #, c-format msgid "%s Account" msgstr "Учётная запись %s" -#: ../libempathy-gtk/empathy-account-widget.c:2516 +#: ../libempathy-gtk/empathy-account-widget.c:2271 msgid "New account" msgstr "Новая учётная запись" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 -msgid "Example: MyScreenName" -msgstr "Пример: MyScreenName" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Pass_word:" +msgstr "_Пароль:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 -msgid "Advanced" -msgstr "Дополнительно" +msgid "Screen _Name:" +msgstr "_Имя:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +msgid "Example: MyScreenName" +msgstr "Пример: MyScreenName" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 -msgid "Pass_word:" -msgstr "_Пароль:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "Запомнить пароль" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -msgid "Remember Password" -msgstr "Запомнить пароль" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Port:" +msgstr "П_орт:" -#. remember password ticky box -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 -msgid "Remember password" -msgstr "Запомнить пароль" - -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 -msgid "Screen _Name:" -msgstr "_Имя:" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "_Server:" +msgstr "_Сервер:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 -msgid "What is your AIM password?" -msgstr "Какой у вас пароль AIM?" +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Advanced" +msgstr "Дополнительно" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 msgid "What is your AIM screen name?" msgstr "Какое у вас имя пользователя AIM?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 -msgid "_Port:" -msgstr "П_орт:" +msgid "What is your AIM password?" +msgstr "Какой у вас пароль AIM?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../src/empathy-new-chatroom-dialog.ui.h:9 -msgid "_Server:" -msgstr "_Сервер:" - -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "Example: username" -msgstr "Пример: имя_пользователя" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "Remember Password" +msgstr "Запомнить пароль" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "_Идентификатор:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Example: username" +msgstr "Пример: имя_пользователя" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 msgid "What is your GroupWise User ID?" msgstr "Какой у вас ID пользователя GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 msgid "What is your GroupWise password?" msgstr "Какой у вас пароль GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "ICQ _UIN:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "Example: 123456789" msgstr "Пример: 123456789" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "Ch_aracter set:" msgstr "_Кодировка:" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 -msgid "ICQ _UIN:" -msgstr "ICQ _UIN:" - -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 msgid "What is your ICQ UIN?" msgstr "Какой у вас ICQ UIN?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 msgid "What is your ICQ password?" msgstr "Какой у вас пароль ICQ?" @@ -985,21 +978,25 @@ msgstr "Options" msgid "None" msgstr "Отсутствует" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Network" +msgstr "Сеть" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 -msgid "Character set:" -msgstr "Кодировка:" +msgid "Network:" +msgstr "Сеть:" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 -msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password." -msgstr "Большинство серверов IRC не требует пароля, если вы не уверены, то не вводите пароль." +msgid "Character set:" +msgstr "Кодировка:" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 -msgid "Network" -msgstr "Сеть" +msgid "Servers" +msgstr "Серверы" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 -msgid "Network:" -msgstr "Сеть:" +msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password." +msgstr "Большинство серверов IRC не требует пароля, если вы не уверены, то не вводите пароль." #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" @@ -1017,48 +1014,20 @@ msgstr "Сообщение при выходе:" msgid "Real name:" msgstr "Настоящее имя:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 -msgid "Servers" -msgstr "Серверы" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 -msgid "What is your IRC nickname?" -msgstr "Какой у вас псевдоним в IRC?" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 -msgid "Which IRC network?" -msgstr "Какая сеть IRC?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "Example: user@gmail.com" -msgstr "Пример: пользователь@gmail.com" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "Example: user@jabber.org" -msgstr "Пример: пользователь@jabber.org" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 -msgid "Encr_yption required (TLS/SSL)" -msgstr "Требуется шифров_ание (TLS/SSL)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 -msgid "I_gnore SSL certificate errors" -msgstr "_Игнорировать ошибки сертификатов SSL" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 -msgid "Override server settings" -msgstr "Замещать настройки сервера" +msgid "Which IRC network?" +msgstr "Какая сеть IRC?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 -msgid "Priori_ty:" -msgstr "При_оритет:" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "What is your IRC nickname?" +msgstr "Какой у вас псевдоним в IRC?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 -msgid "Reso_urce:" -msgstr "Ре_сурс:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "What is your Facebook username?" +msgstr "Какое у вас имя пользователя Facebook?" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/badger, enter badger.\n" @@ -1068,64 +1037,92 @@ msgstr "" "Если ваш адрес facebook.com/badger, введите badger.\n" "Используйте эту страницу для выбора имени пользователя Facebook, если у вас его ещё нет." -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 -msgid "Use old SS_L" -msgstr "Использовать старое _шифрование (SSL)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "What is your Facebook password?" msgstr "Какой у вас пароль Facebook?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 -msgid "What is your Facebook username?" -msgstr "Какое у вас имя пользователя Facebook?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "What is your Google ID?" msgstr "Какой у вас Google ID?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Example: user@gmail.com" +msgstr "Пример: пользователь@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "What is your Google password?" msgstr "Какой у вас пароль Google?" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +msgid "Example: user@jabber.org" +msgstr "Пример: пользователь@jabber.org" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "I_gnore SSL certificate errors" +msgstr "_Игнорировать ошибки сертификатов SSL" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +msgid "Priori_ty:" +msgstr "При_оритет:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +msgid "Reso_urce:" +msgstr "Ре_сурс:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "Encr_yption required (TLS/SSL)" +msgstr "Требуется шифров_ание (TLS/SSL)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "Use old SS_L" +msgstr "Использовать старое _шифрование (SSL)" + #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "Override server settings" +msgstr "Замещать настройки сервера" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 msgid "What is your Jabber ID?" msgstr "Какой у вас Jabber ID?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 -msgid "What is your Jabber password?" -msgstr "Какой у вас пароль Jabber?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 msgid "What is your desired Jabber ID?" msgstr "Какой Jabber ID вы хотите?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +msgid "What is your Jabber password?" +msgstr "Какой у вас пароль Jabber?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 msgid "What is your desired Jabber password?" msgstr "Какой пароль Jabber вы хотите?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 msgid "Example: user@hotmail.com" msgstr "Пример: user@hotmail.com" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 msgid "What is your Windows Live ID?" msgstr "Какой у вас Windows Live ID?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 msgid "What is your Windows Live password?" msgstr "Какой у вас пароль Windows Live?" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 +msgid "Nic_kname:" +msgstr "_Псевдоним:" + #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "E-_mail address:" -msgstr "А_дрес эл. почты:" +msgid "_Last Name:" +msgstr "_Фамилия:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 -msgid "Nic_kname:" -msgstr "_Псевдоним:" +msgid "_First Name:" +msgstr "_Имя:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 -msgid "_First Name:" +msgid "_Published Name:" msgstr "_Имя:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 @@ -1133,144 +1130,140 @@ msgid "_Jabber ID:" msgstr "_Jabber ID:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 -msgid "_Last Name:" -msgstr "_Фамилия:" +msgid "E-_mail address:" +msgstr "А_дрес эл. почты:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -msgid "_Published Name:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "_Username:" msgstr "_Имя:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Example: user@my.sip.server" msgstr "Пример: user@my.sip.server" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "Authentication username:" -msgstr "Имя пользователя для аутентификации:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover Binding" -msgstr "Обнаруживать соединения" - #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "Discover the STUN server automatically" -msgstr "Автоматический поиск сервера STUN" +msgid "Use this account to call _landlines and mobile phones" +msgstr "Использовать эту учётную запись для звонков на _обычные и мобильные телефоны" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 -msgid "Ignore TLS Errors" -msgstr "Игнорировать ошибки TLS" +msgid "NAT Traversal Options" +msgstr "Параметры NAT Traversal" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "Interval (seconds)" -msgstr "Интервал (в секундах)" +msgid "Proxy Options" +msgstr "Параметры прокси" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -msgid "Keep-Alive Options" -msgstr "Параметры Keep-Alive" +msgid "Miscellaneous Options" +msgstr "Различные параметры" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 -msgid "Loose Routing" -msgstr "Свободная маршрутизация" +msgid "STUN Server:" +msgstr "Сервер STUN:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 -msgid "Mechanism:" -msgstr "Механизм:" +msgid "Discover the STUN server automatically" +msgstr "Автоматический поиск сервера STUN" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 -msgid "Miscellaneous Options" -msgstr "Различные параметры" +msgid "Discover Binding" +msgstr "Обнаруживать соединения" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -msgid "NAT Traversal Options" -msgstr "Параметры NAT Traversal" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "Сервер:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Keep-Alive Options" +msgstr "Параметры Keep-Alive" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 -msgid "Port:" -msgstr "Порт:" +msgid "Mechanism:" +msgstr "Механизм:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 -msgid "Proxy Options" -msgstr "Параметры прокси" +msgid "Interval (seconds)" +msgstr "Интервал (в секундах)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Authentication username:" +msgstr "Имя пользователя для аутентификации:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Transport:" +msgstr "Транспорт:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -msgid "STUN Server:" -msgstr "Сервер STUN:" +msgid "Loose Routing" +msgstr "Свободная маршрутизация" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contact-widget.c:347 -msgid "Server:" -msgstr "Сервер:" +msgid "Ignore TLS Errors" +msgstr "Игнорировать ошибки TLS" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -msgid "Transport:" -msgstr "Транспорт:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -msgid "Use this account to call _landlines and mobile phones" -msgstr "Использовать эту учётную запись для звонков на _обычные и мобильные телефоны" +msgid "Port:" +msgstr "Порт:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 -msgid "What is your SIP account password?" -msgstr "Какой у вас пароль учётной записи SIP?" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Какой у вас ID входа для SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 -msgid "_Username:" -msgstr "_Имя:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP account password?" +msgstr "Какой у вас пароль учётной записи SIP?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Yahoo! I_D:" +msgstr "Yahoo! I_D:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "I_gnore conference and chat room invitations" msgstr "_Игнорировать приглашения к беседам и конференциям" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Room List locale:" +msgstr "_Локаль списка бесед:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "What is your Yahoo! ID?" msgstr "Какой у вас Yahoo! ID?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "What is your Yahoo! password?" msgstr "Какой у вас пароль Yahoo! ?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "Yahoo! I_D:" -msgstr "Yahoo! I_D:" - -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 -msgid "_Room List locale:" -msgstr "_Локаль списка бесед:" - -#: ../libempathy-gtk/empathy-avatar-chooser.c:470 -#: ../libempathy-gtk/empathy-avatar-chooser.c:555 +#: ../libempathy-gtk/empathy-avatar-chooser.c:471 +#: ../libempathy-gtk/empathy-avatar-chooser.c:556 msgid "Couldn't convert image" msgstr "Не удалось преобразовать изображение" -#: ../libempathy-gtk/empathy-avatar-chooser.c:471 +#: ../libempathy-gtk/empathy-avatar-chooser.c:472 msgid "None of the accepted image formats are supported on your system" msgstr "Ни один из разрешённых форматов изображений не поддерживается в вашей системе" -#: ../libempathy-gtk/empathy-avatar-chooser.c:818 +#: ../libempathy-gtk/empathy-avatar-chooser.c:819 msgid "Couldn't save picture to file" msgstr "Не удалось сохранить изображение в файл" -#: ../libempathy-gtk/empathy-avatar-chooser.c:934 +#: ../libempathy-gtk/empathy-avatar-chooser.c:939 msgid "Select Your Avatar Image" msgstr "Выберите изображение для аватара" -#: ../libempathy-gtk/empathy-avatar-chooser.c:938 +#: ../libempathy-gtk/empathy-avatar-chooser.c:947 msgid "Take a picture..." msgstr "Сделать снимок…" -#: ../libempathy-gtk/empathy-avatar-chooser.c:941 +#: ../libempathy-gtk/empathy-avatar-chooser.c:960 msgid "No Image" msgstr "Нет изображения" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1001 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1017 msgid "Images" msgstr "Изображения" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1005 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1021 msgid "All Files" msgstr "Все файлы" @@ -1279,7 +1272,7 @@ msgid "Click to enlarge" msgstr "Щёлкните для увеличения" #: ../libempathy-gtk/empathy-call-utils.c:44 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:62 msgid "There was an error starting the call" msgstr "Во время вызова произошла ошибка" @@ -1299,179 +1292,199 @@ msgstr "Указанный собеседник не является допус msgid "Emergency calls are not supported on this protocol" msgstr "Срочные телефонные звонки не поддерживаются этим протоколом" -#: ../libempathy-gtk/empathy-chat.c:702 +#: ../libempathy-gtk/empathy-call-utils.c:59 +msgid "You don't have enough credit in order to place this call" +msgstr "Недостаточно средств, чтобы сделать этот звонок" + +#: ../libempathy-gtk/empathy-chat.c:728 msgid "Failed to open private chat" msgstr "Не удалось открыть личную беседу" -#: ../libempathy-gtk/empathy-chat.c:763 +#: ../libempathy-gtk/empathy-chat.c:786 msgid "Topic not supported on this conversation" msgstr "В этой беседе темы не поддерживаются" -#: ../libempathy-gtk/empathy-chat.c:769 +#: ../libempathy-gtk/empathy-chat.c:792 msgid "You are not allowed to change the topic" msgstr "Вы не можете менять тему" -#: ../libempathy-gtk/empathy-chat.c:973 +#: ../libempathy-gtk/empathy-chat.c:991 #, c-format msgid "“%s” is not a valid contact ID" msgstr "«%s» не является допустимым идентификатором контакта" -#: ../libempathy-gtk/empathy-chat.c:1058 +#: ../libempathy-gtk/empathy-chat.c:1086 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: очистить все сообщения в текущей беседе" -#: ../libempathy-gtk/empathy-chat.c:1061 +#: ../libempathy-gtk/empathy-chat.c:1089 msgid "/topic : set the topic of the current conversation" msgstr "/topic <тема>: установить тему текущей беседы" -#: ../libempathy-gtk/empathy-chat.c:1064 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/join : join a new chat room" msgstr "/join : войти в новую комнату" -#: ../libempathy-gtk/empathy-chat.c:1067 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "/j : join a new chat room" msgstr "/j : войти в новую комнату" -#: ../libempathy-gtk/empathy-chat.c:1071 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "/part [] []: leave the chat room, by default the current one" msgstr "/part [] [<причина>]: покинуть комнату, по умолчанию — текущую" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "/query []: open a private chat" msgstr "/query [<сообщение>]: открыть личную беседу" -#: ../libempathy-gtk/empathy-chat.c:1078 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "/msg : open a private chat" msgstr "/msg <сообщение>: открыть личную беседу" -#: ../libempathy-gtk/empathy-chat.c:1081 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "/nick : change your nickname on the current server" msgstr "/nick <псевдоним>: изменить псевдоним на текущем сервере" -#: ../libempathy-gtk/empathy-chat.c:1084 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "/me : send an ACTION message to the current conversation" msgstr "/me <сообщение>: отправить сообщение о ДЕЙСТВИИ" -#: ../libempathy-gtk/empathy-chat.c:1087 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "/say : send to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\"" msgstr "/say <сообщение>: отправить <сообщение> в текущей беседе. Используется для отправки сообщения, начинающегося с «/». Например: «/say /join используется для входа в новую комнату»" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1120 msgid "/whois : display information about a contact" msgstr "/whois : показать информацию о контакте" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1123 msgid "/help []: show all supported commands. If is defined, show its usage." msgstr "/help [<команда>]: показать все поддерживаемые команды. Если <команда> определена, показать её использование." -#: ../libempathy-gtk/empathy-chat.c:1112 +#: ../libempathy-gtk/empathy-chat.c:1142 #, c-format msgid "Usage: %s" msgstr "Использование: %s" -#: ../libempathy-gtk/empathy-chat.c:1157 +#: ../libempathy-gtk/empathy-chat.c:1187 msgid "Unknown command" msgstr "Неизвестная команда" -#: ../libempathy-gtk/empathy-chat.c:1283 +#: ../libempathy-gtk/empathy-chat.c:1313 msgid "Unknown command; see /help for the available commands" msgstr "Неизвестная команда; для всех доступных команд см. /help" -#. translators: error used when user doesn't have enough credit on his -#. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1453 +#: ../libempathy-gtk/empathy-chat.c:1564 msgid "insufficient balance to send message" msgstr "недостаточно средств для отправки сообщения" -#: ../libempathy-gtk/empathy-chat.c:1455 +#: ../libempathy-gtk/empathy-chat.c:1568 +#: ../libempathy-gtk/empathy-chat.c:1582 +#: ../libempathy-gtk/empathy-chat.c:1645 +#, c-format +msgid "Error sending message '%s': %s" +msgstr "Ошибка при отправке сообщения «%s»: %s" + +#: ../libempathy-gtk/empathy-chat.c:1570 +#: ../libempathy-gtk/empathy-chat.c:1587 +#: ../libempathy-gtk/empathy-chat.c:1649 +#, c-format +msgid "Error sending message: %s" +msgstr "Ошибка при отправке сообщения: %s" + +#. translators: error used when user doesn't have enough credit on his +#. * account to send the message. +#: ../libempathy-gtk/empathy-chat.c:1576 +#, c-format +msgid "insufficient balance to send message. Top up." +msgstr "недостаточно средств для отправки сообщения. Пополнить." + +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "not capable" msgstr "не поддерживается" -#: ../libempathy-gtk/empathy-chat.c:1462 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "offline" msgstr "не в сети" -#: ../libempathy-gtk/empathy-chat.c:1465 +#: ../libempathy-gtk/empathy-chat.c:1626 msgid "invalid contact" msgstr "неверный собеседник" -#: ../libempathy-gtk/empathy-chat.c:1468 +#: ../libempathy-gtk/empathy-chat.c:1629 msgid "permission denied" msgstr "отказано" -#: ../libempathy-gtk/empathy-chat.c:1471 +#: ../libempathy-gtk/empathy-chat.c:1632 msgid "too long message" msgstr "слишком длинное сообщение" -#: ../libempathy-gtk/empathy-chat.c:1474 +#: ../libempathy-gtk/empathy-chat.c:1635 msgid "not implemented" msgstr "эта возможность не санкционирована" -#: ../libempathy-gtk/empathy-chat.c:1478 +#: ../libempathy-gtk/empathy-chat.c:1639 msgid "unknown" msgstr "неизвестно" -#: ../libempathy-gtk/empathy-chat.c:1484 -#, c-format -msgid "Error sending message '%s': %s" -msgstr "Ошибка при отправке сообщения «%s»: %s" - -#: ../libempathy-gtk/empathy-chat.c:1488 -#, c-format -msgid "Error sending message: %s" -msgstr "Ошибка при отправке сообщения: %s" - -#: ../libempathy-gtk/empathy-chat.c:1549 -#: ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1706 +#: ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "Тема:" -#: ../libempathy-gtk/empathy-chat.c:1561 +#: ../libempathy-gtk/empathy-chat.c:1721 #, c-format msgid "Topic set to: %s" msgstr "Тема: %s" -#: ../libempathy-gtk/empathy-chat.c:1563 +#: ../libempathy-gtk/empathy-chat.c:1723 +#, c-format +#| msgid "Topic set to: %s" +msgid "Topic set by %s to: %s" +msgstr "Пользователь %s установил тему: %s" + +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1728 msgid "No topic defined" msgstr "Тема не установлена" -#: ../libempathy-gtk/empathy-chat.c:2072 +#: ../libempathy-gtk/empathy-chat.c:2244 msgid "(No Suggestions)" msgstr "(Нет предположений)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2140 +#: ../libempathy-gtk/empathy-chat.c:2312 #, c-format msgid "Add '%s' to Dictionary" msgstr "Добавить «%s» в словарь" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2177 +#: ../libempathy-gtk/empathy-chat.c:2349 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Добавить «%s» в словарь «%s»" -#: ../libempathy-gtk/empathy-chat.c:2247 +#: ../libempathy-gtk/empathy-chat.c:2419 msgid "Insert Smiley" msgstr "Вставить улыбку" #. send button -#: ../libempathy-gtk/empathy-chat.c:2265 -#: ../libempathy-gtk/empathy-ui-utils.c:1839 +#: ../libempathy-gtk/empathy-chat.c:2437 +#: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "От_править" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2319 +#: ../libempathy-gtk/empathy-chat.c:2494 msgid "_Spelling Suggestions" msgstr "_Варианты правописания" -#: ../libempathy-gtk/empathy-chat.c:2408 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Не удалось получить последние журналы" -#: ../libempathy-gtk/empathy-chat.c:2545 +#: ../libempathy-gtk/empathy-chat.c:2722 #, c-format msgid "%s has disconnected" msgstr "%s отключился" @@ -1479,12 +1492,12 @@ msgstr "%s отключился" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2552 +#: ../libempathy-gtk/empathy-chat.c:2729 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s выгнал %1$s" -#: ../libempathy-gtk/empathy-chat.c:2555 +#: ../libempathy-gtk/empathy-chat.c:2732 #, c-format msgid "%s was kicked" msgstr "%s выгнали" @@ -1492,17 +1505,17 @@ msgstr "%s выгнали" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2563 +#: ../libempathy-gtk/empathy-chat.c:2740 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s забанил %1$s" -#: ../libempathy-gtk/empathy-chat.c:2566 +#: ../libempathy-gtk/empathy-chat.c:2743 #, c-format msgid "%s was banned" msgstr "%s забанили" -#: ../libempathy-gtk/empathy-chat.c:2570 +#: ../libempathy-gtk/empathy-chat.c:2747 #, c-format msgid "%s has left the room" msgstr "%s покинул беседу" @@ -1512,17 +1525,17 @@ msgstr "%s покинул беседу" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2579 +#: ../libempathy-gtk/empathy-chat.c:2756 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2604 +#: ../libempathy-gtk/empathy-chat.c:2781 #, c-format msgid "%s has joined the room" msgstr "%s присоединился к беседе" -#: ../libempathy-gtk/empathy-chat.c:2629 +#: ../libempathy-gtk/empathy-chat.c:2806 #, c-format msgid "%s is now known as %s" msgstr "%s теперь известен как %s" @@ -1530,93 +1543,93 @@ msgstr "%s теперь известен как %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2768 -#: ../src/empathy-streamed-media-window.c:1894 -#: ../src/empathy-event-manager.c:1240 -#: ../src/empathy-call-window.c:1391 -#: ../src/empathy-call-window.c:1441 -#: ../src/empathy-call-window.c:2479 +#: ../libempathy-gtk/empathy-chat.c:2993 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 +#: ../src/empathy-call-window.c:1545 +#: ../src/empathy-call-window.c:1595 +#: ../src/empathy-call-window.c:2638 msgid "Disconnected" msgstr "Отсоединён" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3415 +#: ../libempathy-gtk/empathy-chat.c:3657 msgid "Would you like to store this password?" msgstr "Хотите запомнить этот пароль?" -#: ../libempathy-gtk/empathy-chat.c:3421 +#: ../libempathy-gtk/empathy-chat.c:3663 msgid "Remember" msgstr "Запомнить" -#: ../libempathy-gtk/empathy-chat.c:3431 +#: ../libempathy-gtk/empathy-chat.c:3673 msgid "Not now" msgstr "Не сейчас" -#: ../libempathy-gtk/empathy-chat.c:3475 +#: ../libempathy-gtk/empathy-chat.c:3717 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Повторить" -#: ../libempathy-gtk/empathy-chat.c:3479 +#: ../libempathy-gtk/empathy-chat.c:3721 msgid "Wrong password; please try again:" msgstr "Неправильный пароль. Попробуйте снова:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3609 +#: ../libempathy-gtk/empathy-chat.c:3851 msgid "This room is protected by a password:" msgstr "Эта комната защищена паролем:" -#: ../libempathy-gtk/empathy-chat.c:3636 +#: ../libempathy-gtk/empathy-chat.c:3878 msgid "Join" msgstr "Войти" -#: ../libempathy-gtk/empathy-chat.c:3838 -#: ../src/empathy-event-manager.c:1261 +#: ../libempathy-gtk/empathy-chat.c:4070 +#: ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Соединён" -#: ../libempathy-gtk/empathy-chat.c:3893 +#: ../libempathy-gtk/empathy-chat.c:4125 msgid "Conversation" msgstr "Беседа" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3898 +#: ../libempathy-gtk/empathy-chat.c:4130 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Неизвестный или недопустимый идентификатор" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Блокирование контактов временно недоступно" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Блокирование контактов недоступно" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Доступ запрещён" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Не удалось заблокировать контакт" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Изменить заблокированных собеседников" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1489 -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "Account:" msgstr "Учётная запись:" @@ -1626,62 +1639,53 @@ msgstr "Заблокированные собеседники" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:2 #: ../src/empathy-chatrooms-window.ui.h:3 msgid "Remove" msgstr "Удалить" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "_Копировать адрес ссылки" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 +#: ../libempathy-gtk/empathy-chat-text-view.c:329 #: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "_Открыть ссылку" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:417 msgid "%A %B %d %Y" -msgstr "%A %d %B %Y" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Редактировать информацию о собеседнике" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 -msgid "Personal Information" -msgstr "Личная информация" +msgstr "%A %d %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "Новый собеседник" -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "Заблокировать %s?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "Уверены, что хотите заблокировать «%s»?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 msgid "_Block" msgstr "_Заблокировать" -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Пожаловаться на этого собеседника" @@ -1689,510 +1693,495 @@ msgstr[1] "_Пожаловаться на этих собеседников" msgstr[2] "_Пожаловаться на этих собеседников" #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "Решить _позже" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "Запрос на подписку" -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "_Block User" msgstr "_Заблокировать пользователя" -#: ../libempathy-gtk/empathy-contact-list-store.h:71 -msgid "Ungrouped" -msgstr "Без группы" - -#: ../libempathy-gtk/empathy-contact-list-store.h:72 -msgid "Favorite People" -msgstr "Избранные люди" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-individual-view.c:2376 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Вы хотите удалить группу «%s»?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1988 -#: ../libempathy-gtk/empathy-individual-view.c:2379 -msgid "Removing group" -msgstr "Удаление группы" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:2037 -#: ../libempathy-gtk/empathy-contact-list-view.c:2114 -#: ../libempathy-gtk/empathy-individual-view.c:2434 -#: ../libempathy-gtk/empathy-individual-view.c:2637 -msgid "_Remove" -msgstr "_Удалить" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2067 -#: ../libempathy-gtk/empathy-individual-view.c:2501 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Действительно хотите удалить собеседника «%s»?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2069 -#: ../libempathy-gtk/empathy-individual-view.c:2522 -msgid "Removing contact" -msgstr "Удаление собеседника" - -#: ../libempathy-gtk/empathy-contact-menu.c:220 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "_Добавить собеседника…" - -#: ../libempathy-gtk/empathy-contact-menu.c:300 -msgid "_Block Contact" -msgstr "_Заблокировать собеседника" - -#: ../libempathy-gtk/empathy-contact-menu.c:329 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "_Разговор" - -#: ../libempathy-gtk/empathy-contact-menu.c:361 -#: ../libempathy-gtk/empathy-individual-menu.c:849 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Аудиовызов" - -#: ../libempathy-gtk/empathy-contact-menu.c:394 -#: ../libempathy-gtk/empathy-individual-menu.c:894 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Видеовызов" - -#: ../libempathy-gtk/empathy-contact-menu.c:440 -#: ../libempathy-gtk/empathy-individual-menu.c:947 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "Предыдущие _беседы" - -#: ../libempathy-gtk/empathy-contact-menu.c:462 -#: ../libempathy-gtk/empathy-individual-menu.c:988 -msgid "Send File" -msgstr "Отправить файл" - -#: ../libempathy-gtk/empathy-contact-menu.c:485 -#: ../libempathy-gtk/empathy-individual-menu.c:1030 -msgid "Share My Desktop" -msgstr "Предоставить доступ к моему рабочему столу" - -#: ../libempathy-gtk/empathy-contact-menu.c:525 -#: ../libempathy-gtk/empathy-contact-widget.c:1886 -#: ../libempathy-gtk/empathy-individual-menu.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:1372 -msgid "Favorite" -msgstr "Избранный" - -#: ../libempathy-gtk/empathy-contact-menu.c:554 -#: ../libempathy-gtk/empathy-individual-menu.c:1093 -msgid "Infor_mation" -msgstr "Информ_ация" - -#: ../libempathy-gtk/empathy-contact-menu.c:600 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "_Правка" - -#: ../libempathy-gtk/empathy-contact-menu.c:654 -#: ../libempathy-gtk/empathy-individual-menu.c:1283 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Приглашение в комнату" - -#: ../libempathy-gtk/empathy-contact-menu.c:685 -#: ../libempathy-gtk/empathy-individual-menu.c:1329 -msgid "_Invite to Chat Room" -msgstr "_Пригласить в комнату" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "Decide _Later" +msgstr "Решить _позже" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Поиск собеседников" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Поиск:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "_Добавить собеседника" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Собеседники не найдены" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "Ваше сообщение, несколько слов о себе:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "Разрешите мне видеть, когда вы находитесь в сети. Спасибо!" -#: ../libempathy-gtk/empathy-contact-selector.c:129 -msgid "Select a contact" -msgstr "Выберите контакт" - -#: ../libempathy-gtk/empathy-contact-widget.c:336 -#: ../libempathy-gtk/empathy-individual-widget.c:153 -msgid "Full name:" -msgstr "Полное имя:" - -#: ../libempathy-gtk/empathy-contact-widget.c:337 -#: ../libempathy-gtk/empathy-individual-widget.c:154 -msgid "Phone number:" -msgstr "Номер телефона:" - -#: ../libempathy-gtk/empathy-contact-widget.c:338 -#: ../libempathy-gtk/empathy-individual-widget.c:155 -msgid "E-mail address:" -msgstr "Адрес эл. почты:" - -#: ../libempathy-gtk/empathy-contact-widget.c:339 -#: ../libempathy-gtk/empathy-individual-widget.c:156 -msgid "Website:" -msgstr "Веб-сайт:" - -#: ../libempathy-gtk/empathy-contact-widget.c:340 -#: ../libempathy-gtk/empathy-individual-widget.c:157 -msgid "Birthday:" -msgstr "День рождения:" - -#. Note to translators: this is the caption for a string of the form "5 -#. * minutes ago", and refers to the time since the contact last interacted -#. * with their IM client. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:346 -msgid "Last seen:" -msgstr "Последний раз в сети:" - -#: ../libempathy-gtk/empathy-contact-widget.c:348 -msgid "Connected from:" -msgstr "Подключено с:" - -#. FIXME: once Idle implements SimplePresence using this information, we can -#. * and should bin this. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:353 -msgid "Away message:" -msgstr "Сообщение об отсутствии:" - -#: ../libempathy-gtk/empathy-contact-widget.c:606 +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Каналы:" -#: ../libempathy-gtk/empathy-contact-widget.c:897 -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "Код ISO страны:" -#: ../libempathy-gtk/empathy-contact-widget.c:899 -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Страна:" -#: ../libempathy-gtk/empathy-contact-widget.c:901 -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Штат:" -#: ../libempathy-gtk/empathy-contact-widget.c:903 -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Город:" -#: ../libempathy-gtk/empathy-contact-widget.c:905 -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Область:" -#: ../libempathy-gtk/empathy-contact-widget.c:907 -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Почтовый индекс:" -#: ../libempathy-gtk/empathy-contact-widget.c:909 -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Улица:" -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Здание:" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Этаж:" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Комната:" -#: ../libempathy-gtk/empathy-contact-widget.c:917 -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Текст:" -#: ../libempathy-gtk/empathy-contact-widget.c:919 -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Описание:" -#: ../libempathy-gtk/empathy-contact-widget.c:921 -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:923 -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Точность:" -#: ../libempathy-gtk/empathy-contact-widget.c:925 -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Ошибка:" -#: ../libempathy-gtk/empathy-contact-widget.c:927 -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Ошибка по вертикали (в метрах):" -#: ../libempathy-gtk/empathy-contact-widget.c:929 -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Ошибка по горизонтали (в метрах):" -#: ../libempathy-gtk/empathy-contact-widget.c:931 -#: ../libempathy-gtk/empathy-individual-widget.c:503 +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Скорость:" -#: ../libempathy-gtk/empathy-contact-widget.c:933 -#: ../libempathy-gtk/empathy-individual-widget.c:505 +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Азимут:" -#: ../libempathy-gtk/empathy-contact-widget.c:935 -#: ../libempathy-gtk/empathy-individual-widget.c:507 +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Скорость набора высоты:" -#: ../libempathy-gtk/empathy-contact-widget.c:937 -#: ../libempathy-gtk/empathy-individual-widget.c:509 +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Последнее обновление:" -#: ../libempathy-gtk/empathy-contact-widget.c:939 -#: ../libempathy-gtk/empathy-individual-widget.c:511 +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Долгота:" -#: ../libempathy-gtk/empathy-contact-widget.c:941 -#: ../libempathy-gtk/empathy-individual-widget.c:513 +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Широта:" -#: ../libempathy-gtk/empathy-contact-widget.c:943 -#: ../libempathy-gtk/empathy-individual-widget.c:515 +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Высота:" -#: ../libempathy-gtk/empathy-contact-widget.c:996 -#: ../libempathy-gtk/empathy-contact-widget.c:1011 -#: ../libempathy-gtk/empathy-individual-widget.c:607 -#: ../libempathy-gtk/empathy-individual-widget.c:622 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:35 msgid "Location" msgstr "Местоположение" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:1013 -#: ../libempathy-gtk/empathy-individual-widget.c:624 +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:673 +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%e %b %Y в %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1147 -#: ../libempathy-gtk/empathy-individual-widget.c:915 +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Сохранить аватар" -#: ../libempathy-gtk/empathy-contact-widget.c:1203 -#: ../libempathy-gtk/empathy-individual-widget.c:973 +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Неудалось сохранить аватар" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -msgid "Location at (date)\t" -msgstr "Местоположение от (дата)\t" - -#. Alias -#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1308 -msgid "Alias:" -msgstr "Псевдоним:" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "Client Information" -msgstr "Информация о клиенте" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 -msgid "Client:" -msgstr "Программа-клиент:" +#: ../libempathy-gtk/empathy-contact-widget.c:1446 +#| msgid "Technical Details" +msgid "Personal Details" +msgstr "Информация о пользователе" +#: ../libempathy-gtk/empathy-contact-widget.c:1449 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" msgstr "Информация о собеседнике" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +msgid "Full name" +msgstr "Полное имя:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "Номер телефона:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "Адрес эл. почты:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +msgid "Website" +msgstr "Веб-сайт:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +msgid "Birthday" +msgstr "День рождения:" + +#. Note to translators: this is the caption for a string of the form "5 +#. * minutes ago", and refers to the time since the contact last interacted +#. * with their IM client. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +msgid "Last seen:" +msgstr "Последний раз в сети:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +msgid "Connected from:" +msgstr "Подключено с:" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +msgid "Away message:" +msgstr "Сообщение об отсутствии:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +msgid "work" +msgstr "рабочий" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +msgid "home" +msgstr "домашний" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +msgid "mobile" +msgstr "мобильный" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +msgid "voice" +msgstr "голос" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +msgid "preferred" +msgstr "предпочтительный" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "почтовый" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +msgid "parcel" +msgstr "посылка" + #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1517 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "Идентификатор:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +#. Alias +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 +msgid "Alias:" +msgstr "Псевдоним:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Location at (date)\t" +msgstr "Местоположение от (дата)\t" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 msgid "Information requested…" msgstr "Информация запрошена..." -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Client Information" +msgstr "Информация о клиенте" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "OS:" msgstr "Операционная система:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Version:" msgstr "Версия:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Client:" +msgstr "Программа-клиент:" + +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "Группы" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups." msgstr "Выберите группы, в которых должен появиться собеседник. Можно выбрать больше одной группы или не выбирать вообще." -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "_Добавить группу" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Выбрать" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1807 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1951 msgid "Group" msgstr "Группа" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Следующий собеседник будет заблокирован:" msgstr[1] "Следующие собеседники будут заблокированы:" msgstr[2] "Следующие собеседники будут заблокированы:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Следующего собеседника нельзя заблокировать:" msgstr[1] "Следующих собеседников нельзя заблокировать:" msgstr[2] "Следующих собеседников нельзя заблокировать:" -#. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 -msgid "Linked Contacts" -msgstr "Объединённые контакты" - -#: ../libempathy-gtk/empathy-individual-linker.c:370 -msgid "Select contacts to link" -msgstr "Выбрать контакты для связи" - -#: ../libempathy-gtk/empathy-individual-linker.c:444 -msgid "New contact preview" -msgstr "Предпросмотр нового собеседника" - -#: ../libempathy-gtk/empathy-individual-linker.c:488 -msgid "Contacts selected in the list on the left will be linked together." -msgstr "Контакты, выбранные в списке слева, будут объединены." +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Редактировать информацию о собеседнике" #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:145 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Выберите учётную запись для вызова" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 -#: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1299 -#: ../src/empathy-call-window.ui.h:2 +#: ../libempathy-gtk/empathy-individual-menu.c:348 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "Вызов" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Мобильный" -#: ../libempathy-gtk/empathy-individual-menu.c:380 -msgid "Work" -msgstr "Рабочий" +#: ../libempathy-gtk/empathy-individual-menu.c:415 +msgid "Work" +msgstr "Рабочий" + +#: ../libempathy-gtk/empathy-individual-menu.c:417 +msgid "HOME" +msgstr "ДОМАШНИЙ" + +#: ../libempathy-gtk/empathy-individual-menu.c:658 +msgid "_Block Contact" +msgstr "_Заблокировать собеседника" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1017 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:1 +msgid "_Chat" +msgstr "_Разговор" + +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:1052 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 +msgid "_SMS" +msgstr "_SMS:" + +#: ../libempathy-gtk/empathy-individual-menu.c:1085 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Аудиовызов" + +#: ../libempathy-gtk/empathy-individual-menu.c:1118 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Видеовызов" + +#: ../libempathy-gtk/empathy-individual-menu.c:1159 +#: ../src/empathy-roster-window-menubar.ui.h:4 +msgid "_Previous Conversations" +msgstr "Предыдущие _беседы" + +#: ../libempathy-gtk/empathy-individual-menu.c:1188 +msgid "Send File" +msgstr "Отправить файл" + +#: ../libempathy-gtk/empathy-individual-menu.c:1218 +msgid "Share My Desktop" +msgstr "Предоставить доступ к моему рабочему столу" + +#: ../libempathy-gtk/empathy-individual-menu.c:1244 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Избранный" + +#: ../libempathy-gtk/empathy-individual-menu.c:1263 +#| msgid "telepathy-salut not installed" +msgid "gnome-contacts not installed" +msgstr "gnome-contacts не установлен" -#: ../libempathy-gtk/empathy-individual-menu.c:382 -msgid "HOME" -msgstr "ДОМАШНИЙ" +#: ../libempathy-gtk/empathy-individual-menu.c:1266 +msgid "Please install gnome-contacts to access contacts details." +msgstr "Чтобы получить доступ к сведениям о пользователях, установите gnome-contacts" -#. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:804 -#: ../libempathy-gtk/empathy-new-message-dialog.c:215 -msgid "_SMS" -msgstr "_SMS:" +#: ../libempathy-gtk/empathy-individual-menu.c:1380 +msgid "Infor_mation" +msgstr "Информ_ация" -#: ../libempathy-gtk/empathy-individual-menu.c:1141 +#: ../libempathy-gtk/empathy-individual-menu.c:1429 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Правка" -#. Translators: this is a verb meaning "to connect two contacts together -#. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1167 -msgctxt "Link individual (contextual menu)" -msgid "_Link Contacts…" -msgstr "_Объединить контакты…" +#: ../libempathy-gtk/empathy-individual-menu.c:1546 +#: ../src/empathy-chat-window.c:1175 +msgid "Inviting you to this room" +msgstr "Приглашение в комнату" -#: ../libempathy-gtk/empathy-individual-view.c:2341 +#: ../libempathy-gtk/empathy-individual-menu.c:1592 +msgid "_Invite to Chat Room" +msgstr "_Пригласить в комнату" + +#: ../libempathy-gtk/empathy-individual-menu.c:1788 +#: ../src/empathy-roster-window-menubar.ui.h:5 +msgid "_Add Contact…" +msgstr "_Добавить собеседника…" + +#: ../libempathy-gtk/empathy-individual-view.c:2306 msgid "Delete and _Block" msgstr "Удалить и _заблокировать" -#: ../libempathy-gtk/empathy-individual-view.c:2510 +#: ../libempathy-gtk/empathy-individual-view.c:2341 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Вы хотите удалить группу «%s»?" + +#: ../libempathy-gtk/empathy-individual-view.c:2344 +msgid "Removing group" +msgstr "Удаление группы" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2399 +#: ../libempathy-gtk/empathy-individual-view.c:2603 +msgid "_Remove" +msgstr "_Удалить" + +#: ../libempathy-gtk/empathy-individual-view.c:2476 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Действительно хотите удалить собеседника «%s»?" + +#: ../libempathy-gtk/empathy-individual-view.c:2485 #, c-format msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact." msgstr "Действительно удалить связанный контакт «%s»? Это приведёт к удалению всех контактов, которые являются частью этого связанного контакта." -#: ../libempathy-gtk/empathy-individual-widget.c:1656 +#: ../libempathy-gtk/empathy-individual-view.c:2497 +msgid "Removing contact" +msgstr "Удаление собеседника" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2204,23 +2193,23 @@ msgstr[2] "Связанные контакты, содержащие %u конт msgid "Location at (date)" msgstr "Местоположение от (дата)" -#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 msgid "Online from a phone or mobile device" msgstr "В сети с помощью телефона или мобильного устройства" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "Новая сеть" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "Выберите сеть IRC" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "_Сбросить список сетей" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Выбрать" @@ -2233,253 +2222,254 @@ msgstr "новый сервер" msgid "SSL" msgstr "Шифрование SSL" -#. Translators: this is the title of the linking dialogue (reached by -#. * right-clicking on a contact and selecting "Link…"). "Link" in this title -#. * is a verb. -#: ../libempathy-gtk/empathy-linking-dialog.c:115 -msgid "Link Contacts" -msgstr "Связь с собеседниками" - -#: ../libempathy-gtk/empathy-linking-dialog.c:120 -msgctxt "Unlink individual (button)" -msgid "_Unlink…" -msgstr "_Разъединить…" - -#: ../libempathy-gtk/empathy-linking-dialog.c:121 -msgid "Completely split the displayed linked contacts into the separate contacts." -msgstr "Полностью разъединить связанные контакты на отдельные контакты." - -#. Add button -#. Translators: this is an action button in the linking dialogue. "Link" is -#. * used here as a verb meaning "to connect two contacts to form a -#. * meta-contact". -#: ../libempathy-gtk/empathy-linking-dialog.c:136 -msgid "_Link" -msgstr "_Связь" - -#: ../libempathy-gtk/empathy-linking-dialog.c:183 -#, c-format -msgid "Unlink linked contacts '%s'?" -msgstr "Разъединить контакты «%s»?" - -#: ../libempathy-gtk/empathy-linking-dialog.c:186 -msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts." -msgstr "Действительно разъединить эти связанные контакты? Это полностью разделит связанные контакты на отдельные контакты." - -#: ../libempathy-gtk/empathy-linking-dialog.c:190 -msgctxt "Unlink individual (button)" -msgid "_Unlink" -msgstr "_Разъединить" - -#: ../libempathy-gtk/empathy-log-window.c:634 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "История" -#: ../libempathy-gtk/empathy-log-window.c:689 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Показать" -#: ../libempathy-gtk/empathy-log-window.c:711 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Поиск" -#: ../libempathy-gtk/empathy-log-window.c:1159 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Разговор в %s" -#: ../libempathy-gtk/empathy-log-window.c:1161 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Разговор с %s" -#: ../libempathy-gtk/empathy-log-window.c:1211 -#: ../libempathy-gtk/empathy-log-window.c:1358 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e %B %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1300 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1306 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format -#| msgid "%d second ago" -#| msgid_plural "%d seconds ago" msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s секунда" msgstr[1] "%s секунды" msgstr[2] "%s секунд" -#: ../libempathy-gtk/empathy-log-window.c:1389 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format -#| msgid "%d minute ago" -#| msgid_plural "%d minutes ago" msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s минута" msgstr[1] "%s минуты" msgstr[2] "%s минут" -#: ../libempathy-gtk/empathy-log-window.c:1397 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Вызов продолжался %s, закончился %s" -#: ../libempathy-gtk/empathy-log-window.c:1729 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Сегодня" -#: ../libempathy-gtk/empathy-log-window.c:1733 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Вчера" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1748 -#| msgctxt "" -#| "A date such as '23 May 2010', %e is the day, %B the month and %Y the year" -#| msgid "%e %B %Y" +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e %B %Y" #: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3425 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Всегда" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2353 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Любой" -#: ../libempathy-gtk/empathy-log-window.c:2666 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Кто" -#: ../libempathy-gtk/empathy-log-window.c:2870 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Когда" -#: ../libempathy-gtk/empathy-log-window.c:2986 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Всё" -#: ../libempathy-gtk/empathy-log-window.c:2988 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Текстовые чаты" -#: ../libempathy-gtk/empathy-log-window.c:2990 -#: ../src/empathy-preferences.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "Вызовы" -#: ../libempathy-gtk/empathy-log-window.c:2995 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Входящие вызовы" -#: ../libempathy-gtk/empathy-log-window.c:2996 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Исходящие вызовы" -#: ../libempathy-gtk/empathy-log-window.c:2997 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Пропущенные вызовы" -#: ../libempathy-gtk/empathy-log-window.c:3019 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Что" -#: ../libempathy-gtk/empathy-log-window.c:3728 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Действительно хотите удалить все журналы предыдущих бесед?" -#: ../libempathy-gtk/empathy-log-window.c:3732 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Очистить всё" -#: ../libempathy-gtk/empathy-log-window.c:3739 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Удалить из:" #: ../libempathy-gtk/empathy-log-window.ui.h:1 -msgid "Loading..." -msgstr "Загрузка…" +msgid "_File" +msgstr "_Файл" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 -#: ../src/empathy-chat-window.ui.h:3 -msgid "Chat" -msgstr "Разговор" +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:2 +#: ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:12 +msgid "_Edit" +msgstr "_Правка" -#: ../libempathy-gtk/empathy-log-window.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Delete All History..." msgstr "Удалить всю историю…" -#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "Profile" msgstr "Профиль" -#: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:20 -msgid "Video" -msgstr "Видео" +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:19 +msgid "Chat" +msgstr "Разговор" #: ../libempathy-gtk/empathy-log-window.ui.h:7 -#: ../src/empathy-call-window.ui.h:28 -#: ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 -msgid "_Edit" -msgstr "_Правка" +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "Video" +msgstr "Видео" #: ../libempathy-gtk/empathy-log-window.ui.h:8 -msgid "_File" -msgstr "_Файл" - -#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "страница 2" -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 -msgid "Contact ID:" -msgstr "Идентификатор собеседника:" +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "Loading..." +msgstr "Загрузка…" -#. add chat button -#: ../libempathy-gtk/empathy-new-message-dialog.c:225 -msgid "C_hat" -msgstr "_Беседа" +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 +msgid "The contact is offline" +msgstr "Указанный собеседник не находится в сети" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 +msgid "The specified contact is either invalid or unknown" +msgstr "Собеседник указан неверно или он неизвестен" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 +msgid "The contact does not support this kind of conversation" +msgstr "В этой беседе не поддерживается данный вид связи" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 +msgid "The requested functionality is not implemented for this protocol" +msgstr "Запрошенная функция не реализована для данного протокола" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 +msgid "Could not start a conversation with the given contact" +msgstr "Не удалось начать разговор с данным собеседником" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 +msgid "You are banned from this channel" +msgstr "Вам запретили доступ к этому каналу" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 +msgid "This channel is full" +msgstr "Этот канал переполнен" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 +msgid "You must be invited to join this channel" +msgstr "Чтобы присоединиться к данному каналу, необходимо приглашение" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 +msgid "Can't proceed while disconnected" +msgstr "Продолжение невозможно, так как отсутствует подключение" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 +msgid "Permission denied" +msgstr "Отказано в доступе" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 +msgid "There was an error starting the conversation" +msgstr "Во время вызова произошла ошибка" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 +msgid "Enter a contact identifier or phone number:" +msgstr "Введите идентификатор собеседника или номер телефона:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:244 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Новая беседа" -#. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:204 -msgid "Send _Video" -msgstr "_Передавать видео" +#. add video button +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +msgid "_Video Call" +msgstr "_Видеовызов" -#. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:215 -msgid "C_all" -msgstr "_Вызов" +#. add audio button +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 +msgid "_Audio Call" +msgstr "_Аудиовызов" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Новый вызов" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Сбой при прохождении проверки подлинности учётной записи %s" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2516,12 +2506,8 @@ msgstr "Щёлкните, чтобы сделать этот статус изб msgid "Set status" msgstr "Установить статус" -#: ../libempathy-gtk/empathy-presence-chooser.c:943 -msgid "Set your presence and current status" -msgstr "Установить присутствие и текущее состояние" - #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1131 +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 msgid "Custom messages…" msgstr "Другие сообщения…" @@ -2539,20 +2525,20 @@ msgid "Find:" msgstr "Найти:" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -msgid "Mat_ch case" -msgstr "У_читывать регистр" +msgid "_Previous" +msgstr "_Назад" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Phrase not found" -msgstr "Фраза не найдена" - -#: ../libempathy-gtk/empathy-search-bar.ui.h:4 msgid "_Next" msgstr "_Далее" +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "Mat_ch case" +msgstr "У_читывать регистр" + #: ../libempathy-gtk/empathy-search-bar.ui.h:5 -msgid "_Previous" -msgstr "_Назад" +msgid "Phrase not found" +msgstr "Фраза не найдена" #: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" @@ -2598,12 +2584,12 @@ msgstr "Вызов завершён" msgid "Edit Custom Messages" msgstr "Изменить настраиваемые сообщения" -#: ../libempathy-gtk/empathy-theme-adium.c:1036 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "Сообщение изменено %s " -#: ../libempathy-gtk/empathy-theme-adium.c:1726 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "Обычная" @@ -2678,39 +2664,44 @@ msgid "Certificate hostname: %s" msgstr "Имя узла сертификата: %s" #: ../libempathy-gtk/empathy-tls-dialog.c:281 -msgid "Continue" -msgstr "Продолжить" +#| msgid "Continue" +msgid "C_ontinue" +msgstr "_Продолжить" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "Недоверенное соединение" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Данное соединение не является доверенным. Всё равно продолжить?" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "Запомнить выбор для последующих соединений" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "Подробности о сертификате" -#: ../libempathy-gtk/empathy-ui-utils.c:1735 +#: ../libempathy-gtk/empathy-ui-utils.c:1741 msgid "Unable to open URI" msgstr "Невозможно открыть URL" -#: ../libempathy-gtk/empathy-ui-utils.c:1831 +#: ../libempathy-gtk/empathy-ui-utils.c:1859 msgid "Select a file" msgstr "Выберите файл" -#: ../libempathy-gtk/empathy-ui-utils.c:1903 +#: ../libempathy-gtk/empathy-ui-utils.c:1934 msgid "Insufficient free space to save file" msgstr "Недостаточно свободного места для сохранения файла" -#: ../libempathy-gtk/empathy-ui-utils.c:1911 +#: ../libempathy-gtk/empathy-ui-utils.c:1942 #, c-format msgid "%s of free space are required to save this file, but only %s is available. Please choose another location." msgstr "Для сохранения этого файла требуется %s свободного места, но доступно только %s. Выберите другое местоположение." -#: ../libempathy-gtk/empathy-ui-utils.c:1955 +#: ../libempathy-gtk/empathy-ui-utils.c:1986 #, c-format msgid "Incoming file from %s" msgstr "Входящий файл от %s" @@ -2882,39 +2873,31 @@ msgstr "Западный" msgid "Vietnamese" msgstr "Вьетнамский" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 -msgid "The selected contact cannot receive files." -msgstr "Выбранный собеседник не может получать файлы." - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 -msgid "The selected contact is offline." -msgstr "Выбранный собеседник не в сети." - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Сообщение об ошибке отсутствует" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Мгновенное сообщение (Empathy)" -#: ../src/empathy.c:431 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Не соединяться при запуске" -#: ../src/empathy.c:435 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Не показывать список собеседников и диалоговые окна при запуске" -#: ../src/empathy.c:450 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr " — клиент обмена мгновенными сообщениями Empathy" -#: ../src/empathy.c:637 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Ошибка связи с диспетчером учётных записей" -#: ../src/empathy.c:639 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n" @@ -2937,11 +2920,11 @@ msgstr "Программа Empathy распространяется в расч 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 "Вы должны были получить копию GNU General Public License вместе с программой Empathy. Если этого не произошло, напишите в Фонд Свободного Программного Обеспечения: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Приложение быстрого обмена сообщениями для GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Grigory Bakunov\n" @@ -2975,168 +2958,177 @@ msgid "You can either go back and try to enter your accounts' details again or q msgstr "Вы можете вернуться назад и попытаться ввести информацию об учётной записи ещё раз, или закрыть этот мастер и добавить учётные записи позже из меню «Правка»." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1276 msgid "An error occurred" msgstr "Произошла ошибка" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Какой у вас тип учётной записи?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "У вас есть ещё какие-нибудь учётные записи для настройки?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Введите информацию о вашей учётной записи" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Какой тип учётной записи вы хотите создать?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Хотите создать другие учётные записи?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Введите информацию о новой учётной записи" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls." msgstr "С помощью Empathy можно общаться с людьми, находящимися поблизости, а также с друзьями и коллегами, использующими Google Talk, AIM, Windows Live и многие другие программы. При наличии микрофона и веб-камеры можно совершать аудио- и видеовызовы." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "У вас есть учётная запись, которую вы использовали в другой программе?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Да, импортировать информацию о моей учётной записи" -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Да, я сейчас введу информацию об учётной записи" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Нет, я хочу новую учётную запись" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Нет, я только хочу найти поблизости людей в сети" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Выберите учётные записи для импортирования:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Да" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Нет, на данный момент это всё" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog" msgstr "Empathy может автоматически найти людей, подключённых к той же сети, что и вы. Если вы хотите использовать эту возможность, отметьте, что информация, представленная ниже является корректной. Вы можете изменить эту информацию позже или отключить эту возможность, используя диалоговое окно «Учётные записи»." -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 msgid "Edit->Accounts" msgstr "Правка->Учётные записи" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "_Я не хочу сейчас включать эту возможность" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1148 msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog" msgstr "Вы не можете общаться с людьми, подключёнными к вашей локальной сети, т. к. telepathy-salut не установлен. Если вы хотите включить эту возможность, установите пакет telepathy-salut и создайте учётную запись «Люди поблизости» в диалоговом окне «Учётные записи»" -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1154 msgid "telepathy-salut not installed" msgstr "telepathy-salut не установлен" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1200 msgid "Messaging and VoIP Accounts Assistant" msgstr "Мастер учётных записей обмена сообщениями и VoIP" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1234 msgid "Welcome to Empathy" msgstr "Добро пожаловать в Empathy" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1243 msgid "Import your existing accounts" msgstr "Импортировать существующие учётные записи" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1261 msgid "Please enter personal details" msgstr "Введите персональную информацию" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "В учётной записи %s имеются несохранённые изменения." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Ваша новая учётная запись ещё не была сохранена." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:754 -#: ../src/empathy-call-window.c:1175 +#: ../src/empathy-accounts-dialog.c:344 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1332 msgid "Connecting…" msgstr "Соединение…" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:385 #, c-format msgid "Offline — %s" msgstr "Не в сети — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:397 #, c-format msgid "Disconnected — %s" msgstr "Отсоединён — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:408 msgid "Offline — No Network Connection" msgstr "Не в сети — подключение к сети отсутствует" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:415 msgid "Unknown Status" msgstr "Неизвестный статус" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:427 msgid "Offline — Account Disabled" msgstr "Не в сети — учётная запись отключена" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Вы собираетесь создать новую учётную запись, это приведёт\n" -"к отмене сделанных изменений. Хотите продолжить?" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "Изменить параметры соединения" + +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "Сбой при получении персональных данных с сервера." + +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "Выйти в онлайн, чтобы изменить персональные данные" -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "_Изменить параметры соединения…" + +#: ../src/empathy-accounts-dialog.c:1289 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Хотите удалить %s со своего компьютера?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1293 msgid "This will not remove your account on the server." msgstr "Это не приведёт к удалению вашей учётной записи с сервера." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1529 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3145,15 +3137,15 @@ msgstr "" "к отмене сделанных изменений. Хотите продолжить?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1705 msgid "_Enable" msgstr "_Включить" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1706 msgid "_Disable" msgstr "_Отключить" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2176 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3165,31 +3157,31 @@ msgstr "" msgid "Add…" msgstr "Добавить…" -#: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Loading account information" -msgstr "Загрузка информации об учётной записи" - #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "No protocol installed" -msgstr "Нет установленных протоколов" +msgid "_Import…" +msgstr "_Импорт..." #: ../src/empathy-accounts-dialog.ui.h:4 msgid "Protocol:" msgstr "Протокол:" -#: ../src/empathy-accounts-dialog.ui.h:6 +#: ../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 "Чтобы добавить новую учётную запись установите поддержку каждого необходимого протокола." +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "Нет установленных протоколов" + #: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Import…" -msgstr "_Импорт..." +msgid "Loading account information" +msgstr "Загрузка информации об учётной записи" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr " — клиент аутентификации Empathy" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Клиент аутентификации Empathy" @@ -3198,315 +3190,340 @@ msgid "People nearby" msgstr "Люди поблизости" #: ../src/empathy-av.c:118 -#: ../src/empathy-call.c:192 +#: ../src/empathy-call.c:203 msgid "- Empathy Audio/Video Client" msgstr " — клиент Empathy для аудио и видео" #: ../src/empathy-av.c:134 -#: ../src/empathy-call.c:217 +#: ../src/empathy-call.c:228 msgid "Empathy Audio/Video Client" msgstr "Клиент Empathy для аудио и видео" -#: ../src/empathy-streamed-media-window.c:431 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Контраст" -#: ../src/empathy-streamed-media-window.c:434 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Яркость" -#: ../src/empathy-streamed-media-window.c:437 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Гамма" -#: ../src/empathy-streamed-media-window.c:542 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Громкость" -#: ../src/empathy-streamed-media-window.c:1110 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "_Боковая панель" -#: ../src/empathy-streamed-media-window.c:1130 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Звуковой вход" -#: ../src/empathy-streamed-media-window.c:1134 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Видеовход" -#: ../src/empathy-streamed-media-window.c:1140 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Панель набора" -#: ../src/empathy-streamed-media-window.c:1151 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Подробности" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1220 -#: ../src/empathy-call-window.c:1782 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1934 #, c-format msgid "Call with %s" msgstr "Разговор с %s" -#: ../src/empathy-streamed-media-window.c:1453 -#: ../src/empathy-call-window.c:2026 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2178 msgid "The IP address as seen by the machine" msgstr "IP-адрес, определённый хостом" -#: ../src/empathy-streamed-media-window.c:1455 -#: ../src/empathy-call-window.c:2028 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2180 msgid "The IP address as seen by a server on the Internet" msgstr "IP-адрес, определённый сервером в Интернете" -#: ../src/empathy-streamed-media-window.c:1457 -#: ../src/empathy-call-window.c:2030 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2182 msgid "The IP address of the peer as seen by the other side" msgstr "IP-адрес точки, определённый с другой стороны" -#: ../src/empathy-streamed-media-window.c:1459 -#: ../src/empathy-call-window.c:2032 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2184 msgid "The IP address of a relay server" msgstr "IP-адрес ретранслирующего сервера" -#: ../src/empathy-streamed-media-window.c:1461 -#: ../src/empathy-call-window.c:2034 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2186 msgid "The IP address of the multicast group" msgstr "Широковещательный IP-адрес группы" -#: ../src/empathy-streamed-media-window.c:1843 -msgctxt "encoding video codec" -msgid "Unknown" -msgstr "Неизвестно" - -#: ../src/empathy-streamed-media-window.c:1846 -msgctxt "encoding audio codec" -msgid "Unknown" -msgstr "Неизвестно" - -#: ../src/empathy-streamed-media-window.c:1849 -msgctxt "decoding video codec" -msgid "Unknown" -msgstr "Неизвестно" - -#: ../src/empathy-streamed-media-window.c:1852 -msgctxt "decoding audio codec" +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 +msgctxt "codec" msgid "Unknown" msgstr "Неизвестно" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2144 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "Соединён — %d:%02dm" -#: ../src/empathy-streamed-media-window.c:2205 -#: ../src/empathy-call-window.c:2798 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3040 msgid "Technical Details" msgstr "Информация о собеседнике" -#: ../src/empathy-streamed-media-window.c:2243 -#: ../src/empathy-call-window.c:2836 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3079 #, c-format msgid "%s's software does not understand any of the audio formats supported by your computer" msgstr "Программное обеспечение %s не понимает аудиоформаты, поддерживаемые вашим компьютером" -#: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:2841 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3084 #, c-format msgid "%s's software does not understand any of the video formats supported by your computer" msgstr "Программное обеспечение %s не понимает видеоформаты, поддерживаемые вашим компьютером" -#: ../src/empathy-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:2847 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections." msgstr "Не удалось установить соединение с %s. Один из вас может находиться в сети, которая не поддерживает прямые подключения." -#: ../src/empathy-streamed-media-window.c:2260 -#: ../src/empathy-call-window.c:2853 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3096 msgid "There was a failure on the network" msgstr "Сбой сети" -#: ../src/empathy-streamed-media-window.c:2264 -#: ../src/empathy-call-window.c:2857 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3100 msgid "The audio formats necessary for this call are not installed on your computer" msgstr "Аудиоформаты, необходимые для этого вызова, не установлены на вашем компьютере" -#: ../src/empathy-streamed-media-window.c:2267 -#: ../src/empathy-call-window.c:2860 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3103 msgid "The video formats necessary for this call are not installed on your computer" msgstr "Видеоформаты, необходимые для этого вызова, не установлены на вашем компьютере" -#: ../src/empathy-streamed-media-window.c:2277 -#: ../src/empathy-call-window.c:2872 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3115 #, c-format msgid "Something unexpected happened in a Telepathy component. Please report this bug and attach logs gathered from the 'Debug' window in the Help menu." msgstr "Что-то неожиданное случилось с компонентом Telepathy. Сообщите об этой ошибке и прикрепите журналы, собранные из окна отладки в меню «Справка»." -#: ../src/empathy-streamed-media-window.c:2285 -#: ../src/empathy-call-window.c:2881 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3124 msgid "There was a failure in the call engine" msgstr "Сбой в движке вызова" -#: ../src/empathy-streamed-media-window.c:2288 -#: ../src/empathy-call-window.c:2884 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3127 msgid "The end of the stream was reached" msgstr "Достигнут конец потока" -#: ../src/empathy-streamed-media-window.c:2328 -#: ../src/empathy-call-window.c:2924 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3167 msgid "Can't establish audio stream" msgstr "Не удалось установить аудиопоток" -#: ../src/empathy-streamed-media-window.c:2338 -#: ../src/empathy-call-window.c:2934 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3177 msgid "Can't establish video stream" msgstr "Не удалось установить видеопоток" #: ../src/empathy-call-window.ui.h:1 -#: ../src/empathy-preferences.ui.h:2 #: ../src/empathy-streamed-media-window.ui.h:1 -msgid "Audio" -msgstr "Аудио" +msgid "_Call" +msgstr "_Вызов" #: ../src/empathy-call-window.ui.h:3 -#: ../src/empathy-streamed-media-window.ui.h:5 -msgid "Decoding Codec:" -msgstr "Декодер:" +msgid "_Microphone" +msgstr "_Микрофон" #: ../src/empathy-call-window.ui.h:4 -msgid "Disable camera" -msgstr "Отключить камеру" +msgid "_Camera" +msgstr "_Камера" #: ../src/empathy-call-window.ui.h:5 -msgid "Display the dialpad" -msgstr "Показывать панель набора" +msgid "_Settings" +msgstr "_Параметры" #: ../src/empathy-call-window.ui.h:6 -#: ../src/empathy-streamed-media-window.ui.h:9 -msgid "Encoding Codec:" -msgstr "Кодер:" +#: ../src/empathy-roster-window-menubar.ui.h:17 +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "_View" +msgstr "_Вид" #: ../src/empathy-call-window.ui.h:7 -#: ../src/empathy-streamed-media-window.ui.h:10 -msgid "Hang up" -msgstr "Сбросить" +#: ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:27 +msgid "_Help" +msgstr "_Справка" #: ../src/empathy-call-window.ui.h:8 -#: ../src/empathy-streamed-media-window.ui.h:11 -msgid "Hang up current call" -msgstr "Завершить текущий вызов" +#: ../src/empathy-chat-window.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:28 +msgid "_Contents" +msgstr "_Содержание" #: ../src/empathy-call-window.ui.h:9 -#: ../src/empathy-streamed-media-window.ui.h:12 -msgid "Local Candidate:" -msgstr "Локальный кандидат:" +#: ../src/empathy-roster-window-menubar.ui.h:29 +msgid "_Debug" +msgstr "О_тладка" #: ../src/empathy-call-window.ui.h:10 -msgid "Maximise me" -msgstr "Максимальный размер" +msgid "Swap camera" +msgstr "Сменить камеру" #: ../src/empathy-call-window.ui.h:11 msgid "Minimise me" msgstr "Минимальный размер" #: ../src/empathy-call-window.ui.h:12 -#: ../src/empathy-streamed-media-window.ui.h:15 -msgid "Remote Candidate:" -msgstr "Удалённый кандидат:" +msgid "Maximise me" +msgstr "Максимальный размер" #: ../src/empathy-call-window.ui.h:13 -#: ../src/empathy-streamed-media-window.ui.h:16 -msgid "Send Audio" -msgstr "Передавать звук" +msgid "Disable camera" +msgstr "Отключить камеру" #: ../src/empathy-call-window.ui.h:14 -msgid "Send Video" -msgstr "Передавать видео" +#: ../src/empathy-streamed-media-window.ui.h:2 +msgid "Hang up" +msgstr "Сбросить" #: ../src/empathy-call-window.ui.h:15 -msgid "Show dialpad" -msgstr "Показывать панель набора" +#: ../src/empathy-streamed-media-window.ui.h:9 +msgid "Hang up current call" +msgstr "Завершить текущий вызов" #: ../src/empathy-call-window.ui.h:16 +msgid "Video call" +msgstr "Видеовызов" + +#: ../src/empathy-call-window.ui.h:17 msgid "Start a video call" msgstr "Начать видеовызов" -#: ../src/empathy-call-window.ui.h:17 +#: ../src/empathy-call-window.ui.h:19 msgid "Start an audio call" msgstr "Начать аудиовызов" -#: ../src/empathy-call-window.ui.h:18 -msgid "Swap camera" -msgstr "Сменить камеру" - -#: ../src/empathy-call-window.ui.h:19 -#: ../src/empathy-streamed-media-window.ui.h:17 -msgid "Toggle audio transmission" -msgstr "Включить или выключить передачу звука" - #: ../src/empathy-call-window.ui.h:20 -msgid "Toggle video transmission" -msgstr "Включить или выключить передачу видео" +msgid "Show dialpad" +msgstr "Показывать панель набора" + +#: ../src/empathy-call-window.ui.h:21 +msgid "Display the dialpad" +msgstr "Показывать панель набора" -#: ../src/empathy-call-window.ui.h:21 -#: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2431 -#: ../src/empathy-call-window.c:2432 -#: ../src/empathy-call-window.c:2433 -#: ../src/empathy-call-window.c:2434 -msgid "Unknown" -msgstr "Неизвестно" +#: ../src/empathy-call-window.ui.h:22 +msgid "Send Video" +msgstr "Передавать видео" #: ../src/empathy-call-window.ui.h:23 -msgid "Video call" -msgstr "Видеовызов" +msgid "Toggle video transmission" +msgstr "Включить или выключить передачу видео" #: ../src/empathy-call-window.ui.h:24 -#: ../src/empathy-streamed-media-window.ui.h:24 -msgid "_Call" -msgstr "_Вызов" +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Send Audio" +msgstr "Передавать звук" #: ../src/empathy-call-window.ui.h:25 -msgid "_Camera" -msgstr "_Камера" - -#: ../src/empathy-call-window.ui.h:26 -#: ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 -msgid "_Contents" -msgstr "_Содержание" +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Toggle audio transmission" +msgstr "Включить или выключить передачу звука" #: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 -msgid "_Debug" -msgstr "О_тладка" +#: ../src/empathy-streamed-media-window.ui.h:20 +msgid "Encoding Codec:" +msgstr "Кодер:" + +#: ../src/empathy-call-window.ui.h:28 +#: ../src/empathy-streamed-media-window.ui.h:21 +#: ../src/empathy-call-window.c:2587 +#: ../src/empathy-call-window.c:2588 +#: ../src/empathy-call-window.c:2589 +#: ../src/empathy-call-window.c:2590 +msgid "Unknown" +msgstr "Неизвестно" #: ../src/empathy-call-window.ui.h:29 -#: ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 -msgid "_Help" -msgstr "_Справка" +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Decoding Codec:" +msgstr "Декодер:" #: ../src/empathy-call-window.ui.h:30 -msgid "_Microphone" -msgstr "_Микрофон" +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Remote Candidate:" +msgstr "Удалённый кандидат:" #: ../src/empathy-call-window.ui.h:31 -msgid "_Settings" -msgstr "_Параметры" +#: ../src/empathy-streamed-media-window.ui.h:24 +msgid "Local Candidate:" +msgstr "Локальный кандидат:" #: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 +#: ../src/empathy-preferences.ui.h:24 #: ../src/empathy-streamed-media-window.ui.h:25 -msgid "_View" -msgstr "_Вид" +msgid "Audio" +msgstr "Аудио" + +#: ../src/empathy-chat-window.c:285 +#| msgid "Hide the main window." +msgid "Close this window?" +msgstr "Закрыть это окно?" + +#: ../src/empathy-chat-window.c:290 +#, c-format +msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it." +msgstr "Если вы закроете окно, то выйдете из комнаты %s. Вы не будете получать сообщения, пока не войдёте в комнату. " + +#: ../src/empathy-chat-window.c:301 +#, 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] "Если вы закроете окно, то выйдете из %u комнаты. Вы не будете получать сообщения, пока не войдёте в комнату. " +msgstr[1] "Если вы закроете окно, то выйдете из %u комнат. Вы не будете получать сообщения, пока не войдёте в комнаты." +msgstr[2] "Если вы закроете окно, то выйдете из %u комнат. Вы не будете получать сообщения, пока не войдёте в комнаты." + +#: ../src/empathy-chat-window.c:310 +#, c-format +#| msgid "Level " +msgid "Leave %s?" +msgstr "Уйти из %s?" + +#: ../src/empathy-chat-window.c:311 +msgid "You will not receive any further messages from this chat room until you rejoin it." +msgstr "Вы не будете получать сообщения из этой комнаты, пока повторно не войдёте в комнату." + +#: ../src/empathy-chat-window.c:330 +msgid "Close window" +msgstr "Закрыть окно" + +#: ../src/empathy-chat-window.c:330 +#| msgid "Level " +msgid "Leave room" +msgstr "Уйти из комнаты" -#: ../src/empathy-chat-window.c:481 -#: ../src/empathy-chat-window.c:501 +#: ../src/empathy-chat-window.c:636 +#: ../src/empathy-chat-window.c:656 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -3514,7 +3531,7 @@ msgstr[0] "%s (%d непрочитанное)" msgstr[1] "%s (%d непрочитанных)" msgstr[2] "%s (%d непрочитанных)" -#: ../src/empathy-chat-window.c:493 +#: ../src/empathy-chat-window.c:648 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -3522,7 +3539,7 @@ msgstr[0] "%s (и %u другой)" msgstr[1] "%s (и %u других)" msgstr[2] "%s (и %u других)" -#: ../src/empathy-chat-window.c:509 +#: ../src/empathy-chat-window.c:664 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -3530,7 +3547,7 @@ msgstr[0] "%s (%d непрочитанное от других)" msgstr[1] "%s (%d непрочитанных от других)" msgstr[2] "%s (%d непрочитанных от других)" -#: ../src/empathy-chat-window.c:518 +#: ../src/empathy-chat-window.c:673 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -3538,11 +3555,11 @@ msgstr[0] "%s (%d непрочитанное ото всех)" msgstr[1] "%s (%d непрочитанных ото всех)" msgstr[2] "%s (%d непрочитанных ото всех)" -#: ../src/empathy-chat-window.c:733 +#: ../src/empathy-chat-window.c:888 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:743 +#: ../src/empathy-chat-window.c:898 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3550,70 +3567,70 @@ msgstr[0] "Отправка %d сообщения" msgstr[1] "Отправка %d сообщений" msgstr[2] "Отправка %d сообщений" -#: ../src/empathy-chat-window.c:765 +#: ../src/empathy-chat-window.c:920 msgid "Typing a message." msgstr "Набирает сообщение." #: ../src/empathy-chat-window.ui.h:1 -msgid "C_lear" -msgstr "О_чистить" +msgid "_Conversation" +msgstr "_Беседа" #: ../src/empathy-chat-window.ui.h:2 -msgid "C_ontact" -msgstr "Со_беседник" +msgid "C_lear" +msgstr "О_чистить" -#: ../src/empathy-chat-window.ui.h:4 +#: ../src/empathy-chat-window.ui.h:3 msgid "Insert _Smiley" msgstr "Вставить _улыбку" +#: ../src/empathy-chat-window.ui.h:4 +msgid "_Favorite Chat Room" +msgstr "_Избранная комната" + #: ../src/empathy-chat-window.ui.h:5 -msgid "Invite _Participant…" -msgstr "Пригласить _участника…" +msgid "Notify for All Messages" +msgstr "Уведомлять обо всех сообщениях" #: ../src/empathy-chat-window.ui.h:6 -msgid "Move Tab _Left" -msgstr "Передвинуть вкладку в_лево" +#: ../src/empathy-status-icon.ui.h:1 +msgid "_Show Contact List" +msgstr "_Показывать список собеседников" #: ../src/empathy-chat-window.ui.h:7 -msgid "Move Tab _Right" -msgstr "Передвинуть вкладку в_право" +msgid "Invite _Participant…" +msgstr "Пригласить _участника…" #: ../src/empathy-chat-window.ui.h:8 -msgid "Notify for All Messages" -msgstr "Уведомлять обо всех сообщениях" +msgid "C_ontact" +msgstr "Со_беседник" #: ../src/empathy-chat-window.ui.h:10 -msgid "_Conversation" -msgstr "_Беседа" +msgid "_Tabs" +msgstr "В_кладки" #: ../src/empathy-chat-window.ui.h:11 -msgid "_Detach Tab" -msgstr "_Отсоединить вкладку" - -#: ../src/empathy-chat-window.ui.h:13 -msgid "_Favorite Chat Room" -msgstr "_Избранная комната" +msgid "_Previous Tab" +msgstr "На пред_ыдущую вкладку" -#: ../src/empathy-chat-window.ui.h:15 +#: ../src/empathy-chat-window.ui.h:12 msgid "_Next Tab" msgstr "На след_ующую вкладку" -#: ../src/empathy-chat-window.ui.h:16 -msgid "_Previous Tab" -msgstr "На пред_ыдущую вкладку" +#: ../src/empathy-chat-window.ui.h:13 +msgid "_Undo Close Tab" +msgstr "_Восстановить закрытую вкладку" -#: ../src/empathy-chat-window.ui.h:17 -#: ../src/empathy-status-icon.ui.h:5 -msgid "_Show Contact List" -msgstr "_Показывать список собеседников" +#: ../src/empathy-chat-window.ui.h:14 +msgid "Move Tab _Left" +msgstr "Передвинуть вкладку в_лево" -#: ../src/empathy-chat-window.ui.h:18 -msgid "_Tabs" -msgstr "В_кладки" +#: ../src/empathy-chat-window.ui.h:15 +msgid "Move Tab _Right" +msgstr "Передвинуть вкладку в_право" -#: ../src/empathy-chat-window.ui.h:19 -msgid "_Undo Close Tab" -msgstr "_Восстановить закрытую вкладку" +#: ../src/empathy-chat-window.ui.h:16 +msgid "_Detach Tab" +msgstr "_Отсоединить вкладку" #: ../src/empathy-chatrooms-window.c:251 msgid "Name" @@ -3627,106 +3644,106 @@ msgstr "Комната" msgid "Auto-Connect" msgstr "Автоматическое соединение" -#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-chatrooms-window.ui.h:1 msgid "Manage Favorite Rooms" msgstr "Управление избранными комнатами" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Входящий видеовызов" -#: ../src/empathy-event-manager.c:521 -#: ../src/empathy-call-window.c:1408 +#: ../src/empathy-event-manager.c:523 +#: ../src/empathy-call-window.c:1562 msgid "Incoming call" msgstr "Входящий вызов" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s делает видеовызов. Хотите ответить?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s вызывает вас. Хотите ответить?" -#: ../src/empathy-event-manager.c:529 -#: ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1414 +#: ../src/empathy-event-manager.c:531 +#: ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1568 #, c-format msgid "Incoming call from %s" msgstr "Входящий вызов от %s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "_Отказать" -#: ../src/empathy-event-manager.c:562 -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 +#: ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_Ответить" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "Ответить с _видео" -#: ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1414 +#: ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1568 #, c-format msgid "Incoming video call from %s" msgstr "Входящий видеовызов от %s" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Приглашение к беседе" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Предложение присоединиться к %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s предлагает присоединиться к %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_Отклонить" -#: ../src/empathy-event-manager.c:858 -#: ../src/empathy-new-chatroom-dialog.ui.h:7 +#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "_Join" msgstr "_Войти" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s предложил присоединиться к %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "Вам предложили присоединиться к %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Входящий файл от %s" -#: ../src/empathy-event-manager.c:1134 -#: ../src/empathy-main-window.c:375 +#: ../src/empathy-event-manager.c:1147 +#: ../src/empathy-roster-window.c:372 msgid "Password required" msgstr "Требуется пароль" -#: ../src/empathy-event-manager.c:1190 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "Пользователь %s хотел бы видеть, когда вы находитесь в сети" -#: ../src/empathy-event-manager.c:1194 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3736,108 +3753,108 @@ msgstr "" "Сообщение: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Неизвестен" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s из %s, %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s из %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Получение «%s» от %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Отправка «%s» %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Ошибка получения «%s» от %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Ошибка получения файла" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Ошибка отправки «%s» %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Ошибка отправки файла" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "Получен «%s» от %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "«%s» отправлен %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Передача файла завершена" -#: ../src/empathy-ft-manager.c:616 -#: ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 +#: ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Ожидание ответа от других участников" -#: ../src/empathy-ft-manager.c:642 -#: ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 +#: ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Проверка целостности «%s»" -#: ../src/empathy-ft-manager.c:645 -#: ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 +#: ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Хэширование «%s»" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Файл" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Осталось" @@ -3858,167 +3875,192 @@ msgid "Import Accounts" msgstr "Импортировать учётные записи" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "Импорт" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Протокол" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Источник" -#: ../src/empathy-main-window.c:392 +#: ../src/empathy-roster-window.c:389 msgid "Provide Password" msgstr "Указать пароль" -#: ../src/empathy-main-window.c:398 +#: ../src/empathy-roster-window.c:395 msgid "Disconnect" msgstr "Разъединить" -#: ../src/empathy-main-window.c:622 +#: ../src/empathy-roster-window.c:644 +msgid "You need to setup an account to see contacts here." +msgstr "Чтобы увидеть собеседников, необходимо настроить учётную запись." + +#: ../src/empathy-roster-window.c:660 msgid "No match found" msgstr "Нет совпадений" -#: ../src/empathy-main-window.c:777 +#: ../src/empathy-roster-window.c:765 +#, c-format +msgid "Sorry, %s accounts can’t be used until your %s software is updated." +msgstr "Учётные записи %s нельзя использовать до тех пор, пока не будет обновлено приложение %s." + +#: ../src/empathy-roster-window.c:831 +msgid "Update software..." +msgstr "Обновить приложение…" + +#: ../src/empathy-roster-window.c:837 +#: ../src/empathy-roster-window.c:954 +msgid "Close" +msgstr "Закрыть" + +#: ../src/empathy-roster-window.c:942 msgid "Reconnect" msgstr "Переподключиться" -#: ../src/empathy-main-window.c:783 +#: ../src/empathy-roster-window.c:948 msgid "Edit Account" msgstr "Правка учётной записи" -#: ../src/empathy-main-window.c:789 -msgid "Close" -msgstr "Закрыть" - #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:928 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1092 #, c-format msgid "Top up %s (%s)..." msgstr "Пополнить %s (%s)…" -#: ../src/empathy-main-window.c:975 +#: ../src/empathy-roster-window.c:1138 msgid "Top up account credit" msgstr "Пополнить кредит счёта" #. top up button -#: ../src/empathy-main-window.c:1046 +#: ../src/empathy-roster-window.c:1210 msgid "Top Up..." msgstr "Пополнить…" -#: ../src/empathy-main-window.c:1789 +#: ../src/empathy-roster-window.c:1933 msgid "Contact" msgstr "Собеседник" -#: ../src/empathy-main-window.c:2121 +#: ../src/empathy-roster-window.c:2131 +msgid "You need to enable one of your accounts to see contacts here." +msgstr "Чтобы увидеть собеседников, необходимо включить одну из ваших учётных записей." + +#. translators: argument is an account name +#: ../src/empathy-roster-window.c:2139 +#, c-format +msgid "You need to enable %s to see contacts here." +msgstr "Чтобы увидеть собеседников, необходимо включить учётную запись %s." + +#: ../src/empathy-roster-window.c:2419 msgid "Contact List" msgstr "Список собеседников" -#: ../src/empathy-main-window-menubar.ui.h:1 -msgid "Contacts on a _Map" -msgstr "Собеседники на _карте" +#: ../src/empathy-roster-window.ui.h:1 +#| msgid "_Accounts" +msgid "Account settings" +msgstr "Настроить учётную запись" -#: ../src/empathy-main-window-menubar.ui.h:2 -msgid "Credit Balance" -msgstr "Остаток кредита" +#: ../src/empathy-roster-window-menubar.ui.h:2 +#: ../src/empathy-status-icon.ui.h:2 +msgid "_New Conversation…" +msgstr "Новая _беседа…" -#: ../src/empathy-main-window-menubar.ui.h:3 -msgid "Find in Contact _List" -msgstr "Найти в списке _собеседников" +#: ../src/empathy-roster-window-menubar.ui.h:3 +#: ../src/empathy-status-icon.ui.h:3 +msgid "New _Call…" +msgstr "Новый _вызов…" -#: ../src/empathy-main-window-menubar.ui.h:4 -msgid "Join _Favorites" -msgstr "П_одключить избранные" +#: ../src/empathy-roster-window-menubar.ui.h:6 +msgid "_Search for Contacts…" +msgstr "_Поиск собеседников…" -#: ../src/empathy-main-window-menubar.ui.h:5 -msgid "Manage Favorites" -msgstr "Настроить избранные" +#: ../src/empathy-roster-window-menubar.ui.h:7 +msgid "_File Transfers" +msgstr "Передачи _файлов" -#: ../src/empathy-main-window-menubar.ui.h:6 -msgid "N_ormal Size" -msgstr "Обычный _размер" +#: ../src/empathy-roster-window-menubar.ui.h:8 +msgid "_Offline Contacts" +msgstr "Собеседники _не в сети" -#: ../src/empathy-main-window-menubar.ui.h:7 -#: ../src/empathy-status-icon.ui.h:1 -msgid "New _Call…" -msgstr "Новый _вызов…" +#: ../src/empathy-roster-window-menubar.ui.h:9 +msgid "Show P_rotocols" +msgstr "Показывать п_ротоколы" -#: ../src/empathy-main-window-menubar.ui.h:8 -msgid "Normal Size With _Avatars" -msgstr "Обычный размер с _аватарами" +#: ../src/empathy-roster-window-menubar.ui.h:10 +msgid "Credit Balance" +msgstr "Остаток кредита" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:11 +msgid "Contacts on a _Map" +msgstr "Собеседники на _карте" + +#: ../src/empathy-roster-window-menubar.ui.h:13 +msgid "_Accounts" +msgstr "_Учётные записи" + +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Blocked Contacts" +msgstr "_Заблокированные собеседники" + +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "P_references" msgstr "_Параметры" -#: ../src/empathy-main-window-menubar.ui.h:10 -msgid "Show P_rotocols" -msgstr "Показывать п_ротоколы" +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "Find in Contact _List" +msgstr "Найти в списке _собеседников" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "Sort by _Name" msgstr "Упорядочить по _имени" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "Sort by _Status" msgstr "Упорядочить по с_татусу" -#: ../src/empathy-main-window-menubar.ui.h:13 -msgid "_Accounts" -msgstr "_Учётные записи" +#: ../src/empathy-roster-window-menubar.ui.h:20 +msgid "Normal Size With _Avatars" +msgstr "Обычный размер с _аватарами" -#: ../src/empathy-main-window-menubar.ui.h:15 -msgid "_Blocked Contacts" -msgstr "_Заблокированные собеседники" +#: ../src/empathy-roster-window-menubar.ui.h:21 +msgid "N_ormal Size" +msgstr "Обычный _размер" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Compact Size" msgstr "_Компактный размер" -#: ../src/empathy-main-window-menubar.ui.h:21 -msgid "_File Transfers" -msgstr "Передачи _файлов" +#: ../src/empathy-roster-window-menubar.ui.h:23 +msgid "_Room" +msgstr "_Комната" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:24 msgid "_Join…" msgstr "_Войти…" -#: ../src/empathy-main-window-menubar.ui.h:24 -#: ../src/empathy-status-icon.ui.h:3 -msgid "_New Conversation…" -msgstr "Новая _беседа…" - -#: ../src/empathy-main-window-menubar.ui.h:25 -msgid "_Offline Contacts" -msgstr "Собеседники _не в сети" - -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "_Личная информация" - -#: ../src/empathy-main-window-menubar.ui.h:28 -msgid "_Room" -msgstr "_Комната" +#: ../src/empathy-roster-window-menubar.ui.h:25 +msgid "Join _Favorites" +msgstr "П_одключить избранные" -#: ../src/empathy-main-window-menubar.ui.h:29 -msgid "_Search for Contacts…" -msgstr "_Поиск собеседников…" +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "Manage Favorites" +msgstr "Настроить избранные" -#: ../src/empathy-new-chatroom-dialog.c:337 +#: ../src/empathy-new-chatroom-dialog.c:369 msgid "Chat Room" msgstr "Комната" -#: ../src/empathy-new-chatroom-dialog.c:353 +#: ../src/empathy-new-chatroom-dialog.c:385 msgid "Members" msgstr "Участники" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:553 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4031,323 +4073,326 @@ msgstr "" "Требуется пароль: %s\n" "Участники: %s" -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "Нет" -#: ../src/empathy-new-chatroom-dialog.c:584 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "Не удалось начать формирование списка комнат" -#: ../src/empathy-new-chatroom-dialog.c:594 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "Не удалось остановить формирование списка комнат" -#: ../src/empathy-new-chatroom-dialog.ui.h:2 -msgid "Couldn't load room list" -msgstr "Не удалось загрузить список комнат" +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Join Room" +msgstr "Войти в комнату" #: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "Enter the room name to join here or click on one or more rooms in the list." msgstr "Введите имя беседы, к которой хотите присоединиться, или выберите одну (или более) в списке." #: ../src/empathy-new-chatroom-dialog.ui.h:4 -msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server" -msgstr "Введите сервер беседы, или оставьте пустым, если беседа находится на сервере текущей учётной записи" +msgid "_Room:" +msgstr "_Комната:" #: ../src/empathy-new-chatroom-dialog.ui.h:5 -msgid "Join Room" -msgstr "Войти в комнату" - -#: ../src/empathy-new-chatroom-dialog.ui.h:6 -msgid "Room List" -msgstr "Список комнат" +msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server" +msgstr "Введите сервер беседы, или оставьте пустым, если беседа находится на сервере текущей учётной записи" #: ../src/empathy-new-chatroom-dialog.ui.h:8 -msgid "_Room:" -msgstr "_Комната:" +msgid "Couldn't load room list" +msgstr "Не удалось загрузить список комнат" + +#: ../src/empathy-new-chatroom-dialog.ui.h:9 +msgid "Room List" +msgstr "Список комнат" -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Сообщение получено" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Сообщение отправлено" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Новая беседа" -#: ../src/empathy-preferences.c:172 -msgid "Contact goes online" +#: ../src/empathy-preferences.c:169 +#| msgid "Contact goes online" +msgid "Contact comes online" msgstr "Собеседник вошёл в сеть" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "Собеседник вышел из сети" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Учётная запись зарегистрирована" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Учётная запись отключена" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Язык" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:726 msgid "Juliet" msgstr "Джульета" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:733 msgid "Romeo" msgstr "Ромео" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:739 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Ромео, о зачем же ты Ромео!" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:743 msgid "Deny thy father and refuse thy name;" msgstr "Покинь отца и отрекись навеки" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:746 msgid "Or if thou wilt not, be but sworn my love" msgstr "От имени родного, а не хочешь —" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:749 msgid "And I'll no longer be a Capulet." msgstr "Так поклянись, что любишь ты меня, —" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:752 msgid "Shall I hear more, or shall I speak at this?" msgstr "И больше я не буду Капулетти." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" msgstr "Джульета отключилась" -#: ../src/empathy-preferences.c:1166 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "Параметры" #: ../src/empathy-preferences.ui.h:1 +msgid "Show _smileys as images" +msgstr "Показывать _графические улыбки" + +#: ../src/empathy-preferences.ui.h:2 +msgid "Show contact _list in rooms" +msgstr "Показывать _список собеседников в комнатах" + +#: ../src/empathy-preferences.ui.h:3 msgid "Appearance" msgstr "Внешний вид" -#: ../src/empathy-preferences.ui.h:3 -msgid "Behavior" -msgstr "Поведение" +#: ../src/empathy-preferences.ui.h:4 +msgid "Start chats in:" +msgstr "" #: ../src/empathy-preferences.ui.h:5 -msgid "Chat Th_eme:" -msgstr "_Тема оформления беседы:" +msgid "new ta_bs" +msgstr "" #: ../src/empathy-preferences.ui.h:6 -msgid "Disable notifications when _away or busy" -msgstr "В_ыключить уведомления в состоянии «отсутствует» или «не беспокоить»" +msgid "new _windows" +msgstr "" #: ../src/empathy-preferences.ui.h:7 -msgid "Disable sounds when _away or busy" -msgstr "В_ыключить звуки в состоянии «отсутствует» или «не беспокоить»" - -#: ../src/empathy-preferences.ui.h:8 msgid "Display incoming events in the notification area" msgstr "Показывать приближающиеся события в области уведомлений" +#: ../src/empathy-preferences.ui.h:8 +msgid "_Automatically connect on startup" +msgstr "_Автоматически соединяться при запуске" + #: ../src/empathy-preferences.ui.h:9 -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 "Подавление эха позволяет сделать передачу вашего голоса чище, но это может вызывать проблемы на некоторых компьютерах. Если вы или ваш собеседник слышите странные шумы или сбои во время разговора, попробуйте выключить подавление эха и повторить вызов собеседника." +msgid "Log conversations" +msgstr "Вести журнал бесед" #: ../src/empathy-preferences.ui.h:10 -msgid "Enable notifications when a contact comes online" -msgstr "Включить уведомления, когда собеседник появляется в сети" +msgid "Behavior" +msgstr "Поведение" #: ../src/empathy-preferences.ui.h:11 -msgid "Enable notifications when a contact goes offline" -msgstr "Включить уведомления, когда собеседник выходит из сети" +msgid "General" +msgstr "Общие" #: ../src/empathy-preferences.ui.h:12 -msgid "Enable notifications when the _chat is not focused" -msgstr "Включить уведомления, когда _беседа не в фокусе" +msgid "_Enable bubble notifications" +msgstr "Включить _всплывающие уведомления" #: ../src/empathy-preferences.ui.h:13 -msgid "Enable spell checking for languages:" -msgstr "Включить проверку орфографии для языков:" +msgid "Disable notifications when _away or busy" +msgstr "В_ыключить уведомления в состоянии «отсутствует» или «не беспокоить»" #: ../src/empathy-preferences.ui.h:14 -msgid "General" -msgstr "Общие" +msgid "Enable notifications when the _chat is not focused" +msgstr "Включить уведомления, когда _беседа не в фокусе" #: ../src/empathy-preferences.ui.h:15 -#| msgid "Input level" -msgid "Input level:" -msgstr "Уровень записи:" +msgid "Enable notifications when a contact comes online" +msgstr "Включить уведомления, когда собеседник появляется в сети" #: ../src/empathy-preferences.ui.h:16 -#| msgid "Input volume" -msgid "Input volume:" -msgstr "Громкость записи:" +msgid "Enable notifications when a contact goes offline" +msgstr "Включить уведомления, когда собеседник выходит из сети" + +#: ../src/empathy-preferences.ui.h:17 +msgid "Notifications" +msgstr "Уведомления" #: ../src/empathy-preferences.ui.h:18 -msgid "Location sources:" -msgstr "Источники местоположений:" +msgid "_Enable sound notifications" +msgstr "_Включить звуковые уведомления" #: ../src/empathy-preferences.ui.h:19 -msgid "Log conversations" -msgstr "Вести журнал бесед" +msgid "Disable sounds when _away or busy" +msgstr "В_ыключить звуки в состоянии «отсутствует» или «не беспокоить»" #: ../src/empathy-preferences.ui.h:20 -msgid "Notifications" -msgstr "Уведомления" - -#: ../src/empathy-preferences.ui.h:21 msgid "Play sound for events" msgstr "Воспроизводить звук для событий" +#: ../src/empathy-preferences.ui.h:21 +msgid "Sounds" +msgstr "Звуки" + #: ../src/empathy-preferences.ui.h:22 -msgid "Privacy" -msgstr "Приватность" +msgid "Use _echo cancellation to improve call quality" +msgstr "Использовать подавление _эха для улучшения качества связи" #: ../src/empathy-preferences.ui.h:23 -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 "Примерное определение местоположения означает, что публикуется только ваш город, регион и страна. Координаты GPS будут отображаться с точностью до 1 знака после запятой." - -#: ../src/empathy-preferences.ui.h:24 -msgid "Show _smileys as images" -msgstr "Показывать _графические улыбки" - -#: ../src/empathy-preferences.ui.h:25 -msgid "Show contact _list in rooms" -msgstr "Показывать _список собеседников в комнатах" +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 "Подавление эха позволяет сделать передачу вашего голоса чище, но это может вызывать проблемы на некоторых компьютерах. Если вы или ваш собеседник слышите странные шумы или сбои во время разговора, попробуйте выключить подавление эха и повторить вызов собеседника." #: ../src/empathy-preferences.ui.h:26 -msgid "Sounds" -msgstr "Звуки" +msgid "_Publish location to my contacts" +msgstr "Пу_бликовать местоположение для собеседников" #: ../src/empathy-preferences.ui.h:27 -msgid "Spell Checking" -msgstr "Проверка орфографии" - -#: ../src/empathy-preferences.ui.h:28 -msgid "The list of languages reflects only the languages for which you have a dictionary installed." -msgstr "В этом списке показаны только те языки, для которых установлены словари." +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 "Примерное определение местоположения означает, что публикуется только ваш город, регион и страна. Координаты GPS будут отображаться с точностью до 1 знака после запятой." +#. 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:29 -msgid "Themes" -msgstr "Темы" +msgid "_Reduce location accuracy" +msgstr "_Снижать точность определения местоположения" #: ../src/empathy-preferences.ui.h:30 -msgid "Variant:" -msgstr "Вариант:" +msgid "Privacy" +msgstr "Приватность" #: ../src/empathy-preferences.ui.h:31 -msgid "_Automatically connect on startup" -msgstr "_Автоматически соединяться при запуске" +msgid "_GPS" +msgstr "_GPS" #: ../src/empathy-preferences.ui.h:32 msgid "_Cellphone" msgstr "С_отовая сеть" #: ../src/empathy-preferences.ui.h:33 -msgid "_Enable bubble notifications" -msgstr "Включить _всплывающие уведомления" +msgid "_Network (IP, Wi-Fi)" +msgstr "С_еть (IP, Wi-Fi)" #: ../src/empathy-preferences.ui.h:34 -msgid "_Enable sound notifications" -msgstr "_Включить звуковые уведомления" - -#: ../src/empathy-preferences.ui.h:35 -msgid "_GPS" -msgstr "_GPS" +msgid "Location sources:" +msgstr "Источники местоположений:" #: ../src/empathy-preferences.ui.h:36 -msgid "_Network (IP, Wi-Fi)" -msgstr "С_еть (IP, Wi-Fi)" +msgid "The list of languages reflects only the languages for which you have a dictionary installed." +msgstr "В этом списке показаны только те языки, для которых установлены словари." #: ../src/empathy-preferences.ui.h:37 -msgid "_Open new chats in separate windows" -msgstr "_Открывать новые беседы в отдельном окне" +msgid "Enable spell checking for languages:" +msgstr "Включить проверку орфографии для языков:" #: ../src/empathy-preferences.ui.h:38 -msgid "_Publish location to my contacts" -msgstr "Пу_бликовать местоположение для собеседников" +msgid "Spell Checking" +msgstr "Проверка орфографии" + +#: ../src/empathy-preferences.ui.h:39 +msgid "Chat Th_eme:" +msgstr "_Тема оформления беседы:" -#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees. #: ../src/empathy-preferences.ui.h:40 -msgid "_Reduce location accuracy" -msgstr "_Снижать точность определения местоположения" +msgid "Variant:" +msgstr "Вариант:" -#: ../src/empathy-status-icon.ui.h:2 +#: ../src/empathy-preferences.ui.h:41 +msgid "Themes" +msgstr "Темы" + +#: ../src/empathy-status-icon.ui.h:4 msgid "Status" msgstr "Состояние" -#: ../src/empathy-status-icon.ui.h:4 +#: ../src/empathy-status-icon.ui.h:5 msgid "_Quit" msgstr "В_ыход" -#: ../src/empathy-streamed-media-window.ui.h:2 -msgid "Call the contact again" -msgstr "Перезвонить собеседнику" - #: ../src/empathy-streamed-media-window.ui.h:3 -msgid "Camera Off" -msgstr "Камера выключена" +msgid "Redial" +msgstr "Перезвонить" #: ../src/empathy-streamed-media-window.ui.h:4 -msgid "Camera On" -msgstr "Камера включена" +msgid "V_ideo" +msgstr "В_идео" + +#: ../src/empathy-streamed-media-window.ui.h:5 +msgid "Video Off" +msgstr "Видео выключено" #: ../src/empathy-streamed-media-window.ui.h:6 -msgid "Disable camera and stop sending video" -msgstr "Выключить камеру и остановить отправку видео" +msgid "Video Preview" +msgstr "Предварительный просмотр видео" #: ../src/empathy-streamed-media-window.ui.h:7 -msgid "Enable camera and send video" -msgstr "Включить камеру и отправить видео" +msgid "Video On" +msgstr "Видео включено" -#: ../src/empathy-streamed-media-window.ui.h:8 -msgid "Enable camera but don't send video" -msgstr "Включить камеру, но не отправлять видео" +#: ../src/empathy-streamed-media-window.ui.h:10 +msgid "Call the contact again" +msgstr "Перезвонить собеседнику" #: ../src/empathy-streamed-media-window.ui.h:13 -msgid "Preview" -msgstr "Предварительный просмотр" +msgid "Camera Off" +msgstr "Камера выключена" #: ../src/empathy-streamed-media-window.ui.h:14 -msgid "Redial" -msgstr "Перезвонить" +msgid "Disable camera and stop sending video" +msgstr "Выключить камеру и остановить отправку видео" -#: ../src/empathy-streamed-media-window.ui.h:19 -msgid "V_ideo" -msgstr "В_идео" +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Preview" +msgstr "Предварительный просмотр" -#: ../src/empathy-streamed-media-window.ui.h:21 -msgid "Video Off" -msgstr "Видео выключено" +#: ../src/empathy-streamed-media-window.ui.h:16 +msgid "Enable camera but don't send video" +msgstr "Включить камеру, но не отправлять видео" -#: ../src/empathy-streamed-media-window.ui.h:22 -msgid "Video On" -msgstr "Видео включено" +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Camera On" +msgstr "Камера включена" -#: ../src/empathy-streamed-media-window.ui.h:23 -msgid "Video Preview" -msgstr "Предварительный просмотр видео" +#: ../src/empathy-streamed-media-window.ui.h:18 +msgid "Enable camera and send video" +msgstr "Включить камеру и отправить видео" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Собеседники на карте" @@ -4412,16 +4457,16 @@ msgstr "Уровень" msgid "The selected connection manager does not support the remote debugging extension." msgstr "Выбранный менеджер соединений не поддерживает расширение удалённой отладки." -#: ../src/empathy-invite-participant-dialog.c:179 -#: ../src/empathy-invite-participant-dialog.c:205 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Пригласить участника" -#: ../src/empathy-invite-participant-dialog.c:180 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Выберите собеседника для приглашения к беседе:" -#: ../src/empathy-invite-participant-dialog.c:201 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Пригласить" @@ -4441,23 +4486,27 @@ msgstr "Сначала выберите учётную запись (напри msgid "" msgstr "" -#: ../src/empathy-accounts.c:198 +#: ../src/empathy-accounts.c:196 +msgid "Show account assistant" +msgstr "Показывать баланс в списке собеседников" + +#: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" msgstr "— Учётные записи Empathy" -#: ../src/empathy-accounts.c:237 +#: ../src/empathy-accounts.c:238 msgid "Empathy Accounts" msgstr "Учётные записи Empathy" -#: ../src/empathy-debugger.c:70 +#: ../src/empathy-debugger.c:69 msgid "Show a particular service" msgstr "Показать определённую службу" -#: ../src/empathy-debugger.c:75 +#: ../src/empathy-debugger.c:74 msgid "- Empathy Debugger" msgstr "— Отладчик Empathy" -#: ../src/empathy-debugger.c:114 +#: ../src/empathy-debugger.c:113 msgid "Empathy Debugger" msgstr "Отладчик Empathy" @@ -4465,39 +4514,39 @@ msgstr "Отладчик Empathy" msgid "- Empathy Chat Client" msgstr " — клиент обмена мгновенными сообщениями Empathy" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Ответить" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1418 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1572 msgid "Reject" msgstr "Отказать" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1419 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1573 msgid "Answer" msgstr "Ответить" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Ответить с видео" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Отклонить" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Принять" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Предоставить" @@ -4508,30 +4557,128 @@ msgstr "Собеседник %s попытался до вас дозвонит #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1047 -#: ../src/empathy-call-window.c:1070 +#: ../src/empathy-call-window.c:1179 +#: ../src/empathy-call-window.c:1202 msgid "i" msgstr "Инфо" -#: ../src/empathy-call-window.c:2727 +#: ../src/empathy-call-window.c:2936 msgid "On hold" msgstr "Удержание" -#: ../src/empathy-call-window.c:2730 +#: ../src/empathy-call-window.c:2939 msgid "Mute" msgstr "Приглушить" -#: ../src/empathy-call-window.c:2732 +#: ../src/empathy-call-window.c:2941 msgid "Duration" msgstr "Длительность" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2735 +#: ../src/empathy-call-window.c:2944 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" +#: ../src/empathy-call-window.c:3214 +#, c-format +msgid "Your current balance is %s." +msgstr "Текущий баланс: %s." + +#: ../src/empathy-call-window.c:3218 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "Недостаточно средств для совершения звонка." + +#: ../src/empathy-call-window.c:3220 +msgid "Top Up" +msgstr "Пополнить" + #: ../libempathy-gtk/empathy-search-bar.c:243 msgid "_Match case" msgstr "_Учитывать регистр" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Добавление учётной записи" + +#~ msgid "Personal Information" +#~ msgstr "Личная информация" + +#~ msgid "Linked Contacts" +#~ msgstr "Объединённые контакты" + +#~ msgid "Select contacts to link" +#~ msgstr "Выбрать контакты для связи" + +#~ msgid "New contact preview" +#~ msgstr "Предпросмотр нового собеседника" + +#~ msgid "Contacts selected in the list on the left will be linked together." +#~ msgstr "Контакты, выбранные в списке слева, будут объединены." +#~ msgctxt "Link individual (contextual menu)" + +#~ msgid "_Link Contacts…" +#~ msgstr "_Объединить контакты…" + +#~ msgid "Link Contacts" +#~ msgstr "Связь с собеседниками" +#~ msgctxt "Unlink individual (button)" + +#~ msgid "_Unlink…" +#~ msgstr "_Разъединить…" + +#~ msgid "" +#~ "Completely split the displayed linked contacts into the separate contacts." +#~ msgstr "Полностью разъединить связанные контакты на отдельные контакты." + +#~ msgid "_Link" +#~ msgstr "_Связь" + +#~ msgid "Unlink linked contacts '%s'?" +#~ msgstr "Разъединить контакты «%s»?" + +#~ msgid "" +#~ "Are you sure you want to unlink these linked contacts? This will " +#~ "completely split the linked contacts into separate contacts." +#~ msgstr "" +#~ "Действительно разъединить эти связанные контакты? Это полностью разделит " +#~ "связанные контакты на отдельные контакты." +#~ msgctxt "Unlink individual (button)" + +#~ msgid "_Unlink" +#~ msgstr "_Разъединить" + +#~ msgid "_Personal Information" +#~ msgstr "_Личная информация" + +#~ msgid "_Open new chats in separate windows" +#~ msgstr "_Открывать новые беседы в отдельном окне" + +#~ msgid "My Web Accounts" +#~ msgstr "Мои сетевые учётные записи" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "Учётная запись %s изменена посредством %s." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "Учётную запись %s нельзя изменить в Empathy." + +#~ msgid "Launch My Web Accounts" +#~ msgstr "Запустить «Мои учётные записи»" + +#~ msgid "Edit %s" +#~ msgstr "Изменить %s" + +#~ msgid "Ca_ncel" +#~ msgstr "О_тменить" +#~ msgctxt "Edit contact (contextual menu)" + +#~ msgid "_Edit" +#~ msgstr "_Правка" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "Вы собираетесь создать новую учётную запись, это приведёт\n" +#~ "к отмене сделанных изменений. Хотите продолжить?" diff --git a/po/sl.po b/po/sl.po index 7a69de31..1c8d9221 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,21 +4,21 @@ # # Bernard Banko , 2009. # Andrej Žnidaršič , 2010. -# Matej Urbančič , 2006 - 2011. +# Matej Urbančič , 2006 - 2012. # 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: 2011-11-25 16:24+0000\n" -"PO-Revision-Date: 2011-11-25 21:04+0100\n" +"POT-Creation-Date: 2012-02-02 12:58+0000\n" +"PO-Revision-Date: 2012-02-02 20:51+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenščina \n" "Language: \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-Language: Slovenian\n" "X-Poedit-Country: SLOVENIA\n" "X-Poedit-SourceCharset: utf-8\n" @@ -436,8 +436,8 @@ msgid "Whether to use the theme for chat rooms." msgstr "Ali naj se za klepetalnice uporablja tema." #: ../data/org.gnome.Empathy.gschema.xml.in.h:100 -msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state." -msgstr "Kateri kriterij naj se uporabi za razvrščanje seznama stikov. Privzeto je razvrščanje po imenu stika z vrednostjo \"ime\". Vrednost \"stanje\" pa razvrsti seznam glede na stanje stikov." +msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name." +msgstr "Kateri kriterij naj se uporabi za razvrščanje seznama stikov. Privzeto je razvrščanje po stanju stika z vrednostjo \"stanje\". Vrednost \"ime\" pa razvrsti seznam poimensko." #: ../data/empathy-accounts.desktop.in.in.h:1 msgid "Manage Messaging and VoIP accounts" @@ -445,23 +445,52 @@ msgstr "Upravljanje s sporočanjem in računi VoIP" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2312 +#: ../src/empathy-accounts-dialog.c:2327 msgid "Messaging and VoIP Accounts" msgstr "Sporočanje in računi VoIP" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Ni navedenega vzroka" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Zahtevana je bila zamenjava stanja" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Prenos datoteke ste preklicali" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Drug uporabnik je preklical prenos datoteke" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Prišlo je do napake med prenosom datoteke" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Drug uporabnik ne more prenesti datoteke" + +#: ../libempathy/empathy-ft-handler.c:754 +#: ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "Neznan vzrok" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Prenos datoteke je končan, vendar je datoteka pokvarjena" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Prenos datotek s strani oddaljenega stika ni podprt" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Izbrana datoteka ni običajna datoteka" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Izbrana datoteka je prazna" @@ -482,203 +511,174 @@ msgstr "Klicanje uporabnika %s" msgid "Call from %s" msgstr "Klic uporabnika %s" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "Vrsta vtičnice ni podprta" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "Ni navedenega vzroka" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "Zahtevana je bila zamenjava stanja" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "Prenos datoteke ste preklicali" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "Drug uporabnik je preklical prenos datoteke" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "Prišlo je do napake med prenosom datoteke" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "Drug uporabnik ne more prenesti datoteke" - -#: ../libempathy/empathy-tp-file.c:395 -#: ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Neznan vzrok" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "Na voljo" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "Zaposleno" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "Odsotno" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "Nevidno" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "Nepovezano" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "Neznano" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "Ni določenega razloga" -#: ../libempathy/empathy-utils.c:286 -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 +#: ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "Stanje je nastavljeno na brez povezave" -#: ../libempathy/empathy-utils.c:288 -#: ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 +#: ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Napaka omrežja" -#: ../libempathy/empathy-utils.c:290 -#: ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 +#: ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "Overitev ni uspela" -#: ../libempathy/empathy-utils.c:292 -#: ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "Napaka šifriranja" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "Ime je v uporabi" -#: ../libempathy/empathy-utils.c:296 -#: ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "Potrdilo ni na voljo" -#: ../libempathy/empathy-utils.c:298 -#: ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 +#: ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "Potrdilo ni overjeno" -#: ../libempathy/empathy-utils.c:300 -#: ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 +#: ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "Potrdilo je preteklo" -#: ../libempathy/empathy-utils.c:302 -#: ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 +#: ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "Potrdilo ni potrjeno" -#: ../libempathy/empathy-utils.c:304 -#: ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 +#: ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "Neustrezno potrdilo gostitelja" -#: ../libempathy/empathy-utils.c:306 -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 +#: ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "Neustrezen prstni odtis potrdila" -#: ../libempathy/empathy-utils.c:308 -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 +#: ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "Potrdilo je samo-podpisano" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "Napaka potrdila" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "Šifriranje ni na voljo." -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "Potrdilo je neveljavno." -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "Omrežna povezava je zavrnjena." -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "Povezave ni mogoče vzpostaviti." -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "Povezava je prekinjena." -#: ../libempathy/empathy-utils.c:354 +#: ../libempathy/empathy-utils.c:355 msgid "This resource is already connected to the server" msgstr "Vir je s strežnikom že povezan" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 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:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "Račun na strežniku že obstaja" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 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:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "Potrdilo je preklicano" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 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:368 +#: ../libempathy/empathy-utils.c:369 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:372 +#: ../libempathy/empathy-utils.c:373 msgid "Your software is too old" msgstr "Programska oprema je prestara" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "Notranja napaka" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "Uporabniki v bližini" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Facebook klepetanje" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" @@ -687,7 +687,7 @@ msgstr[1] "Pred %d sekundo" msgstr[2] "Pred %d sekundama" msgstr[3] "Pred %d sekundami" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -696,7 +696,7 @@ msgstr[1] "Pred %d minuto" msgstr[2] "Pred %d minutama" msgstr[3] "Pred %d minutami" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -705,7 +705,7 @@ msgstr[1] "Pred %d uro" msgstr[2] "Pred %d urama" msgstr[3] "Pred %d urami" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -714,7 +714,7 @@ msgstr[1] "Pred %d dnevom" msgstr[2] "Pred %d dnevoma" msgstr[3] "Pred %d dnevi" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -723,7 +723,7 @@ msgstr[1] "Pred %d tednom" msgstr[2] "Pred %d tednoma" msgstr[3] "Pred %d tedni" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -732,106 +732,78 @@ msgstr[1] "Pred %d mesecem" msgstr[2] "Pred %d mesecema" msgstr[3] "Pred %d meseci" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "v prihodnosti" -#: ../libempathy-gtk/empathy-account-chooser.c:688 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "Vsi računi" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Račun" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Geslo" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Strežnik" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Vrata" -#: ../libempathy-gtk/empathy-account-widget.c:776 -#: ../libempathy-gtk/empathy-account-widget.c:828 +#: ../libempathy-gtk/empathy-account-widget.c:763 +#: ../libempathy-gtk/empathy-account-widget.c:815 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1182 -msgid "My Web Accounts" -msgstr "Moji spletni računi" - -#: ../libempathy-gtk/empathy-account-widget.c:1199 -#, c-format -msgid "The account %s is edited via %s." -msgstr "Račun %s se ureja preko %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1205 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Računa %s s programom Empathy ni mogoče urejati." - -#: ../libempathy-gtk/empathy-account-widget.c:1224 -msgid "Launch My Web Accounts" -msgstr "Zaženi spletne račune" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1232 -#, c-format -msgid "Edit %s" -msgstr "Uredi %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1582 +#: ../libempathy-gtk/empathy-account-widget.c:1396 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "Uporabniško ime:" -#: ../libempathy-gtk/empathy-account-widget.c:1900 +#: ../libempathy-gtk/empathy-account-widget.c:1708 msgid "A_pply" msgstr "_Uveljavi" -#: ../libempathy-gtk/empathy-account-widget.c:1930 +#: ../libempathy-gtk/empathy-account-widget.c:1737 msgid "L_og in" msgstr "_Prijava" -#: ../libempathy-gtk/empathy-account-widget.c:2004 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "Ta račun na strežniku že obstaja" -#: ../libempathy-gtk/empathy-account-widget.c:2007 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "Ustvari nov račun na strežniku" -#: ../libempathy-gtk/empathy-account-widget.c:2201 -msgid "Ca_ncel" -msgstr "_Prekliči" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2479 +#: ../libempathy-gtk/empathy-account-widget.c:2239 #, 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:2505 +#: ../libempathy-gtk/empathy-account-widget.c:2265 #, c-format msgid "%s Account" msgstr "%s račun" -#: ../libempathy-gtk/empathy-account-widget.c:2509 +#: ../libempathy-gtk/empathy-account-widget.c:2269 msgid "New account" msgstr "Nov račun" @@ -1304,188 +1276,194 @@ msgstr "Klic v sili ni podprt s tem protokolom" 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:706 +#: ../libempathy-gtk/empathy-chat.c:710 msgid "Failed to open private chat" msgstr "Napaka med odpiranjem zasebnega klepeta" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:768 msgid "Topic not supported on this conversation" msgstr "Tema ni podprta pri tem pogovoru" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:774 msgid "You are not allowed to change the topic" msgstr "Za spreminjanje teme nimate ustreznih dovoljenj." -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:973 #, c-format msgid "“%s” is not a valid contact ID" msgstr "“%s” ni veljaven ID stika" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1068 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: počisti vsa sporočila trenutnega pogovora" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/topic : set the topic of the current conversation" msgstr "/topic : določi temo trenutnega pogovora" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1074 msgid "/join : join a new chat room" msgstr "/join : pridruževanje novi klepetalnici" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1077 msgid "/j : join a new chat room" msgstr "/j : pridruži se novi klepetalnici" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "/part [] []: leave the chat room, by default the current one" msgstr "/part [] []: zapusti klepetalnico, privzeto je to trenutna klepetalnica" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/query []: open a private chat" msgstr "/query []: odpre zasebni klepet" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/msg : open a private chat" msgstr "/msg : odpre zasebni klepet" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/nick : change your nickname on the current server" msgstr "/nick : spremeni vaš vzdevek na trenutnem strežniku" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/me : send an ACTION message to the current conversation" msgstr "/me : pošlje sporočilo DEJANJA v trenutni pogovor" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1097 msgid "/say : send 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 : pošlje 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:1100 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "/whois : display information about a contact" msgstr "/whois : pokaže podrobnosti stika" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1105 msgid "/help []: show all supported commands. If is defined, show its usage." msgstr "/help [], pokaže vse podprte ukaze in njihov način uporabe." -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1124 #, c-format msgid "Usage: %s" msgstr "Uporaba: %s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1169 msgid "Unknown command" msgstr "Neznan ukaz" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1295 msgid "Unknown command; see /help for the available commands" msgstr "Neznan ukaz, za več si vpišite /help" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1541 msgid "insufficient balance to send message" msgstr "nezadostno stanje na računu za pošiljanje sporočil" -#: ../libempathy-gtk/empathy-chat.c:1461 -#: ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1545 +#: ../libempathy-gtk/empathy-chat.c:1559 +#: ../libempathy-gtk/empathy-chat.c:1622 #, c-format msgid "Error sending message '%s': %s" msgstr "Napaka med pošiljanjem sporočila '%s': %s" -#: ../libempathy-gtk/empathy-chat.c:1463 -#: ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1547 +#: ../libempathy-gtk/empathy-chat.c:1564 +#: ../libempathy-gtk/empathy-chat.c:1626 #, 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:1469 +#: ../libempathy-gtk/empathy-chat.c:1553 #, c-format msgid "insufficient balance to send message. Top up." msgstr "Nezadostno stanje na računi za pošiljanje sporočila. Povišaj." -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1593 msgid "not capable" msgstr "ni mogoče" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1600 msgid "offline" msgstr "brez povezave" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1603 msgid "invalid contact" msgstr "neveljaven stik" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1606 msgid "permission denied" msgstr "ni dovoljenja" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1609 msgid "too long message" msgstr "predolgo sporočilo" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "not implemented" msgstr "ni del programa" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "unknown" msgstr "neznano" -#: ../libempathy-gtk/empathy-chat.c:1599 -#: ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1683 +#: ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "Tema:" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1698 #, c-format msgid "Topic set to: %s" msgstr "Tema je določena na: %s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1700 +#, 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:1705 msgid "No topic defined" msgstr "Ni določene teme" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2221 msgid "(No Suggestions)" msgstr "(Ni predlogov)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2289 #, 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:2231 +#: ../libempathy-gtk/empathy-chat.c:2326 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Dodaj '%s' v slovar %s" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2396 msgid "Insert Smiley" msgstr "Vstavi smeška" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 +#: ../libempathy-gtk/empathy-chat.c:2414 #: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "_Pošlji" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2376 +#: ../libempathy-gtk/empathy-chat.c:2471 msgid "_Spelling Suggestions" msgstr "Predlogi čr_kovalnika" -#: ../libempathy-gtk/empathy-chat.c:2465 +#: ../libempathy-gtk/empathy-chat.c:2560 msgid "Failed to retrieve recent logs" msgstr "Napaka med pridobivanjem nedavnih dnevnikov" -#: ../libempathy-gtk/empathy-chat.c:2602 +#: ../libempathy-gtk/empathy-chat.c:2699 #, c-format msgid "%s has disconnected" msgstr "%s je prekinil povezavo" @@ -1493,12 +1471,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:2609 +#: ../libempathy-gtk/empathy-chat.c:2706 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s je izgnal %1$s" -#: ../libempathy-gtk/empathy-chat.c:2612 +#: ../libempathy-gtk/empathy-chat.c:2709 #, c-format msgid "%s was kicked" msgstr "%s je bil izgnan" @@ -1506,17 +1484,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:2620 +#: ../libempathy-gtk/empathy-chat.c:2717 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s je izobčil %1$s" -#: ../libempathy-gtk/empathy-chat.c:2623 +#: ../libempathy-gtk/empathy-chat.c:2720 #, c-format msgid "%s was banned" msgstr "%s je izobčen" -#: ../libempathy-gtk/empathy-chat.c:2627 +#: ../libempathy-gtk/empathy-chat.c:2724 #, c-format msgid "%s has left the room" msgstr "%s je zapustil klepetalnico" @@ -1526,17 +1504,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:2636 +#: ../libempathy-gtk/empathy-chat.c:2733 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2661 +#: ../libempathy-gtk/empathy-chat.c:2758 #, c-format msgid "%s has joined the room" msgstr "%s je vstopil v klepetalnico" -#: ../libempathy-gtk/empathy-chat.c:2686 +#: ../libempathy-gtk/empathy-chat.c:2783 #, c-format msgid "%s is now known as %s" msgstr "%s je preimenovan v %s" @@ -1544,9 +1522,9 @@ 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:2847 +#: ../libempathy-gtk/empathy-chat.c:2970 #: ../src/empathy-streamed-media-window.c:1889 -#: ../src/empathy-event-manager.c:1260 +#: ../src/empathy-event-manager.c:1280 #: ../src/empathy-call-window.c:1538 #: ../src/empathy-call-window.c:1588 #: ../src/empathy-call-window.c:2631 @@ -1554,73 +1532,73 @@ msgid "Disconnected" msgstr "Prekinjena povezava" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3493 +#: ../libempathy-gtk/empathy-chat.c:3634 msgid "Would you like to store this password?" msgstr "Ali želite shraniti geslo?" -#: ../libempathy-gtk/empathy-chat.c:3499 +#: ../libempathy-gtk/empathy-chat.c:3640 msgid "Remember" msgstr "Zapomni si" -#: ../libempathy-gtk/empathy-chat.c:3509 +#: ../libempathy-gtk/empathy-chat.c:3650 msgid "Not now" msgstr "Ne zdaj" -#: ../libempathy-gtk/empathy-chat.c:3553 +#: ../libempathy-gtk/empathy-chat.c:3694 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Poskusi znova" -#: ../libempathy-gtk/empathy-chat.c:3557 +#: ../libempathy-gtk/empathy-chat.c:3698 msgid "Wrong password; please try again:" msgstr "Napačno geslo; poskusite znova:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3687 +#: ../libempathy-gtk/empathy-chat.c:3828 msgid "This room is protected by a password:" msgstr "Klepetalnica je zaščitena z geslom:" -#: ../libempathy-gtk/empathy-chat.c:3714 +#: ../libempathy-gtk/empathy-chat.c:3855 msgid "Join" msgstr "Pridruži se" -#: ../libempathy-gtk/empathy-chat.c:3902 -#: ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:4047 +#: ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Povezano" -#: ../libempathy-gtk/empathy-chat.c:3957 +#: ../libempathy-gtk/empathy-chat.c:4102 msgid "Conversation" msgstr "Pogovor" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3962 +#: ../libempathy-gtk/empathy-chat.c:4107 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Neznano ali neveljavno določilo" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Blokiranje stikov začasno ni na voljo" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Blokiranje stika ni na voljo" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Dovoljenje je zavrnjeno" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Stika ni mogoče blokirati" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Uredi blokirane stike" @@ -1628,7 +1606,7 @@ msgstr "Uredi blokirane stike" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1475 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" @@ -1663,39 +1641,30 @@ msgstr "_Odpri povezavo" msgid "%A %B %d %Y" msgstr "%A, %d. %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:287 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Uredi podrobnosti stika" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:338 -msgid "Personal Information" -msgstr "Osebni podatki" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:439 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "Nov stik" -#: ../libempathy-gtk/empathy-contact-dialogs.c:508 -#: ../libempathy-gtk/empathy-individual-dialogs.c:198 +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "Ali želite blokirati %s?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:513 -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 #, 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?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:518 -#: ../libempathy-gtk/empathy-individual-dialogs.c:275 +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 msgid "_Block" msgstr "_Blokiraj" -#: ../libempathy-gtk/empathy-contact-dialogs.c:536 -#: ../libempathy-gtk/empathy-individual-dialogs.c:284 +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Poročaj te stike kot žaljive" @@ -1715,73 +1684,6 @@ msgstr "Zahteva po naročilu" msgid "_Block User" msgstr "_Blokiraj_uporabnika" -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../libempathy-gtk/empathy-individual-menu.c:1558 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "_Dodaj stik ..." - -#: ../libempathy-gtk/empathy-contact-menu.c:287 -msgid "_Block Contact" -msgstr "_Blokiraj stik" - -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:316 -#: ../libempathy-gtk/empathy-individual-menu.c:789 -#: ../libempathy-gtk/empathy-new-message-dialog.c:320 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "_Klepet" - -#: ../libempathy-gtk/empathy-contact-menu.c:348 -#: ../libempathy-gtk/empathy-individual-menu.c:881 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Zvočni klic" - -#: ../libempathy-gtk/empathy-contact-menu.c:381 -#: ../libempathy-gtk/empathy-individual-menu.c:926 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Video klic" - -#: ../libempathy-gtk/empathy-contact-menu.c:427 -#: ../libempathy-gtk/empathy-individual-menu.c:979 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "Predhodni po_govori" - -#: ../libempathy-gtk/empathy-contact-menu.c:449 -#: ../libempathy-gtk/empathy-individual-menu.c:1020 -msgid "Send File" -msgstr "Pošlji datoteko" - -#: ../libempathy-gtk/empathy-contact-menu.c:472 -#: ../libempathy-gtk/empathy-individual-menu.c:1062 -msgid "Share My Desktop" -msgstr "Souporaba namizja" - -#: ../libempathy-gtk/empathy-contact-menu.c:501 -#: ../libempathy-gtk/empathy-individual-menu.c:1125 -msgid "Infor_mation" -msgstr "_Podrobnosti" - -#: ../libempathy-gtk/empathy-contact-menu.c:547 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "_Uredi" - -#: ../libempathy-gtk/empathy-contact-menu.c:601 -#: ../libempathy-gtk/empathy-individual-menu.c:1316 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Vabila v klepetalnico" - -#: ../libempathy-gtk/empathy-contact-menu.c:632 -#: ../libempathy-gtk/empathy-individual-menu.c:1362 -msgid "_Invite to Chat Room" -msgstr "_Povabi v klepetalnico" - #. Title #: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" @@ -1807,133 +1709,133 @@ msgstr "Predstavitveno sporočilo:" msgid "Please let me see when you're online. Thanks!" msgstr "Želel bi videti, kdaj ste na zvezi. Hvala!" -#: ../libempathy-gtk/empathy-contact-widget.c:571 +#: ../libempathy-gtk/empathy-contact-widget.c:568 #: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Kanali:" -#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-contact-widget.c:748 #: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "ISO oznaka države:" -#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-contact-widget.c:750 #: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Država:" -#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-contact-widget.c:752 #: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Okraj:" -#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-contact-widget.c:754 #: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Mesto:" -#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-contact-widget.c:756 #: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Področje:" -#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-contact-widget.c:758 #: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Poštna številka:" -#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-contact-widget.c:760 #: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Ulica:" -#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-contact-widget.c:762 #: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Stavba:" -#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-contact-widget.c:764 #: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Nadstropje:" -#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-contact-widget.c:766 #: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Klepetalnica:" -#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-contact-widget.c:768 #: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Besedilo:" -#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-contact-widget.c:770 #: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Opis:" -#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-contact-widget.c:772 #: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:774 #: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Raven natančnosti:" -#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-contact-widget.c:776 #: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Napaka:" -#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-contact-widget.c:778 #: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Napaka navpično (v metrih):" -#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-contact-widget.c:780 #: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Napaka vodoravno (v metrih):" -#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-contact-widget.c:782 #: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Hitrost:" -#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-contact-widget.c:784 #: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Smer:" -#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-contact-widget.c:786 #: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Hitrost dviganja:" -#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-contact-widget.c:788 #: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Zadnjič posodobljeno:" -#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-contact-widget.c:790 #: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Zemljepisna dolžina:" -#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-contact-widget.c:792 #: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Zemljepisna širina:" -#: ../libempathy-gtk/empathy-contact-widget.c:797 +#: ../libempathy-gtk/empathy-contact-widget.c:794 #: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Nadmorska višina:" -#: ../libempathy-gtk/empathy-contact-widget.c:850 -#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-contact-widget.c:847 +#: ../libempathy-gtk/empathy-contact-widget.c:862 #: ../libempathy-gtk/empathy-individual-widget.c:593 #: ../libempathy-gtk/empathy-individual-widget.c:608 #: ../src/empathy-preferences.ui.h:15 @@ -1941,33 +1843,27 @@ msgid "Location" msgstr "Mesto" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:867 +#: ../libempathy-gtk/empathy-contact-widget.c:864 #: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:919 +#: ../libempathy-gtk/empathy-contact-widget.c:916 #: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%e.%B %Y ob %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1001 -#: ../libempathy-gtk/empathy-individual-widget.c:901 +#: ../libempathy-gtk/empathy-contact-widget.c:998 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Shrani podobo" -#: ../libempathy-gtk/empathy-contact-widget.c:1057 -#: ../libempathy-gtk/empathy-individual-widget.c:959 +#: ../libempathy-gtk/empathy-contact-widget.c:1054 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Ni mogoče shraniti podobe" -#: ../libempathy-gtk/empathy-contact-widget.c:1745 -#: ../libempathy-gtk/empathy-individual-menu.c:1097 -#: ../libempathy-gtk/empathy-individual-widget.c:1358 -msgid "Favorite" -msgstr "Priljubljeno" - #: ../libempathy-gtk/empathy-contactinfo-utils.c:104 msgid "Full name" msgstr "Polno Ime" @@ -2039,7 +1935,7 @@ msgstr "Mesto na (datum)\t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1294 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "Vzdevek:" @@ -2059,7 +1955,7 @@ msgstr "Podrobnosti stika" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1503 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "Določilo:" @@ -2076,29 +1972,29 @@ msgstr "OS:" msgid "Version:" msgstr "Različica:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "Skupine" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 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:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "_Dodaj skupino" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Izbor" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1952 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1919 msgid "Group" msgstr "Skupina" -#: ../libempathy-gtk/empathy-individual-dialogs.c:258 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Naslednje identitete bodo blokirane:" @@ -2106,7 +2002,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:265 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 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:" @@ -2114,6 +2010,10 @@ 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-edit-dialog.c:247 +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:288 msgid "Linked Contacts" @@ -2134,88 +2034,145 @@ msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj." #. 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:148 +#: ../libempathy-gtk/empathy-individual-menu.c:181 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:312 +#: ../libempathy-gtk/empathy-individual-menu.c:363 msgid "Select account to use to place the call" msgstr "Izbor računa za klicanje" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:316 +#: ../libempathy-gtk/empathy-individual-menu.c:367 #: ../libempathy-gtk/empathy-log-window.ui.h:2 #: ../src/empathy-streamed-media-window.c:1288 #: ../src/empathy-call-window.ui.h:2 msgid "Call" msgstr "Kliči" -#: ../libempathy-gtk/empathy-individual-menu.c:381 +#: ../libempathy-gtk/empathy-individual-menu.c:432 msgid "Mobile" msgstr "Mobilni telefon" -#: ../libempathy-gtk/empathy-individual-menu.c:383 +#: ../libempathy-gtk/empathy-individual-menu.c:434 msgid "Work" msgstr "Delo" -#: ../libempathy-gtk/empathy-individual-menu.c:385 +#: ../libempathy-gtk/empathy-individual-menu.c:436 msgid "HOME" msgstr "Domača mapa" +#: ../libempathy-gtk/empathy-individual-menu.c:677 +msgid "_Block Contact" +msgstr "_Blokiraj stik" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "_Chat" +msgstr "_Klepet" + #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:836 -#: ../libempathy-gtk/empathy-new-message-dialog.c:314 +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1174 +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Zvočni klic" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Video klic" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "_Previous Conversations" +msgstr "Predhodni po_govori" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +msgid "Send File" +msgstr "Pošlji datoteko" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "Souporaba namizja" + +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Priljubljeno" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "_Podrobnosti" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Uredi" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1200 +#: ../libempathy-gtk/empathy-individual-menu.c:1385 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "_Poveži stike ..." -#: ../libempathy-gtk/empathy-individual-view.c:2362 +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1166 +msgid "Inviting you to this room" +msgstr "Vabila v klepetalnico" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +msgid "_Invite to Chat Room" +msgstr "_Povabi v klepetalnico" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Add Contact…" +msgstr "_Dodaj stik ..." + +#: ../libempathy-gtk/empathy-individual-view.c:2307 msgid "Delete and _Block" msgstr "Izbriši in _blokiraj" -#: ../libempathy-gtk/empathy-individual-view.c:2397 +#: ../libempathy-gtk/empathy-individual-view.c:2342 #, 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:2400 +#: ../libempathy-gtk/empathy-individual-view.c:2345 msgid "Removing group" msgstr "Odstranjevanje skupine" #. Remove -#: ../libempathy-gtk/empathy-individual-view.c:2455 -#: ../libempathy-gtk/empathy-individual-view.c:2672 +#: ../libempathy-gtk/empathy-individual-view.c:2400 +#: ../libempathy-gtk/empathy-individual-view.c:2617 msgid "_Remove" msgstr "_Odstrani" -#: ../libempathy-gtk/empathy-individual-view.c:2532 +#: ../libempathy-gtk/empathy-individual-view.c:2477 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Ali zares želite odstraniti stik '%s'?" -#: ../libempathy-gtk/empathy-individual-view.c:2541 +#: ../libempathy-gtk/empathy-individual-view.c:2486 #, 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." -#: ../libempathy-gtk/empathy-individual-view.c:2553 +#: ../libempathy-gtk/empathy-individual-view.c:2498 msgid "Removing contact" msgstr "Odstranjevanje stika" -#: ../libempathy-gtk/empathy-individual-widget.c:1642 +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2232,19 +2189,19 @@ msgstr "Mesto 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:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "Novo omrežje" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "Izbor IRC omrežja" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "Ponastavi seznam _omrežij" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Izbor" @@ -2295,48 +2252,48 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "_Odstrani povezavo" -#: ../libempathy-gtk/empathy-log-window.c:621 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Zgodovina" -#: ../libempathy-gtk/empathy-log-window.c:676 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Pokaži" -#: ../libempathy-gtk/empathy-log-window.c:698 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Poišči" -#: ../libempathy-gtk/empathy-log-window.c:1147 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Klepet v %s" -#: ../libempathy-gtk/empathy-log-window.c:1149 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Klepet s stikom %s" -#: ../libempathy-gtk/empathy-log-window.c:1199 -#: ../libempathy-gtk/empathy-log-window.c:1346 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 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:1288 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1294 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1370 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" @@ -2345,7 +2302,7 @@ msgstr[1] "%s sekunda" msgstr[2] "%s sekundi" msgstr[3] "%s sekunde" -#: ../libempathy-gtk/empathy-log-window.c:1377 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" @@ -2354,80 +2311,80 @@ msgstr[1] "%s minuta" msgstr[2] "%s minuti" msgstr[3] "%s minute" -#: ../libempathy-gtk/empathy-log-window.c:1385 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Klic začet %s, končan %s" -#: ../libempathy-gtk/empathy-log-window.c:1719 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Danes" -#: ../libempathy-gtk/empathy-log-window.c:1723 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Včeraj" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1738 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e. %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1826 -#: ../libempathy-gtk/empathy-log-window.c:3458 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Kadarkoli" -#: ../libempathy-gtk/empathy-log-window.c:1915 -#: ../libempathy-gtk/empathy-log-window.c:2371 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Kdorkoli" -#: ../libempathy-gtk/empathy-log-window.c:2684 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Kdo" -#: ../libempathy-gtk/empathy-log-window.c:2893 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Kdaj" -#: ../libempathy-gtk/empathy-log-window.c:3009 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Karkoli" -#: ../libempathy-gtk/empathy-log-window.c:3011 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Besedilni klepet" -#: ../libempathy-gtk/empathy-log-window.c:3013 +#: ../libempathy-gtk/empathy-log-window.c:3044 #: ../src/empathy-preferences.ui.h:4 msgid "Calls" msgstr "Klici" -#: ../libempathy-gtk/empathy-log-window.c:3018 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Dohodni klici" -#: ../libempathy-gtk/empathy-log-window.c:3019 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Odhodni klici" -#: ../libempathy-gtk/empathy-log-window.c:3020 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Prezrti klici" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Kaj" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3782 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?" -#: ../libempathy-gtk/empathy-log-window.c:3755 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Počisti vse" -#: ../libempathy-gtk/empathy-log-window.c:3762 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Izbriši iz:" @@ -2457,7 +2414,7 @@ msgstr "Video" #: ../libempathy-gtk/empathy-log-window.ui.h:7 #: ../src/empathy-call-window.ui.h:28 #: ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 +#: ../src/empathy-roster-window-menubar.ui.h:20 msgid "_Edit" msgstr "_Uredi" @@ -2469,72 +2426,72 @@ msgstr "_Datoteka" msgid "page 2" msgstr "stran 2" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "Stik ni povezan v omrežje" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 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:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" msgstr "Stik ne podpira te vrste pogovora." -#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 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:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 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:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "S tega kanala ste izobčeni" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "Kanal je polno zaseden." -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 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:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" msgstr "Brez povezave ni mogoče nadaljevati." -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "Dovoljenje je zavrnjeno" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "Prišlo je do napake med začenjanjem pogovora" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "Vnesite določilo stika ali pa telefonsko številko:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:334 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Nov pogovor" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:226 +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "_Video Call" msgstr "_Video klic" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:236 +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 msgid "_Audio Call" msgstr "_Zvočni klic" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:246 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Nov klic" @@ -2659,12 +2616,12 @@ msgstr "Klic je končan" msgid "Edit Custom Messages" msgstr "Urejanje sporočila po meri" -#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "Sporočilo je bilo nazadnje spremenjeno ob %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1752 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "Običajno" @@ -2743,14 +2700,18 @@ msgid "Continue" msgstr "Nadaljuj" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "Nepreverjena povezava" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 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:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "Zapomni si izbor za prihodnje povezave" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "Podrobnosti potrdila" @@ -2943,31 +2904,31 @@ msgstr "zahodnoevropska" msgid "Vietnamese" msgstr "vietnamska" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Ni sporočil o napakah" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Hipno sporočanje (Empathy)" -#: ../src/empathy.c:433 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Brez samodejne povezave ob zagonu" -#: ../src/empathy.c:437 +#: ../src/empathy.c:441 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:452 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "- Empathy sporočilnik" -#: ../src/empathy.c:639 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Napaka delovanja upravljalnika računov" -#: ../src/empathy.c:641 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n" @@ -2989,11 +2950,11 @@ msgstr "Empathy se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA J 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:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Odjemalec hipnega sporočanja za namizje GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "Matej Urbančič " @@ -3023,168 +2984,177 @@ msgid "You can either go back and try to enter your accounts' details again or q msgstr "Lahko ponovno vnesete podatke svojega računa ali pa končate pomočnika in dodate račune kasneje preko menija Uredi." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1272 +#: ../src/empathy-account-assistant.c:1274 msgid "An error occurred" msgstr "Prišlo je do napake" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Kakšno vrsto klepetalnega računa imate?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "Ali želite nastaviti še kakšen drug račun?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Vnesite podrobnosti svojega računa" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Kakšne vrste klepetalni račun naj bo ustvarjen?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Ali želite ustvariti druge klepetalne račune?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Vnesite podrobnosti novega računa" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls." msgstr "S programom Empathy lahko klepetate s posamezniki, ki uporabljajo Google Talk, AIM, Windows Live in mnogo drugih klepetalnih programov. S spletno kamero in mikrofonom lahko uporabljate tudi zvočne ali video klice." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "Ali imate račun, ki ste ga uporabljali z drugim programom?" -#: ../src/empathy-account-assistant.c:653 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Da, uvoziti želim podrobnosti računa iz" -#: ../src/empathy-account-assistant.c:674 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Da, takoj želim vnesti podrobnosti računa" -#: ../src/empathy-account-assistant.c:696 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Ne, ustvariti želim nov račun" -#: ../src/empathy-account-assistant.c:706 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Ne, želim le videti ljudi, povezane v bližini" -#: ../src/empathy-account-assistant.c:727 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Izbor račune za uvoz:" -#: ../src/empathy-account-assistant.c:814 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Da" -#: ../src/empathy-account-assistant.c:821 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Ne, to je trenutno vse" -#: ../src/empathy-account-assistant.c:1086 +#: ../src/empathy-account-assistant.c:1088 msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog" msgstr "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki istega omrežja. V primeru, da želite uporabljati to možnost, preverite spodnje podatke. Možnosti je mogoče spreminjati tudi kasneje v pogovornemu oknu 'računi'." -#: ../src/empathy-account-assistant.c:1092 -#: ../src/empathy-account-assistant.c:1148 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1150 msgid "Edit->Accounts" msgstr "Uredi->Računi" -#: ../src/empathy-account-assistant.c:1108 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "Te možnosti trenutno _ne želim omogočiti" -#: ../src/empathy-account-assistant.c:1144 +#: ../src/empathy-account-assistant.c:1146 msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog" msgstr "Ni mogoče klepetati z uporabniki, povezanimi v krajevnem omrežju, saj paket telepathy-salut ni nameščen. V primeru, da želite to možnost omogočiti, namestite zahtevani paket in ustvarite račun bližnjih uporabnikov med možnostmi računa." -#: ../src/empathy-account-assistant.c:1150 +#: ../src/empathy-account-assistant.c:1152 msgid "telepathy-salut not installed" msgstr "telepathy-salut ni nameščen" -#: ../src/empathy-account-assistant.c:1196 +#: ../src/empathy-account-assistant.c:1198 msgid "Messaging and VoIP Accounts Assistant" msgstr "Pomočnik sporočanja in računov VoIP" -#: ../src/empathy-account-assistant.c:1230 +#: ../src/empathy-account-assistant.c:1232 msgid "Welcome to Empathy" msgstr "Dobrodošli v program Empathy" -#: ../src/empathy-account-assistant.c:1239 +#: ../src/empathy-account-assistant.c:1241 msgid "Import your existing accounts" msgstr "Uvozite svoje obstoječe račune" -#: ../src/empathy-account-assistant.c:1257 +#: ../src/empathy-account-assistant.c:1259 msgid "Please enter personal details" msgstr "Vnesite osebne podatke" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, 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:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Novi račun še ni bil shranjen." -#: ../src/empathy-accounts-dialog.c:345 +#: ../src/empathy-accounts-dialog.c:344 #: ../src/empathy-streamed-media-window.c:757 #: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "Povezovanje ..." -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:385 #, c-format msgid "Offline — %s" msgstr "Brez povezave - %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:397 #, c-format msgid "Disconnected — %s" msgstr "Prekinjena povezava - %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:408 msgid "Offline — No Network Connection" msgstr "Brez povezave - ni omrežne povezave" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:415 msgid "Unknown Status" msgstr "Neznano stanje" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:427 msgid "Offline — Account Disabled" msgstr "Brez povezave - račun je onemogočen" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Ustvarjen bo nov račun, trenutne spremembe pa bodo izgubljene!\n" -"Ali ste prepričani, da želite nadaljevati?" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "Uredi parametre povezave" + +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "Pridobivanje osebnih podrobnosti s strežnika je spodletelo." + +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "Prijava v omrežje za urejanje osebnih podrobnosti." -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "_Uredi parametre povezave ..." + +#: ../src/empathy-accounts-dialog.c:1289 #, 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:1196 +#: ../src/empathy-accounts-dialog.c:1293 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:1432 +#: ../src/empathy-accounts-dialog.c:1529 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3193,15 +3163,15 @@ msgstr "" "Ali ste prepričani, da želite nadaljevati?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1705 msgid "_Enable" msgstr "_Omogoči" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1706 msgid "_Disable" msgstr "O_nemogoči" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2176 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3233,11 +3203,11 @@ msgstr "Za dodajanje novega računa morate najprej namestiti zaledje za vsak pro msgid "_Import…" msgstr "_Uvozi ..." -#: ../src/empathy-auth-client.c:284 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr "- Empathy odjemalec overitve" -#: ../src/empathy-auth-client.c:300 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Empathy odjemalec overitve" @@ -3512,18 +3482,18 @@ msgstr "_Kamera" #: ../src/empathy-call-window.ui.h:26 #: ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "_Contents" msgstr "_Vsebina" #: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "_Debug" msgstr "_Razhroščevanje" #: ../src/empathy-call-window.ui.h:29 #: ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Help" msgstr "Pomo_č" @@ -3536,13 +3506,48 @@ msgid "_Settings" msgstr "_Nastavitve" #: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 +#: ../src/empathy-roster-window-menubar.ui.h:29 #: ../src/empathy-streamed-media-window.ui.h:25 msgid "_View" msgstr "_Pogled" -#: ../src/empathy-chat-window.c:481 -#: ../src/empathy-chat-window.c:501 +#: ../src/empathy-chat-window.c:285 +msgid "Close this window?" +msgstr "Ali naj se okno zapre?" + +#: ../src/empathy-chat-window.c:290 +#, 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." + +#: ../src/empathy-chat-window.c:301 +#, 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:310 +#, c-format +msgid "Leave %s?" +msgstr "Ali naj se prekine povezava s klepetalnico %s?" + +#: ../src/empathy-chat-window.c:311 +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:330 +msgid "Close window" +msgstr "Zapri okno" + +#: ../src/empathy-chat-window.c:330 +msgid "Leave room" +msgstr "Zapusti klepetalnico" + +#: ../src/empathy-chat-window.c:636 +#: ../src/empathy-chat-window.c:656 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -3551,7 +3556,7 @@ msgstr[1] "%s (%d neprebrano)" msgstr[2] "%s (%d neprebrani)" msgstr[3] "%s (%d neprebrana)" -#: ../src/empathy-chat-window.c:493 +#: ../src/empathy-chat-window.c:648 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -3560,7 +3565,7 @@ msgstr[1] "%s (in %u drugo)" msgstr[2] "%s (in %u drugi)" msgstr[3] "%s (in %u druga)" -#: ../src/empathy-chat-window.c:509 +#: ../src/empathy-chat-window.c:664 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -3569,7 +3574,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:518 +#: ../src/empathy-chat-window.c:673 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -3578,11 +3583,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:733 +#: ../src/empathy-chat-window.c:888 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:743 +#: ../src/empathy-chat-window.c:898 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3591,7 +3596,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:765 +#: ../src/empathy-chat-window.c:920 msgid "Typing a message." msgstr "Pisanje sporočila." @@ -3672,102 +3677,102 @@ msgstr "Samodejno povezovanje" msgid "Manage Favorite Rooms" msgstr "Upravljanje priljubljenih klepetalnic" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Dohodni video klic" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 #: ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "Dohodni klic" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, 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:526 +#: ../src/empathy-event-manager.c:528 #, 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:529 -#: ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 +#: ../src/empathy-event-manager.c:531 +#: ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 #: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "Dohodni klic od %s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "_Zavrni" -#: ../src/empathy-event-manager.c:562 -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 +#: ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_Odgovori" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "_Odgovori z videom" -#: ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 +#: ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 #: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" msgstr "Dohodni video klic od %s" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Vabilo v klepetalnico" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Povabilo v %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, 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:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_Odkloni" -#: ../src/empathy-event-manager.c:858 +#: ../src/empathy-event-manager.c:860 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Pridruži se" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s vas je povabil v %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "Povabljeni ste v %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Prihajajoč prenos datoteke od %s" -#: ../src/empathy-event-manager.c:1145 -#: ../src/empathy-main-window.c:377 +#: ../src/empathy-event-manager.c:1147 +#: ../src/empathy-roster-window.c:371 msgid "Password required" msgstr "Zahtevano geslo" -#: ../src/empathy-event-manager.c:1210 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s želi dovoljenje za pogled dosegljivosti" -#: ../src/empathy-event-manager.c:1214 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3777,108 +3782,108 @@ msgstr "" "Sporočilo: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s od %s pri %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, 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:306 +#: ../src/empathy-ft-manager.c:305 #, 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:309 +#: ../src/empathy-ft-manager.c:308 #, 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:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Napaka med prejemanjem \"%s\" od %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Napaka med prejemanjem datoteke" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Napaka med pošiljanjem \"%s\" k %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 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:489 +#: ../src/empathy-ft-manager.c:488 #, 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:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "\"%s\" poslano %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Prenos datoteke je končan" -#: ../src/empathy-ft-manager.c:616 -#: ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 +#: ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Čakanje na odziv drugega udeleženca" -#: ../src/empathy-ft-manager.c:642 -#: ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 +#: ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Preverjanje celovitosti \"%s\"" -#: ../src/empathy-ft-manager.c:645 -#: ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 +#: ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Ustvarjanje razpršila \"%s\"" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Datoteka" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Preostalo" @@ -3899,163 +3904,159 @@ msgid "Import Accounts" msgstr "Uvozi račune" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "Uvozi" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Protokol" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Vir" -#: ../src/empathy-main-window.c:394 +#: ../src/empathy-roster-window.c:388 msgid "Provide Password" msgstr "Vpis gesla" -#: ../src/empathy-main-window.c:400 +#: ../src/empathy-roster-window.c:394 msgid "Disconnect" msgstr "Prekini povezavo" -#: ../src/empathy-main-window.c:637 +#: ../src/empathy-roster-window.c:626 msgid "No match found" msgstr "Ni najdenih zadetkov." -#: ../src/empathy-main-window.c:745 +#: ../src/empathy-roster-window.c:733 #, 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." -#: ../src/empathy-main-window.c:813 +#: ../src/empathy-roster-window.c:799 msgid "Update software..." msgstr "Posodobitev programske opreme ..." -#: ../src/empathy-main-window.c:819 -#: ../src/empathy-main-window.c:940 +#: ../src/empathy-roster-window.c:805 +#: ../src/empathy-roster-window.c:922 msgid "Close" msgstr "Zapri" -#: ../src/empathy-main-window.c:928 +#: ../src/empathy-roster-window.c:910 msgid "Reconnect" msgstr "Ponovno se poveži" -#: ../src/empathy-main-window.c:934 +#: ../src/empathy-roster-window.c:916 msgid "Edit Account" msgstr "Uredi račun" #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:1073 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1060 #, c-format msgid "Top up %s (%s)..." msgstr "Povišaj %s (%s) ..." -#: ../src/empathy-main-window.c:1120 +#: ../src/empathy-roster-window.c:1106 msgid "Top up account credit" msgstr "Povišaj znesek na računu" #. top up button -#: ../src/empathy-main-window.c:1191 +#: ../src/empathy-roster-window.c:1178 msgid "Top Up..." msgstr "Povišaj ..." -#: ../src/empathy-main-window.c:1934 +#: ../src/empathy-roster-window.c:1901 msgid "Contact" msgstr "Stik" -#: ../src/empathy-main-window.c:2309 +#: ../src/empathy-roster-window.c:2288 msgid "Contact List" msgstr "Seznam stikov" -#: ../src/empathy-main-window-menubar.ui.h:1 +#: ../src/empathy-roster-window-menubar.ui.h:1 msgid "Contacts on a _Map" msgstr "Stiki na _zemljevidu" -#: ../src/empathy-main-window-menubar.ui.h:2 +#: ../src/empathy-roster-window-menubar.ui.h:2 msgid "Credit Balance" msgstr "Stanje na računu" -#: ../src/empathy-main-window-menubar.ui.h:3 +#: ../src/empathy-roster-window-menubar.ui.h:3 msgid "Find in Contact _List" msgstr "Najdi v _seznamu stikov" -#: ../src/empathy-main-window-menubar.ui.h:4 +#: ../src/empathy-roster-window-menubar.ui.h:4 msgid "Join _Favorites" msgstr "Pridruži se _priljubljenim" -#: ../src/empathy-main-window-menubar.ui.h:5 +#: ../src/empathy-roster-window-menubar.ui.h:5 msgid "Manage Favorites" msgstr "Uredi priljubljene" -#: ../src/empathy-main-window-menubar.ui.h:6 +#: ../src/empathy-roster-window-menubar.ui.h:6 msgid "N_ormal Size" msgstr "_Običajna velikost" -#: ../src/empathy-main-window-menubar.ui.h:7 +#: ../src/empathy-roster-window-menubar.ui.h:7 #: ../src/empathy-status-icon.ui.h:1 msgid "New _Call…" msgstr "Nov _klic ..." -#: ../src/empathy-main-window-menubar.ui.h:8 +#: ../src/empathy-roster-window-menubar.ui.h:8 msgid "Normal Size With _Avatars" msgstr "Običajna velikost s _podobami" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:9 msgid "P_references" msgstr "_Možnosti" -#: ../src/empathy-main-window-menubar.ui.h:10 +#: ../src/empathy-roster-window-menubar.ui.h:10 msgid "Show P_rotocols" msgstr "Pokaži _protokole" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:11 msgid "Sort by _Name" msgstr "Razvrsti po _imenu" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:12 msgid "Sort by _Status" msgstr "Razvrsti po _stanju" -#: ../src/empathy-main-window-menubar.ui.h:13 +#: ../src/empathy-roster-window-menubar.ui.h:13 msgid "_Accounts" msgstr "_Računi" -#: ../src/empathy-main-window-menubar.ui.h:15 +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "_Blocked Contacts" msgstr "_Blokirani stiki" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:17 msgid "_Compact Size" msgstr "_Skrčen pogled" -#: ../src/empathy-main-window-menubar.ui.h:21 +#: ../src/empathy-roster-window-menubar.ui.h:21 msgid "_File Transfers" msgstr "Prenosi _datotek" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:23 msgid "_Join…" msgstr "_Pridruži se" -#: ../src/empathy-main-window-menubar.ui.h:24 +#: ../src/empathy-roster-window-menubar.ui.h:24 #: ../src/empathy-status-icon.ui.h:3 msgid "_New Conversation…" msgstr "_Nov pogovor ..." -#: ../src/empathy-main-window-menubar.ui.h:25 +#: ../src/empathy-roster-window-menubar.ui.h:25 msgid "_Offline Contacts" msgstr "Nepri_sotni stiki" -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "_Osebni podatki" - -#: ../src/empathy-main-window-menubar.ui.h:28 +#: ../src/empathy-roster-window-menubar.ui.h:27 msgid "_Room" msgstr "_Klepetalnica" -#: ../src/empathy-main-window-menubar.ui.h:29 +#: ../src/empathy-roster-window-menubar.ui.h:28 msgid "_Search for Contacts…" msgstr "Iskanje _stikov ..." @@ -4069,7 +4070,7 @@ msgstr "Člani" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:623 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4082,16 +4083,16 @@ msgstr "" "Zahtevano geslo: %s\n" "Člani: %s" -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "Ne" -#: ../src/empathy-new-chatroom-dialog.c:654 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "Seznama klepetalnic ni bilo mogoče začeti" -#: ../src/empathy-new-chatroom-dialog.c:664 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "Seznama klepetalnic ni bilo mogoče dokončati" @@ -4132,7 +4133,7 @@ msgid "New conversation" msgstr "Nov pogovor" #: ../src/empathy-preferences.c:169 -msgid "Contact goes online" +msgid "Contact comes online" msgstr "Stik se je povezal" #: ../src/empathy-preferences.c:170 @@ -4152,46 +4153,46 @@ msgid "Language" msgstr "Jezik" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:725 +#: ../src/empathy-preferences.c:726 msgid "Juliet" msgstr "Julija" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:732 +#: ../src/empathy-preferences.c:733 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:738 +#: ../src/empathy-preferences.c:739 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:741 +#: ../src/empathy-preferences.c:743 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:744 +#: ../src/empathy-preferences.c:746 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:747 +#: ../src/empathy-preferences.c:749 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:750 +#: ../src/empathy-preferences.c:752 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:753 +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" msgstr "Julija je prekinila povezavo." -#: ../src/empathy-preferences.c:1157 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "Možnosti" @@ -4284,49 +4285,49 @@ msgid "Spell Checking" msgstr "Preverjanje črkovanja" #: ../src/empathy-preferences.ui.h:26 +msgid "Start chats in:" +msgstr "Začni klepet v:" + +#: ../src/empathy-preferences.ui.h:27 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:27 +#: ../src/empathy-preferences.ui.h:28 msgid "Themes" msgstr "Teme" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:29 msgid "Use _echo cancellation to improve call quality" msgstr "Uporabi _podporo odpravljanja odmevov za izboljšanje kakovosti klica." -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:30 msgid "Variant:" msgstr "Različica:" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:31 msgid "_Automatically connect on startup" msgstr "Samodejno _poveži ob zagonu " -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:32 msgid "_Cellphone" msgstr "_Mobilni telefon" -#: ../src/empathy-preferences.ui.h:32 +#: ../src/empathy-preferences.ui.h:33 msgid "_Enable bubble notifications" msgstr "_Omogoči obvestila v oblačkih" -#: ../src/empathy-preferences.ui.h:33 +#: ../src/empathy-preferences.ui.h:34 msgid "_Enable sound notifications" msgstr "_Omogoči zvočna obvestila" -#: ../src/empathy-preferences.ui.h:34 +#: ../src/empathy-preferences.ui.h:35 msgid "_GPS" msgstr "_GPS" -#: ../src/empathy-preferences.ui.h:35 +#: ../src/empathy-preferences.ui.h:36 msgid "_Network (IP, Wi-Fi)" msgstr "_Omrežje (IP, Wifi)" -#: ../src/empathy-preferences.ui.h:36 -msgid "_Open new chats in separate windows" -msgstr "N_ove klepete odpiraj v ločenih oknih" - #: ../src/empathy-preferences.ui.h:37 msgid "_Publish location to my contacts" msgstr "O_bjavi mesto mojim stikom" @@ -4336,6 +4337,14 @@ msgstr "O_bjavi mesto mojim stikom" msgid "_Reduce location accuracy" msgstr "_Zmanjšaj natančnost mesta" +#: ../src/empathy-preferences.ui.h:40 +msgid "new _windows" +msgstr "nova _okna" + +#: ../src/empathy-preferences.ui.h:41 +msgid "new ta_bs" +msgstr "novi _zavihki" + #: ../src/empathy-status-icon.ui.h:2 msgid "Status" msgstr "Stanje" @@ -4392,7 +4401,7 @@ msgstr "Video je omogočen" msgid "Video Preview" msgstr "Predogled videa" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Prikaz zemljevida stikov" @@ -4457,16 +4466,16 @@ msgstr "Raven" 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-invite-participant-dialog.c:197 -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Povabi udeležence" -#: ../src/empathy-invite-participant-dialog.c:198 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Izbor stika za povabilo v pogovor:" -#: ../src/empathy-invite-participant-dialog.c:221 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Povabi" @@ -4597,6 +4606,51 @@ msgstr "Povišaj" msgid "_Match case" msgstr "_Upoštevaj velikost črk" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Dodajanje novega računa" + +#~ msgid "_Open new chats in separate windows" +#~ msgstr "N_ove klepete odpiraj v ločenih oknih" + +#~ msgid "Socket type not supported" +#~ msgstr "Vrsta vtičnice ni podprta" + +#~ msgid "My Web Accounts" +#~ msgstr "Moji spletni računi" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "Račun %s se ureja preko %s." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "Računa %s s programom Empathy ni mogoče urejati." + +#~ msgid "Launch My Web Accounts" +#~ msgstr "Zaženi spletne račune" + +#~ msgid "Edit %s" +#~ msgstr "Uredi %s" + +#~ msgid "Ca_ncel" +#~ msgstr "_Prekliči" + +#~ msgid "Personal Information" +#~ msgstr "Osebni podatki" +#~ msgctxt "Edit contact (contextual menu)" + +#~ msgid "_Edit" +#~ msgstr "_Uredi" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "Ustvarjen bo nov račun, trenutne spremembe pa bodo izgubljene!\n" +#~ "Ali ste prepričani, da želite nadaljevati?" + +#~ msgid "_Personal Information" +#~ msgstr "_Osebni podatki" + #~ msgid "Call volume" #~ msgstr "Glasnost klica" diff --git a/po/sr.po b/po/sr.po index 69363567..e1fcd4b0 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,5 +1,5 @@ # Serbian translation of Empathy -# Courtesy of Prevod.org team (http://prevod.org/) -- 2003-2009. +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012. # This file is distributed under the same license as the Empathy package. # From Pidgin translation: # Danilo Segan , 2003, 2004, 2005. @@ -11,524 +11,563 @@ # Reviewed on 11.05.2009 by Милош Поповић # Милош Поповић , 2010. # Бранко Кокановић , 2011. -# Мирослав Николић , 2011. +# Мирослав Николић , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: empathy\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2011-09-19 19:10+0000\n" -"PO-Revision-Date: 2011-09-19 11:52+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath" +"y&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2012-02-13 13:31+0000\n" +"PO-Revision-Date: 2012-02-14 10:31+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%" -"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Virtaal 0.6.1\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " +"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "" -"Ћаскајте на Гугл разговору, Фејсбуку, МСН-у и на многим другим сервисима за " -"ћаскање" - -#: ../data/empathy.desktop.in.in.h:2 msgid "Empathy" msgstr "Интернет писмоноша" +#: ../data/empathy.desktop.in.in.h:2 +msgid "IM Client" +msgstr "Програм за брзе поруке" + #: ../data/empathy.desktop.in.in.h:3 msgid "Empathy Internet Messaging" msgstr "Дописивање преко Интернет писмоноше" #: ../data/empathy.desktop.in.in.h:4 -msgid "IM Client" -msgstr "Програм за брзе поруке" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "" +"Ћаскајте на Гугл разговору, Фејсбуку, МСН-у и на многим другим сервисима за " +"ћаскање" #: ../data/org.gnome.Empathy.gschema.xml.in.h:1 -msgid "Always open a separate chat window for new chats." -msgstr "Увек отвара посебан прозор за нова ћаскања." +msgid "Connection managers should be used" +msgstr "Да ли ће бити коришћен управник мрежом" +# Није connect већ disconnect!!! ~Милош #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Јачина звука позива" +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." +msgstr "" +"Да ли треба користити управника мреже за аутоматско прекидање и поновно " +"успостављање везе." #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Јачина звука позива, у процентима." +msgid "Empathy should auto-connect on startup" +msgstr "Да ли Писмоноша да сам успоставити везу по покретању" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -msgid "Camera device" -msgstr "Уређај камерице" +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "Да ли Писмоноша да се сам пријави на постојеће налоге након покретања." #: ../data/org.gnome.Empathy.gschema.xml.in.h:5 -msgid "Camera position" -msgstr "Положај камерице" +msgid "Empathy should auto-away when idle" +msgstr "Да ли Писмоноша да пређе у стање аутоматског одсуства у мировању" #: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." +"Whether Empathy should go into away mode automatically if the user is idle." msgstr "" -"Знак за додавање после надимка када се користи аутоматско довршавање надимка " -"(таб) у групним ћаскањима." +"Да ли Писмоноша да аутоматски пређе у стање одсуства приликом мировања." #: ../data/org.gnome.Empathy.gschema.xml.in.h:7 -msgid "Chat window theme" -msgstr "Тема прозора за ћаскање" +msgid "Empathy default download folder" +msgstr "Писмоношина подразумевана фасцикла за преузимања" #: ../data/org.gnome.Empathy.gschema.xml.in.h:8 -msgid "Chat window theme variant" -msgstr "Варијанта теме прозора за ћаскање" +msgid "The default folder to save file transfers in." +msgstr "Подразумевана фасцикла за чување пренесених датотека." #: ../data/org.gnome.Empathy.gschema.xml.in.h:9 -msgid "" -"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "" -"Списак језика одвојен зарезима које користи провера правописа (нпр. „sr, en, " -"fr“)." +msgid "Show offline contacts" +msgstr "Приказује пријатеље ван мреже" #: ../data/org.gnome.Empathy.gschema.xml.in.h:10 -msgid "Compact contact list" -msgstr "Збијени списак пријатеља" +msgid "Whether to show contacts that are offline in the contact list." +msgstr "Да ли да приказује неповезане пријатеље у списку пријатеља." #: ../data/org.gnome.Empathy.gschema.xml.in.h:11 -msgid "Connection managers should be used" -msgstr "Да ли ће бити коришћен управник мрежом" +msgid "Show avatars" +msgstr "Приказује слике" #: ../data/org.gnome.Empathy.gschema.xml.in.h:12 -msgid "Contact list sort criterion" -msgstr "Критеријум за сортирање пријатеља" +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "" +"Да ли да приказује слике за пријатеље у списку пријатеља и прозору ћаскања." #: ../data/org.gnome.Empathy.gschema.xml.in.h:13 -msgid "Default camera device to use in video calls, e.g. /dev/video0." -msgstr "" -"Основна видео камерица која ће бити коришћена у видео позивима, нпр. „/dev/" -"video0“." +msgid "Show protocols" +msgstr "Приказује протоколе" #: ../data/org.gnome.Empathy.gschema.xml.in.h:14 -msgid "Default directory to select an avatar image from" -msgstr "Подразумевана фасцикла за избор слике" +msgid "Whether to show protocols for contacts in the contact list." +msgstr "" +"Да ли да приказује слике за пријатеље у списку пријатеља и прозору ћаскања." #: ../data/org.gnome.Empathy.gschema.xml.in.h:15 -msgid "Disable popup notifications when away" -msgstr "Искључује искачућа обавештења када смо одсутни" +msgid "Show Balance in contact list" +msgstr "Приказује готовину на списку пријатеља" #: ../data/org.gnome.Empathy.gschema.xml.in.h:16 -msgid "Disable sounds when away" -msgstr "Онемогућава звуке када смо одсутни" +msgid "Whether to show account balances in the contact list." +msgstr "Да ли да приказује износ готовине налога у списку пријатеља." #: ../data/org.gnome.Empathy.gschema.xml.in.h:17 -msgid "Display incoming events in the status area" -msgstr "Приказује долазне догађаје на линији стања" +msgid "Compact contact list" +msgstr "Збијени списак пријатеља" #: ../data/org.gnome.Empathy.gschema.xml.in.h:18 -msgid "" -"Display incoming events in the status area. If false, present them to the " -"user immediately." -msgstr "" -"Приказује долазне догађаје на линији стања. Ако није постављено, одмах их " -"приказује кориснику." +msgid "Whether to show the contact list in compact mode." +msgstr "Да ли да приказује списак пријатеља у збијеном режиму." #: ../data/org.gnome.Empathy.gschema.xml.in.h:19 -msgid "Echo cancellation support" -msgstr "Подршка за уклањање одјека" +msgid "Hide main window" +msgstr "Сакрива главни прозор" #: ../data/org.gnome.Empathy.gschema.xml.in.h:20 -msgid "Empathy can publish the user's location" -msgstr "Да ли Писмоноша сме да објављује локацију корисника" +msgid "Hide the main window." +msgstr "Сакрива главни прозор програма." #: ../data/org.gnome.Empathy.gschema.xml.in.h:21 -msgid "Empathy can use the GPS to guess the location" -msgstr "Да ли Писмоноша сме да користи ГПС да погоди локацију" +msgid "Default directory to select an avatar image from" +msgstr "Подразумевана фасцикла за избор слике" #: ../data/org.gnome.Empathy.gschema.xml.in.h:22 -msgid "Empathy can use the cellular network to guess the location" -msgstr "Да ли Писмоноша сме да користи мобилну мрежу да погоди локацију" +msgid "The last directory that an avatar image was chosen from." +msgstr "Последња фасцикла из које је изабрана слика." #: ../data/org.gnome.Empathy.gschema.xml.in.h:23 -msgid "Empathy can use the network to guess the location" -msgstr "Да ли Писмоноша сме да користи мрежу да погоди локацију" +msgid "Open new chats in separate windows" +msgstr "Отвара нова ћаскања у различитим прозорима" #: ../data/org.gnome.Empathy.gschema.xml.in.h:24 -msgid "Empathy default download folder" -msgstr "Писмоношина подразумевана фасцикла за преузимања" +msgid "Always open a separate chat window for new chats." +msgstr "Увек отвара посебан прозор за нова ћаскања." #: ../data/org.gnome.Empathy.gschema.xml.in.h:25 -msgid "Empathy has migrated butterfly logs" -msgstr "Писмоноша је пребацио дневнике из лептира" +msgid "Display incoming events in the status area" +msgstr "Приказује долазне догађаје на линији стања" #: ../data/org.gnome.Empathy.gschema.xml.in.h:26 -msgid "Empathy should auto-away when idle" -msgstr "Да ли Писмоноша да пређе у стање аутоматског одсуства у мировању" +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." +msgstr "" +"Приказује долазне догађаје на линији стања. Ако није постављено, одмах их " +"приказује кориснику." #: ../data/org.gnome.Empathy.gschema.xml.in.h:27 -msgid "Empathy should auto-connect on startup" -msgstr "Да ли Писмоноша да сам успоставити везу по покретању" +msgid "The position for the chat window side pane" +msgstr "Положај бочне површи прозора за ћаскање" #: ../data/org.gnome.Empathy.gschema.xml.in.h:28 -msgid "Empathy should reduce the location's accuracy" -msgstr "Да ли Писмоноша да умањи прецизност локације" +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "Сачуван положај (у тачкама) бочне површи прозора за ћаскање." #: ../data/org.gnome.Empathy.gschema.xml.in.h:29 -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "" -"Да ли Писмоноша да користи слику пријатеља као иконицу прозора за ћаскање" +msgid "Show contact groups" +msgstr "Приказује групе контакта" #: ../data/org.gnome.Empathy.gschema.xml.in.h:30 -msgid "Enable WebKit Developer Tools" -msgstr "Омогућава Веб кит развојне алате" +msgid "Whether to show groups in the contact list." +msgstr "Да ли да приказује групе у списку контакта." #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 -msgid "Enable popup notifications for new messages" -msgstr "Омогућава искачућа обавештења за нове поруке" +msgid "Contact list sort criterion" +msgstr "Критеријум за сортирање пријатеља" #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 -msgid "Enable spell checker" -msgstr "Омогућава проверу писања" +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." +msgstr "" +"Који критеријум се користи за сортирање списка пријатеља. Подразумевано се " +"користи „state“ (сортирање по стању пријатеља). Ако је вредност „name“, " +"сортирање се врши по имену пријатеља." #: ../data/org.gnome.Empathy.gschema.xml.in.h:33 -msgid "Hide main window" -msgstr "Сакрива главни прозор" +msgid "Use notification sounds" +msgstr "Користи звукове за обавештења" #: ../data/org.gnome.Empathy.gschema.xml.in.h:34 -msgid "Hide the main window." -msgstr "Сакрива главни прозор програма." +msgid "Whether to play a sound to notify of events." +msgstr "Да ли да пусти обавештајни звук за догађаје." #: ../data/org.gnome.Empathy.gschema.xml.in.h:35 -msgid "Nick completed character" -msgstr "Знак за довршавање надимка" +msgid "Disable sounds when away" +msgstr "Онемогућава звуке када смо одсутни" #: ../data/org.gnome.Empathy.gschema.xml.in.h:36 -msgid "Open new chats in separate windows" -msgstr "Отвара нова ћаскања у различитим прозорима" +msgid "Whether to play sound notifications when away or busy." +msgstr "Да ли да пусти обавештајни звук када постанете заузети или одсутни." #: ../data/org.gnome.Empathy.gschema.xml.in.h:37 -msgid "Path of the Adium theme to use" -msgstr "Путања до Адијум теме за коришћење" +msgid "Play a sound for incoming messages" +msgstr "Пушта звук за долазеће поруке" #: ../data/org.gnome.Empathy.gschema.xml.in.h:38 -msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "" -"Путања до Адијум теме за коришћење, ако се користи Адијум тема за ћаскање." +msgid "Whether to play a sound to notify of incoming messages." +msgstr "Да ли да пусти обавештајни звук када вам стигне порука." #: ../data/org.gnome.Empathy.gschema.xml.in.h:39 -msgid "Play a sound for incoming messages" -msgstr "Пушта звук за долазеће поруке" +msgid "Play a sound for outgoing messages" +msgstr "Пушта звук за одлазеће поруке" #: ../data/org.gnome.Empathy.gschema.xml.in.h:40 -msgid "Play a sound for new conversations" -msgstr "Пушта звук за нове разговоре" +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "Да ли да пусти обавештајни звук када пошаљете поруку." #: ../data/org.gnome.Empathy.gschema.xml.in.h:41 -msgid "Play a sound for outgoing messages" -msgstr "Пушта звук за одлазеће поруке" +msgid "Play a sound for new conversations" +msgstr "Пушта звук за нове разговоре" #: ../data/org.gnome.Empathy.gschema.xml.in.h:42 -msgid "Play a sound when a contact logs in" -msgstr "Пушта звук када се пријатељ пријави" +msgid "Whether to play a sound to notify of new conversations." +msgstr "Да ли да пусти обавештајни звук на нови разговор." #: ../data/org.gnome.Empathy.gschema.xml.in.h:43 -msgid "Play a sound when a contact logs out" -msgstr "Пушта звук када се пријатељ одјави" +msgid "Play a sound when a contact logs in" +msgstr "Пушта звук када се пријатељ пријави" #: ../data/org.gnome.Empathy.gschema.xml.in.h:44 -msgid "Play a sound when we log in" -msgstr "Пушта звук када се ја пријавим" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "Да ли да пусти обавештајни звук када се пријатељи пријаве на мрежу." #: ../data/org.gnome.Empathy.gschema.xml.in.h:45 -msgid "Play a sound when we log out" -msgstr "Пушта звук када се ја одјавим" +msgid "Play a sound when a contact logs out" +msgstr "Пушта звук када се пријатељ одјави" #: ../data/org.gnome.Empathy.gschema.xml.in.h:46 -msgid "Pop up notifications if the chat isn't focused" -msgstr "Исписује обавештења ако ћаскање није у фокусу" +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "Да ли да пусти обавештајни звук када се пријатељи одјаве са мреже." #: ../data/org.gnome.Empathy.gschema.xml.in.h:47 -msgid "Pop up notifications when a contact logs in" -msgstr "Исписује обавештења када се пријатељ пријави" +msgid "Play a sound when we log in" +msgstr "Пушта звук када се ја пријавим" #: ../data/org.gnome.Empathy.gschema.xml.in.h:48 -msgid "Pop up notifications when a contact logs out" -msgstr "Исписује обавештења када се пријатељ одјави" +msgid "Whether to play a sound when logging into a network." +msgstr "Да ли да пусти звук када се пријавите на мрежу." #: ../data/org.gnome.Empathy.gschema.xml.in.h:49 -msgid "Position the camera preview should be during a call." -msgstr "Положај приказа камерице за време позива." +msgid "Play a sound when we log out" +msgstr "Пушта звук када се ја одјавим" #: ../data/org.gnome.Empathy.gschema.xml.in.h:50 -msgid "Show Balance in contact list" -msgstr "Приказује готовину на списку пријатеља" +msgid "Whether to play a sound when logging out of a network." +msgstr "Да ли да пусти звук када се одјавите са мреже." #: ../data/org.gnome.Empathy.gschema.xml.in.h:51 -msgid "Show avatars" -msgstr "Приказује слике" +msgid "Enable popup notifications for new messages" +msgstr "Омогућава искачућа обавештења за нове поруке" #: ../data/org.gnome.Empathy.gschema.xml.in.h:52 -msgid "Show contact list in rooms" -msgstr "Приказује списак пријатеља у собама" +msgid "Whether to show a popup notification when receiving a new message." +msgstr "Да ли да приказује облачић обавештења када примите нову поруку." #: ../data/org.gnome.Empathy.gschema.xml.in.h:53 -msgid "Show hint about closing the main window" -msgstr "Приказује савет у вези затварања главног прозора" +msgid "Disable popup notifications when away" +msgstr "Искључује искачућа обавештења када смо одсутни" #: ../data/org.gnome.Empathy.gschema.xml.in.h:54 -msgid "Show offline contacts" -msgstr "Приказује пријатеље ван мреже" +msgid "Whether to show popup notifications when away or busy." +msgstr "Да ли да приказује облачић обавештења када сте заузети или одсутни." #: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -msgid "Show protocols" -msgstr "Приказује протоколе" +msgid "Pop up notifications if the chat isn't focused" +msgstr "Исписује обавештења ако ћаскање није у фокусу" #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 -msgid "Spell checking languages" -msgstr "Језици за проверу писања" +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" +"Да ли да приказује облачић обавештења са пристиглим порукама чак и када је " +"прозор за ћаскање отворен, али није у фокусу." #: ../data/org.gnome.Empathy.gschema.xml.in.h:57 -msgid "The default folder to save file transfers in." -msgstr "Подразумевана фасцикла за чување пренесених датотека." +msgid "Pop up notifications when a contact logs in" +msgstr "Исписује обавештења када се пријатељ пријави" #: ../data/org.gnome.Empathy.gschema.xml.in.h:58 -msgid "The last directory that an avatar image was chosen from." -msgstr "Последња фасцикла из које је изабрана слика." +msgid "Whether to show a popup notification when a contact goes online." +msgstr "" +"Да ли да приказује облачић обавештења када се пријатељ пријави на мрежу." #: ../data/org.gnome.Empathy.gschema.xml.in.h:59 -msgid "The position for the chat window side pane" -msgstr "Положај бочне површи прозора за ћаскање" +msgid "Pop up notifications when a contact logs out" +msgstr "Исписује обавештења када се пријатељ одјави" #: ../data/org.gnome.Empathy.gschema.xml.in.h:60 -msgid "The stored position (in pixels) of the chat window side pane." -msgstr "Сачуван положај (у тачкама) бочне површи прозора за ћаскање." +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "" +"Да ли да приказује облачић обавештења када се пријатељ одјави са мреже." #: ../data/org.gnome.Empathy.gschema.xml.in.h:61 -msgid "The theme that is used to display the conversation in chat windows." -msgstr "Тема за приказ разговора у прозору ћаскања." +msgid "Use graphical smileys" +msgstr "Приказује сличицу са смешком" #: ../data/org.gnome.Empathy.gschema.xml.in.h:62 -msgid "" -"The theme variant that is used to display the conversation in chat windows." -msgstr "Варијанта теме која се користи за приказ разговора у прозору ћаскања." +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "Да ли да приказује смешке као сличице унутар разговора." #: ../data/org.gnome.Empathy.gschema.xml.in.h:63 -msgid "Use graphical smileys" -msgstr "Приказује сличицу са смешком" +msgid "Show contact list in rooms" +msgstr "Приказује списак пријатеља у собама" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 -msgid "Use notification sounds" -msgstr "Користи звукове за обавештења" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +msgid "Whether to show the contact list in chat rooms." +msgstr "Да ли да приказује списак пријатеља у собама за ћаскање." #: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "Use theme for chat rooms" -msgstr "Користи теме за собе ћаскања" +msgid "Chat window theme" +msgstr "Тема прозора за ћаскање" #: ../data/org.gnome.Empathy.gschema.xml.in.h:66 -msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "Да ли Писмоноша да објављује локацију корисника његовим пријатељима." +msgid "The theme that is used to display the conversation in chat windows." +msgstr "Тема за приказ разговора у прозору ћаскања." #: ../data/org.gnome.Empathy.gschema.xml.in.h:67 -msgid "Whether Empathy can use the GPS to guess the location." -msgstr "Да ли Писмоноша сме да користи ГПС да погоди локацију." +msgid "Chat window theme variant" +msgstr "Варијанта теме прозора за ћаскање" #: ../data/org.gnome.Empathy.gschema.xml.in.h:68 -msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "Да ли Писмоноша сме да користи мобилну мрежу да погоди локацију." +msgid "" +"The theme variant that is used to display the conversation in chat windows." +msgstr "Варијанта теме која се користи за приказ разговора у прозору ћаскања." #: ../data/org.gnome.Empathy.gschema.xml.in.h:69 -msgid "Whether Empathy can use the network to guess the location." -msgstr "Да ли Писмоноша сме да користи мрежу да погоди локацију." +msgid "Path of the Adium theme to use" +msgstr "Путања до Адијум теме за коришћење" #: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "Whether Empathy has migrated butterfly logs." -msgstr "Да ли је Писмоноша пребацио дневнике из лептира." +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "" +"Путања до Адијум теме за коришћење, ако се користи Адијум тема за ћаскање." #: ../data/org.gnome.Empathy.gschema.xml.in.h:71 -msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "Да ли Писмоноша да се сам пријави на постојеће налоге након покретања." +msgid "Enable WebKit Developer Tools" +msgstr "Омогућава Веб кит развојне алате" #: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" -"Whether Empathy should go into away mode automatically if the user is idle." +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" -"Да ли Писмоноша да аутоматски пређе у стање одсуства приликом мировања." +"Да ли ће бити омогућени Веб кит развојни алати, као што је Веб Инспектор." #: ../data/org.gnome.Empathy.gschema.xml.in.h:73 -msgid "" -"Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "" -"Да ли Писмоноша да умањи прецизност локације због повећане приватности." +msgid "Inform other users when you are typing to them" +msgstr "Обавештава остале кориснике када им пишете поруку" #: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" -"Whether Empathy should use the avatar of the contact as the chat window icon." +"Whether to send the 'composing' or 'paused' chat states. Does not currently " +"affect the 'gone' state." msgstr "" -"Да ли Писмоноша да користи слику пријатеља као икону у прозору ћаскања." +"Да ли ће да пошаље стања ћаскања „саставља“ или „паузиран“. Неће утицати на " +"стање „отишао“." #: ../data/org.gnome.Empathy.gschema.xml.in.h:75 -msgid "" -"Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "" -"Да ли ће бити омогућени Веб кит развојни алати, као што је Веб Инспектор." +msgid "Use theme for chat rooms" +msgstr "Користи теме за собе ћаскања" -# Није connect већ disconnect!!! ~Милош #: ../data/org.gnome.Empathy.gschema.xml.in.h:76 -msgid "" -"Whether connectivity managers should be used to automatically disconnect/" -"reconnect." -msgstr "" -"Да ли треба користити управника мреже за аутоматско прекидање и поновно " -"успостављање везе." +msgid "Whether to use the theme for chat rooms." +msgstr "Да ли да користи тему за собе разговора." #: ../data/org.gnome.Empathy.gschema.xml.in.h:77 -msgid "" -"Whether to check words typed against the languages you want to check with." -msgstr "Да ли да проверава писање речи за изабране језике." +msgid "Spell checking languages" +msgstr "Језици за проверу писања" #: ../data/org.gnome.Empathy.gschema.xml.in.h:78 -msgid "Whether to convert smileys into graphical images in conversations." -msgstr "Да ли да приказује смешке као сличице унутар разговора." +msgid "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +msgstr "" +"Списак језика одвојен зарезима које користи провера правописа (нпр. „sr, en, " +"fr“)." #: ../data/org.gnome.Empathy.gschema.xml.in.h:79 -msgid "Whether to enable Pulseaudio's echo cancellation filter." -msgstr "Да ли ће бити укључен филтер Пулсе аудиа за уклањање одјека." +msgid "Enable spell checker" +msgstr "Омогућава проверу писања" #: ../data/org.gnome.Empathy.gschema.xml.in.h:80 -msgid "Whether to play a sound to notify of contacts logging into the network." -msgstr "Да ли да пусти обавештајни звук када се пријатељи пријаве на мрежу." +msgid "" +"Whether to check words typed against the languages you want to check with." +msgstr "Да ли да проверава писање речи за изабране језике." #: ../data/org.gnome.Empathy.gschema.xml.in.h:81 -msgid "" -"Whether to play a sound to notify of contacts logging out of the network." -msgstr "Да ли да пусти обавештајни звук када се пријатељи одјаве са мреже." +msgid "Nick completed character" +msgstr "Знак за довршавање надимка" #: ../data/org.gnome.Empathy.gschema.xml.in.h:82 -msgid "Whether to play a sound to notify of events." -msgstr "Да ли да пусти обавештајни звук за догађаје." +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "" +"Знак за додавање после надимка када се користи аутоматско довршавање надимка " +"(таб) у групним ћаскањима." #: ../data/org.gnome.Empathy.gschema.xml.in.h:83 -msgid "Whether to play a sound to notify of incoming messages." -msgstr "Да ли да пусти обавештајни звук када вам стигне порука." +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "" +"Да ли Писмоноша да користи слику пријатеља као иконицу прозора за ћаскање" #: ../data/org.gnome.Empathy.gschema.xml.in.h:84 -msgid "Whether to play a sound to notify of new conversations." -msgstr "Да ли да пусти обавештајни звук на нови разговор." +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." +msgstr "" +"Да ли Писмоноша да користи слику пријатеља као икону у прозору ћаскања." #: ../data/org.gnome.Empathy.gschema.xml.in.h:85 -msgid "Whether to play a sound to notify of outgoing messages." -msgstr "Да ли да пусти обавештајни звук када пошаљете поруку." +msgid "Last account selected in Join Room dialog" +msgstr "Последњи изабрани налог у прозорчету за придруживање соби" #: ../data/org.gnome.Empathy.gschema.xml.in.h:86 -msgid "Whether to play a sound when logging into a network." -msgstr "Да ли да пусти звук када се пријавите на мрежу." +msgid "D-Bus object path of the last account selected to join a room." +msgstr "Путања објекта Д-баса последњег налога изабраног за придруживање соби" #: ../data/org.gnome.Empathy.gschema.xml.in.h:87 -msgid "Whether to play a sound when logging out of a network." -msgstr "Да ли да пусти звук када се одјавите са мреже." +msgid "Camera device" +msgstr "Уређај камерице" #: ../data/org.gnome.Empathy.gschema.xml.in.h:88 -msgid "Whether to play sound notifications when away or busy." -msgstr "Да ли да пусти обавештајни звук када постанете заузети или одсутни." +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "" +"Основна видео камерица која ће бити коришћена у видео позивима, нпр. „/dev/" +"video0“." #: ../data/org.gnome.Empathy.gschema.xml.in.h:89 -msgid "Whether to show a popup notification when a contact goes offline." -msgstr "" -"Да ли да приказује облачић обавештења када се пријатељ одјави са мреже." +msgid "Camera position" +msgstr "Положај камерице" #: ../data/org.gnome.Empathy.gschema.xml.in.h:90 -msgid "Whether to show a popup notification when a contact goes online." -msgstr "" -"Да ли да приказује облачић обавештења када се пријатељ пријави на мрежу." +msgid "Position the camera preview should be during a call." +msgstr "Положај приказа камерице за време позива." #: ../data/org.gnome.Empathy.gschema.xml.in.h:91 -msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." -msgstr "" -"Да ли да приказује облачић обавештења са пристиглим порукама чак и када је " -"прозор за ћаскање отворен, али није у фокусу." +msgid "Echo cancellation support" +msgstr "Подршка за уклањање одјека" #: ../data/org.gnome.Empathy.gschema.xml.in.h:92 -msgid "Whether to show a popup notification when receiving a new message." -msgstr "Да ли да приказује облачић обавештења када примите нову поруку." +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "Да ли ће бити укључен филтер Пулсе аудиа за уклањање одјека." #: ../data/org.gnome.Empathy.gschema.xml.in.h:93 -msgid "Whether to show account balances in the contact list." -msgstr "Да ли да приказује износ готовине налога у списку пријатеља." +msgid "Show hint about closing the main window" +msgstr "Приказује савет у вези затварања главног прозора" #: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "" -"Whether to show avatars for contacts in the contact list and chat windows." +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." msgstr "" -"Да ли да приказује слике за пријатеље у списку пријатеља и прозору ћаскања." +"Да ли да приказује поруку о затварању главног прозора када га затворите на " +"„x“ дугме." #: ../data/org.gnome.Empathy.gschema.xml.in.h:95 -msgid "Whether to show contacts that are offline in the contact list." -msgstr "Да ли да приказује неповезане пријатеље у списку пријатеља." +msgid "Empathy can publish the user's location" +msgstr "Да ли Писмоноша сме да објављује локацију корисника" #: ../data/org.gnome.Empathy.gschema.xml.in.h:96 -msgid "Whether to show popup notifications when away or busy." -msgstr "Да ли да приказује облачић обавештења када сте заузети или одсутни." +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "Да ли Писмоноша да објављује локацију корисника његовим пријатељима." #: ../data/org.gnome.Empathy.gschema.xml.in.h:97 -msgid "Whether to show protocols for contacts in the contact list." -msgstr "" -"Да ли да приказује слике за пријатеље у списку пријатеља и прозору ћаскања." +msgid "Empathy can use the network to guess the location" +msgstr "Да ли Писмоноша сме да користи мрежу да погоди локацију" #: ../data/org.gnome.Empathy.gschema.xml.in.h:98 -msgid "Whether to show the contact list in chat rooms." -msgstr "Да ли да приказује списак пријатеља у собама за ћаскање." +msgid "Whether Empathy can use the network to guess the location." +msgstr "Да ли Писмоноша сме да користи мрежу да погоди локацију." #: ../data/org.gnome.Empathy.gschema.xml.in.h:99 -msgid "Whether to show the contact list in compact mode." -msgstr "Да ли да приказује списак пријатеља у збијеном режиму." +msgid "Empathy can use the cellular network to guess the location" +msgstr "Да ли Писмоноша сме да користи мобилну мрежу да погоди локацију" #: ../data/org.gnome.Empathy.gschema.xml.in.h:100 -msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." -msgstr "" -"Да ли да приказује поруку о затварању главног прозора када га затворите на " -"„x“ дугме." +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "Да ли Писмоноша сме да користи мобилну мрежу да погоди локацију." #: ../data/org.gnome.Empathy.gschema.xml.in.h:101 -msgid "Whether to use the theme for chat rooms." -msgstr "Да ли да користи тему за собе разговора." +msgid "Empathy can use the GPS to guess the location" +msgstr "Да ли Писмоноша сме да користи ГПС да погоди локацију" #: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Да ли Писмоноша сме да користи ГПС да погоди локацију." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 +msgid "Empathy should reduce the location's accuracy" +msgstr "Да ли Писмоноша да умањи прецизност локације" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 msgid "" -"Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." +"Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" -"Који критеријум се користи за сортирање списка пријатеља. Подразумевано се " -"користи „name“ (сортирање по имену пријатеља). Ако је вредност „state“, " -"сортирање се врши по стању пријатеља." +"Да ли Писмоноша да умањи прецизност локације због повећане приватности." +#. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2327 +msgid "Messaging and VoIP Accounts" +msgstr "Налози за дописивање и VoIP" + +#: ../data/empathy-accounts.desktop.in.in.h:2 msgid "Manage Messaging and VoIP accounts" msgstr "Управљајте налозима за дописивање и ВоИП" -#. Tweak the dialog -#: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2324 -msgid "Messaging and VoIP Accounts" -msgstr "Налози за дописивање и VoIP" +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Није наведен разлог" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Захтевана је промена стања" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Обуставили сте пренос датотеке" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Друга страна је прекинула пренос датотеке" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Грешка приликом преноса датотеке" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Друга страна није у могућности да пренесе датотеку" -#: ../libempathy/empathy-ft-handler.c:825 +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "Непознат разлог" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Пренос датотеке је завршен, али је датотека оштећена" -#: ../libempathy/empathy-ft-handler.c:1111 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Друга страна не подржава пренос датотека" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Изабрана датотека није обична датотека" -#: ../libempathy/empathy-ft-handler.c:1176 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Изабрана датотека је празна" @@ -548,169 +587,138 @@ msgstr "Позив корисника %s" msgid "Call from %s" msgstr "Позив од %s" -#: ../libempathy/empathy-tp-file.c:268 -msgid "Socket type not supported" -msgstr "Врста прикључка није подржана" - -#: ../libempathy/empathy-tp-file.c:387 -msgid "No reason was specified" -msgstr "Није наведен разлог" - -#: ../libempathy/empathy-tp-file.c:390 -msgid "The change in state was requested" -msgstr "Захтевана је промена стања" - -#: ../libempathy/empathy-tp-file.c:393 -msgid "You canceled the file transfer" -msgstr "Обуставили сте пренос датотеке" - -#: ../libempathy/empathy-tp-file.c:396 -msgid "The other participant canceled the file transfer" -msgstr "Друга страна је прекинула пренос датотеке" - -#: ../libempathy/empathy-tp-file.c:399 -msgid "Error while trying to transfer the file" -msgstr "Грешка приликом преноса датотеке" - -#: ../libempathy/empathy-tp-file.c:402 -msgid "The other participant is unable to transfer the file" -msgstr "Друга страна није у могућности да пренесе датотеку" - -#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Непознат разлог" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "Доступан" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "Заузет" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "Одсутан" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "Невидљив" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "Неповезан" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "Непознато" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "Није наведен разлог" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "Стање је постављено на „неповезан“" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Грешка у мрежи" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "Неуспешна пријава" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "Грешка при шифровању" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "Име је у употреби" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "Сертификат није прослеђен" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "Сертификат није од поверења" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "Сертификат је истекао" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "Сертификат није активиран" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "Име домаћина сертификата се не поклапа" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "Отисак сертификата се не поклапа" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "Сертификат је самопотписан" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "Грешка у сертификату" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "Шифровање није доступно" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "Сертификат није исправан" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "Веза је одбијена" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "Веза не може да се успостави" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "Веза је изгубљена" -#: ../libempathy/empathy-utils.c:354 -msgid "This resource is already connected to the server" -msgstr "Овај ресурс је већ повезан са сервером" +#: ../libempathy/empathy-utils.c:355 +msgid "This account is already connected to the server" +msgstr "Овај налог је већ повезан са сервером" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "Веза је замењена новом везом користећи исти ресурс" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "Овај налог већ постоји на серверу" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "Сервер је тренутно превише заузет да би успоставио везу" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "Сертификат је опозван" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "Сертификат користи небезбедни алгоритам шифровања или је криптографски слаб" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:369 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -718,24 +726,31 @@ msgstr "" "Дужина сертификата сервера, или дубина ланца сертификата сервера премашује " "границе библиотеке за шифровање" -#: ../libempathy/empathy-utils.c:529 -#: ../libempathy-gtk/empathy-contact-list-store.h:73 +#: ../libempathy/empathy-utils.c:373 +msgid "Your software is too old" +msgstr "Ваш софтвер је превише стар" + +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "Унутрашња грешка" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "Људи у околини" -#: ../libempathy/empathy-utils.c:534 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Јаху! Јапан" -#: ../libempathy/empathy-utils.c:563 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Гугл разговор" -#: ../libempathy/empathy-utils.c:564 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Фејсбук ћаскање" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" @@ -744,7 +759,7 @@ msgstr[1] "Пре %d секунде" msgstr[2] "Пре %d секунди" msgstr[3] "Пре једне секунде" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -753,7 +768,7 @@ msgstr[1] "Пре %d минута" msgstr[2] "Пре %d минута" msgstr[3] "Пре једног минута" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -762,7 +777,7 @@ msgstr[1] "Пре %d сата" msgstr[2] "Пре %d сати" msgstr[3] "Пре једног сата" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -771,7 +786,7 @@ msgstr[1] "Пре %d дана" msgstr[2] "Пре %d дана" msgstr[3] "Пре једног дана" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -780,7 +795,7 @@ msgstr[1] "Пре %d недеље" msgstr[2] "Пре %d недеља" msgstr[3] "Пре једне недеље" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -789,224 +804,196 @@ msgstr[1] "Пре %d месеца" msgstr[2] "Пре %d месеци" msgstr[3] "Пре једног месеца" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "у будућности" -#: ../libempathy-gtk/empathy-account-chooser.c:540 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "Сви налози" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Налог" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Лозинка" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Сервер" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Порт" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:765 +#: ../libempathy-gtk/empathy-account-widget.c:817 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -msgid "My Web Accounts" -msgstr "Моји веб налози" - -#: ../libempathy-gtk/empathy-account-widget.c:1208 -#, c-format -msgid "The account %s is edited via %s." -msgstr "Налог %s је измењен путем %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1214 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Налог %s не може бити уређиван из Писмоноше." - -#: ../libempathy-gtk/empathy-account-widget.c:1233 -msgid "Launch My Web Accounts" -msgstr "Покрени Моје веб налоге" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1241 -#, c-format -msgid "Edit %s" -msgstr "Измени %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1591 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget.c:1398 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Username:" msgstr "Корисничко име:" -#: ../libempathy-gtk/empathy-account-widget.c:1909 +#: ../libempathy-gtk/empathy-account-widget.c:1710 msgid "A_pply" msgstr "_Примени" -#: ../libempathy-gtk/empathy-account-widget.c:1939 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "L_og in" msgstr "Пријави _ме" -#: ../libempathy-gtk/empathy-account-widget.c:2013 +#: ../libempathy-gtk/empathy-account-widget.c:1812 msgid "This account already exists on the server" msgstr "Овај налог већ постоји на серверу" -#: ../libempathy-gtk/empathy-account-widget.c:2016 +#: ../libempathy-gtk/empathy-account-widget.c:1816 msgid "Create a new account on the server" msgstr "Направи нови налог на серверу" -#: ../libempathy-gtk/empathy-account-widget.c:2208 -msgid "Ca_ncel" -msgstr "По_ништи" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2486 +#: ../libempathy-gtk/empathy-account-widget.c:2241 #, c-format msgid "%1$s on %2$s" msgstr "%1$s на %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2512 +#: ../libempathy-gtk/empathy-account-widget.c:2267 #, c-format msgid "%s Account" msgstr "%s налог" -#: ../libempathy-gtk/empathy-account-widget.c:2516 +#: ../libempathy-gtk/empathy-account-widget.c:2271 msgid "New account" msgstr "Нови налог" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 -msgid "Example: MyScreenName" -msgstr "Пример: МојНадимак" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Pass_word:" +msgstr "_Лозинка:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 -msgid "Advanced" -msgstr "Напредно" +msgid "Screen _Name:" +msgstr "_Надимак:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +msgid "Example: MyScreenName" +msgstr "Пример: МојНадимак" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 -msgid "Pass_word:" -msgstr "_Лозинка:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "Запамти лозинку" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -msgid "Remember Password" -msgstr "Запамти лозинку" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Port:" +msgstr "_Порт:" -#. remember password ticky box -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 -msgid "Remember password" -msgstr "Запамти лозинку" - -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 -msgid "Screen _Name:" -msgstr "_Надимак:" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "_Server:" +msgstr "_Сервер:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 -msgid "What is your AIM password?" -msgstr "Која је ваша АИМ лозинка?" +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Advanced" +msgstr "Напредно" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 msgid "What is your AIM screen name?" msgstr "Који је ваш АИМ надимак?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 -msgid "_Port:" -msgstr "_Порт:" +msgid "What is your AIM password?" +msgstr "Која је ваша АИМ лозинка?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../src/empathy-new-chatroom-dialog.ui.h:9 -msgid "_Server:" -msgstr "_Сервер:" - -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "Example: username" -msgstr "Пример: корисничко_име" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "Remember Password" +msgstr "Запамти лозинку" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "_Корисничко име:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Example: username" +msgstr "Пример: корисничко_име" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 msgid "What is your GroupWise User ID?" msgstr "Који је ваш Гроуп Вајз кориснички ИБ?" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 msgid "What is your GroupWise password?" msgstr "Која је ваша Гроуп Вајз лозинка?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "ИЦКу _КИБ:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "Example: 123456789" msgstr "Пример: 123456789" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "Ch_aracter set:" msgstr "Кодни р_аспоред:" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 -msgid "ICQ _UIN:" -msgstr "ИЦКу _КИБ:" - -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 msgid "What is your ICQ UIN?" msgstr "Који је ваш ИЦКу КИБ?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 msgid "What is your ICQ password?" msgstr "Која је ваша ИЦКу лозинка?" @@ -1043,11 +1030,23 @@ msgstr "Опције" msgid "None" msgstr "Ништа" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Network" +msgstr "Мрежа" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +msgid "Network:" +msgstr "Мрежа:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Character set:" msgstr "Кодни распоред:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +msgid "Servers" +msgstr "Сервери" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." @@ -1055,14 +1054,6 @@ msgstr "" "Већина ИРЦ сервера не тражи лозинку, зато ако нисте сигурни, немојте је " "уносити." -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 -msgid "Network" -msgstr "Мрежа" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 -msgid "Network:" -msgstr "Мрежа:" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "Надимак:" @@ -1079,48 +1070,20 @@ msgstr "Порука за крај:" msgid "Real name:" msgstr "Право име:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 -msgid "Servers" -msgstr "Сервери" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 -msgid "What is your IRC nickname?" -msgstr "Који је ваш ИРЦ надимак?" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Which IRC network?" msgstr "Која ИРЦ мрежа?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "Example: user@gmail.com" -msgstr "Пример: korisnik@gmail.com" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "Example: user@jabber.org" -msgstr "Пример: korisnik@jabber.org" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 -msgid "Encr_yption required (TLS/SSL)" -msgstr "Захтева се _шифровање(TLS/SSL)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 -msgid "I_gnore SSL certificate errors" -msgstr "_Занемари грешке ССЛ сертификата" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 -msgid "Override server settings" -msgstr "Превазиђи поставке сервера" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 -msgid "Priori_ty:" -msgstr "_Приоритет:" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "What is your IRC nickname?" +msgstr "Који је ваш ИРЦ надимак?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 -msgid "Reso_urce:" -msgstr "_Ресурс:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "What is your Facebook username?" +msgstr "Које је ваше Фејсбук корисничко име?" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/badger, enter badger.\n" @@ -1132,179 +1095,203 @@ msgstr "" "Уколико немате корисничко име за Фејсбук, идите на ову страну да га изаберете." -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 -msgid "Use old SS_L" -msgstr "Користи стари СС_Л" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "What is your Facebook password?" msgstr "Која је ваша Фејсбук лозинка?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 -msgid "What is your Facebook username?" -msgstr "Које је ваше Фејсбук корисничко име?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "What is your Google ID?" msgstr "Који је ваш Гугл ИБ?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Example: user@gmail.com" +msgstr "Пример: korisnik@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "What is your Google password?" msgstr "Која је ваша Гугл лозинка?" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +msgid "Example: user@jabber.org" +msgstr "Пример: korisnik@jabber.org" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "I_gnore SSL certificate errors" +msgstr "_Занемари грешке ССЛ сертификата" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +msgid "Priori_ty:" +msgstr "_Приоритет:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +msgid "Reso_urce:" +msgstr "_Ресурс:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "Encr_yption required (TLS/SSL)" +msgstr "Захтева се _шифровање(TLS/SSL)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "Use old SS_L" +msgstr "Користи стари СС_Л" + #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "Override server settings" +msgstr "Превазиђи поставке сервера" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 msgid "What is your Jabber ID?" msgstr "Који је ваш Џабер ИБ?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 -msgid "What is your Jabber password?" -msgstr "Која је ваша Џабер лозинка?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 msgid "What is your desired Jabber ID?" msgstr "Који је ваш жељени Џабер ИБ?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +msgid "What is your Jabber password?" +msgstr "Која је ваша Џабер лозинка?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 msgid "What is your desired Jabber password?" msgstr "Која ја ваша жељена Џабер лозинка?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 msgid "Example: user@hotmail.com" msgstr "Пример: korisnik@hotmail.com" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 msgid "What is your Windows Live ID?" msgstr "Који је ваш Виндоуз Уживо ИБ ?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 msgid "What is your Windows Live password?" msgstr "Која је ваша Виндоуз Уживо лозинка?" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "E-_mail address:" -msgstr "Адреса _е-поште:" - -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 msgid "Nic_kname:" msgstr "_Надимак:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "_Last Name:" +msgstr "_Презиме:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 msgid "_First Name:" msgstr "_Име:" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +msgid "_Published Name:" +msgstr "Име за _објаву:" + #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Jabber ID:" msgstr "_Џабер ИД:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 -msgid "_Last Name:" -msgstr "_Презиме:" +msgid "E-_mail address:" +msgstr "Адреса _е-поште:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -msgid "_Published Name:" -msgstr "Име за _објаву:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "_Username:" +msgstr "_Корисничко име:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Example: user@my.sip.server" msgstr "Пример: korisnik@moj.sip.server" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "Authentication username:" -msgstr "Корисничко име за пријаву:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover Binding" -msgstr "Откриј повезивања" - #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "Discover the STUN server automatically" -msgstr "Аутоматски откриј СТУН сервер" +msgid "Use this account to call _landlines and mobile phones" +msgstr "Користи овај налог за позиве _линијских и мобилних телефона" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 -msgid "Ignore TLS Errors" -msgstr "Занемари ТЛС грешке" +msgid "NAT Traversal Options" +msgstr "Опције проласка кроз НАТ" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "Interval (seconds)" -msgstr "Период (у секундама)" +msgid "Proxy Options" +msgstr "Опције посредника" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -msgid "Keep-Alive Options" -msgstr "Опције за одржавање сталне везе" +msgid "Miscellaneous Options" +msgstr "Разне опције" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 -msgid "Loose Routing" -msgstr "Слабо рутирање" +msgid "STUN Server:" +msgstr "СТУН сервер:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 -msgid "Mechanism:" -msgstr "Механизам:" +msgid "Discover the STUN server automatically" +msgstr "Аутоматски откриј СТУН сервер" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 -msgid "Miscellaneous Options" -msgstr "Разне опције" +msgid "Discover Binding" +msgstr "Откриј повезивања" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -msgid "NAT Traversal Options" -msgstr "Опције проласка кроз НАТ" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "Сервер:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Keep-Alive Options" +msgstr "Опције за одржавање сталне везе" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 -msgid "Port:" -msgstr "Порт:" +msgid "Mechanism:" +msgstr "Механизам:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 -msgid "Proxy Options" -msgstr "Опције посредника" +msgid "Interval (seconds)" +msgstr "Период (у секундама)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Authentication username:" +msgstr "Корисничко име за пријаву:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Transport:" +msgstr "Транспорт:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -msgid "STUN Server:" -msgstr "СТУН сервер:" +msgid "Loose Routing" +msgstr "Слабо рутирање" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contact-widget.c:347 -msgid "Server:" -msgstr "Сервер:" +msgid "Ignore TLS Errors" +msgstr "Занемари ТЛС грешке" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -msgid "Transport:" -msgstr "Транспорт:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -msgid "Use this account to call _landlines and mobile phones" -msgstr "Користи овај налог за позиве _линијских и мобилних телефона" +msgid "Port:" +msgstr "Порт:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 -msgid "What is your SIP account password?" -msgstr "Која је лозинка за ваш СИП налог?" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Која је идентификација за СИП пријаву?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 -msgid "_Username:" -msgstr "_Корисничко име:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP account password?" +msgstr "Која је лозинка за ваш СИП налог?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Yahoo! I_D:" +msgstr "Јаху! И_Б:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "I_gnore conference and chat room invitations" msgstr "_Занемари позивнице за причаонице и конференције" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Room List locale:" +msgstr "Лок_ални списак соба:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "What is your Yahoo! ID?" msgstr "Који је ваш Јаху! ИБ?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "What is your Yahoo! password?" msgstr "Која је ваша Јаху! лозинка?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "Yahoo! I_D:" -msgstr "Јаху! И_Б:" - -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 -msgid "_Room List locale:" -msgstr "Лок_ални списак соба:" - #: ../libempathy-gtk/empathy-avatar-chooser.c:471 #: ../libempathy-gtk/empathy-avatar-chooser.c:556 msgid "Couldn't convert image" @@ -1343,7 +1330,7 @@ msgid "Click to enlarge" msgstr "Кликните да увећате" #: ../libempathy-gtk/empathy-call-utils.c:44 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:62 msgid "There was an error starting the call" msgstr "Дошло је до грешке приликом позивања" @@ -1363,63 +1350,67 @@ msgstr "Наведени контакт није исправан" msgid "Emergency calls are not supported on this protocol" msgstr "Овај протокол не подржава хитне позиве" -#: ../libempathy-gtk/empathy-chat.c:704 +#: ../libempathy-gtk/empathy-call-utils.c:59 +msgid "You don't have enough credit in order to place this call" +msgstr "Немате довољно кредита да бисте могли да обавите овај позив" + +#: ../libempathy-gtk/empathy-chat.c:728 msgid "Failed to open private chat" msgstr "Нисам успео да отворим приватно ћаскање" -#: ../libempathy-gtk/empathy-chat.c:765 +#: ../libempathy-gtk/empathy-chat.c:786 msgid "Topic not supported on this conversation" msgstr "Теме нису подржане у овом разговору" -#: ../libempathy-gtk/empathy-chat.c:771 +#: ../libempathy-gtk/empathy-chat.c:792 msgid "You are not allowed to change the topic" msgstr "Није вам дозвољено да промените тему" -#: ../libempathy-gtk/empathy-chat.c:975 +#: ../libempathy-gtk/empathy-chat.c:991 #, c-format msgid "“%s” is not a valid contact ID" msgstr "„%s“ није исправан ИБ контакта" -#: ../libempathy-gtk/empathy-chat.c:1060 +#: ../libempathy-gtk/empathy-chat.c:1086 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: чисти све поруке из овог разговора" -#: ../libempathy-gtk/empathy-chat.c:1063 +#: ../libempathy-gtk/empathy-chat.c:1089 msgid "/topic : set the topic of the current conversation" msgstr "/topic <тема>: поставља тему тренутног разговора" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/join : join a new chat room" msgstr "/join <ИБ собе>: прикључује се новој соби за ћаскање" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "/j : join a new chat room" msgstr "/j <ИБ собе>: прикључује се новој соби за ћаскање" -#: ../libempathy-gtk/empathy-chat.c:1073 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "" "/part [] []: leave the chat room, by default the " "current one" msgstr "" "/part [<ИБ собе>] [<разлог>]: напушта собу за ћаскање, подразумевано тренутну" -#: ../libempathy-gtk/empathy-chat.c:1077 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "/query []: open a private chat" msgstr "/query <ИБ пријатеља> [<порука>]: отвара приватно ћаскање" -#: ../libempathy-gtk/empathy-chat.c:1080 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "/msg : open a private chat" msgstr "/msg <ИБ пријатеља> <порука>: отвара приватно ћаскање" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "/nick : change your nickname on the current server" msgstr "/nick <надимак>: мења ваш надимак на тренутном серверу" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "/me : send an ACTION message to the current conversation" msgstr "/me <порука>: шаље поруку РАДЊА на тренутни разговор" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1429,11 +1420,11 @@ msgstr "" "порука које почињу са „/“. На пример: „/say /join се користи за прикључивање " "у нову собу за ћаскање“" -#: ../libempathy-gtk/empathy-chat.c:1094 +#: ../libempathy-gtk/empathy-chat.c:1120 msgid "/whois : display information about a contact" msgstr "/whois <ИБ контакта>: приказује податке о контакту" -#: ../libempathy-gtk/empathy-chat.c:1097 +#: ../libempathy-gtk/empathy-chat.c:1123 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1441,113 +1432,126 @@ msgstr "" "/help [<команда>]: приказује све подржане наредбе. Ако се да и конкретна " "<наредба>, приказује њено упутство за употребу." -#: ../libempathy-gtk/empathy-chat.c:1114 +#: ../libempathy-gtk/empathy-chat.c:1142 #, c-format msgid "Usage: %s" msgstr "Коришћење: %s" -#: ../libempathy-gtk/empathy-chat.c:1159 +#: ../libempathy-gtk/empathy-chat.c:1187 msgid "Unknown command" msgstr "Непозната наредба" -#: ../libempathy-gtk/empathy-chat.c:1285 +#: ../libempathy-gtk/empathy-chat.c:1313 msgid "Unknown command; see /help for the available commands" msgstr "Непозната наредба; погледајте /help за доступне наредбе" -#. translators: error used when user doesn't have enough credit on his -#. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1455 +#: ../libempathy-gtk/empathy-chat.c:1564 msgid "insufficient balance to send message" msgstr "нема довољно готовине за слање поруке" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582 +#: ../libempathy-gtk/empathy-chat.c:1645 +#, c-format +msgid "Error sending message '%s': %s" +msgstr "Грешка при слању поруке „%s“: %s" + +#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587 +#: ../libempathy-gtk/empathy-chat.c:1649 +#, c-format +msgid "Error sending message: %s" +msgstr "Грешка при слању поруке: %s" + +#. translators: error used when user doesn't have enough credit on his +#. * account to send the message. +#: ../libempathy-gtk/empathy-chat.c:1576 +#, c-format +msgid "insufficient balance to send message. Top up." +msgstr "нема довољно готовине за слање поруке. Допуните." + +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "not capable" msgstr "неспособан" -#: ../libempathy-gtk/empathy-chat.c:1464 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "offline" msgstr "неповезан" -#: ../libempathy-gtk/empathy-chat.c:1467 +#: ../libempathy-gtk/empathy-chat.c:1626 msgid "invalid contact" msgstr "неисправан пријатељ" -#: ../libempathy-gtk/empathy-chat.c:1470 +#: ../libempathy-gtk/empathy-chat.c:1629 msgid "permission denied" msgstr "приступ је забрањен" -#: ../libempathy-gtk/empathy-chat.c:1473 +#: ../libempathy-gtk/empathy-chat.c:1632 msgid "too long message" msgstr "порука је предуга" -#: ../libempathy-gtk/empathy-chat.c:1476 +#: ../libempathy-gtk/empathy-chat.c:1635 msgid "not implemented" msgstr "није подржано" -#: ../libempathy-gtk/empathy-chat.c:1480 +#: ../libempathy-gtk/empathy-chat.c:1639 msgid "unknown" msgstr "непознато" -#: ../libempathy-gtk/empathy-chat.c:1486 -#, c-format -msgid "Error sending message '%s': %s" -msgstr "Грешка при слању поруке „%s“: %s" - -#: ../libempathy-gtk/empathy-chat.c:1490 -#, c-format -msgid "Error sending message: %s" -msgstr "Грешка при слању поруке: %s" - -#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "Тема:" -#: ../libempathy-gtk/empathy-chat.c:1563 +#: ../libempathy-gtk/empathy-chat.c:1721 #, c-format msgid "Topic set to: %s" msgstr "Тема је постављена на: %s" -#: ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1723 +#, c-format +msgid "Topic set by %s to: %s" +msgstr "Тему је поставио %s на: %s" + +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1728 msgid "No topic defined" msgstr "Тема није постављена" -#: ../libempathy-gtk/empathy-chat.c:2074 +#: ../libempathy-gtk/empathy-chat.c:2244 msgid "(No Suggestions)" msgstr "(нема предлога)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2142 +#: ../libempathy-gtk/empathy-chat.c:2312 #, c-format msgid "Add '%s' to Dictionary" msgstr "Додај „%s“ у речник" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2179 +#: ../libempathy-gtk/empathy-chat.c:2349 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Додај „%s“ у речник за %s језик" -#: ../libempathy-gtk/empathy-chat.c:2249 +#: ../libempathy-gtk/empathy-chat.c:2419 msgid "Insert Smiley" msgstr "Убаци смешак" #. send button -#: ../libempathy-gtk/empathy-chat.c:2267 -#: ../libempathy-gtk/empathy-ui-utils.c:1839 +#: ../libempathy-gtk/empathy-chat.c:2437 +#: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "_Пошаљи" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2321 +#: ../libempathy-gtk/empathy-chat.c:2494 msgid "_Spelling Suggestions" msgstr "Предлози правопи_са" -#: ../libempathy-gtk/empathy-chat.c:2410 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Нисам успео да преузмем скорашње дневнике" -#: ../libempathy-gtk/empathy-chat.c:2547 +#: ../libempathy-gtk/empathy-chat.c:2722 #, c-format msgid "%s has disconnected" msgstr "%s је отишао са везе" @@ -1555,12 +1559,12 @@ msgstr "%s је отишао са везе" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2554 +#: ../libempathy-gtk/empathy-chat.c:2729 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s је избацио корисника %1$s" -#: ../libempathy-gtk/empathy-chat.c:2557 +#: ../libempathy-gtk/empathy-chat.c:2732 #, c-format msgid "%s was kicked" msgstr "%s је избачен" @@ -1568,17 +1572,17 @@ msgstr "%s је избачен" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2565 +#: ../libempathy-gtk/empathy-chat.c:2740 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s је забранио приступ кориснику %1$s" -#: ../libempathy-gtk/empathy-chat.c:2568 +#: ../libempathy-gtk/empathy-chat.c:2743 #, c-format msgid "%s was banned" msgstr "Кориснику %s је забрањен приступ" -#: ../libempathy-gtk/empathy-chat.c:2572 +#: ../libempathy-gtk/empathy-chat.c:2747 #, c-format msgid "%s has left the room" msgstr "%s је напустио(ла) причаоницу" @@ -1588,17 +1592,17 @@ msgstr "%s је напустио(ла) причаоницу" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2581 +#: ../libempathy-gtk/empathy-chat.c:2756 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2606 +#: ../libempathy-gtk/empathy-chat.c:2781 #, c-format msgid "%s has joined the room" msgstr "%s је приступио(ла) причаоници" -#: ../libempathy-gtk/empathy-chat.c:2631 +#: ../libempathy-gtk/empathy-chat.c:2806 #, c-format msgid "%s is now known as %s" msgstr "%s је сада познат као %s" @@ -1606,90 +1610,90 @@ msgstr "%s је сада познат као %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2784 -#: ../src/empathy-streamed-media-window.c:1894 -#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432 -#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527 +#: ../libempathy-gtk/empathy-chat.c:2993 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545 +#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638 msgid "Disconnected" msgstr "Веза је прекинута" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3428 +#: ../libempathy-gtk/empathy-chat.c:3657 msgid "Would you like to store this password?" msgstr "Да ли желите да запамтите ову лозинку?" -#: ../libempathy-gtk/empathy-chat.c:3434 +#: ../libempathy-gtk/empathy-chat.c:3663 msgid "Remember" msgstr "Запамти" -#: ../libempathy-gtk/empathy-chat.c:3444 +#: ../libempathy-gtk/empathy-chat.c:3673 msgid "Not now" msgstr "Не сада" -#: ../libempathy-gtk/empathy-chat.c:3488 +#: ../libempathy-gtk/empathy-chat.c:3717 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Покушај поново" -#: ../libempathy-gtk/empathy-chat.c:3492 +#: ../libempathy-gtk/empathy-chat.c:3721 msgid "Wrong password; please try again:" msgstr "Погрешна лозинка, покушајте поново:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3622 +#: ../libempathy-gtk/empathy-chat.c:3851 msgid "This room is protected by a password:" msgstr "Ова соба је заштићена лозинком:" -#: ../libempathy-gtk/empathy-chat.c:3649 +#: ../libempathy-gtk/empathy-chat.c:3878 msgid "Join" msgstr "Прикључи се" -#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261 +#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Повезан" -#: ../libempathy-gtk/empathy-chat.c:3906 +#: ../libempathy-gtk/empathy-chat.c:4125 msgid "Conversation" msgstr "Разговор" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3911 +#: ../libempathy-gtk/empathy-chat.c:4130 #, c-format msgid "%s (SMS)" msgstr "%s (СМС)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Непознати или неисправан идентификатор" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Блокирање пријатеља је тренутно недоступно" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Блокирање пријатеља није доступно" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Приступ је забрањен" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Не могу да блокирам пријатеља" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Измени блокиране пријатеље" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1489 -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "Account:" msgstr "Налог:" @@ -1699,466 +1703,371 @@ msgstr "Блокирани пријатељи" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:2 #: ../src/empathy-chatrooms-window.ui.h:3 -msgid "Remove" -msgstr "Уклони" - -#. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 -#: ../libempathy-gtk/empathy-webkit-utils.c:277 -msgid "_Copy Link Address" -msgstr "_Умножи адресу везе" - -#. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 -#: ../libempathy-gtk/empathy-webkit-utils.c:284 -msgid "_Open Link" -msgstr "_Отвори везу" - -#. Translators: timestamp displayed between conversations in -#. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 -msgid "%A %B %d %Y" -msgstr "%A %B %d %Y" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Измени податке контакта" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 -msgid "Personal Information" -msgstr "Подаци о профилу" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 -msgid "New Contact" -msgstr "Нови пријатељ" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 -#, c-format -msgid "Block %s?" -msgstr "Блокирати %s?" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 -#, c-format -msgid "Are you sure you want to block '%s' from contacting you again?" -msgstr "" -"Да ли сте сигурни да желите да блокирате да вас „%s“ више не контактира?" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 -msgid "_Block" -msgstr "_Блокирај" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 -msgid "_Report this contact as abusive" -msgid_plural "_Report these contacts as abusive" -msgstr[0] "П_ријави овај контакт за злоупотребу" -msgstr[1] "П_ријави ове контакте за злоупотребу" -msgstr[2] "П_ријави ове контакте за злоупотребу" -msgstr[3] "П_ријави овај контакт за злоупотребу" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "Од_лучи касније" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 -msgid "Subscription Request" -msgstr "Захтев за претплату" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 -msgid "_Block User" -msgstr "_Блокирај корисника" - -#: ../libempathy-gtk/empathy-contact-list-store.h:71 -msgid "Ungrouped" -msgstr "Негруписано" - -#: ../libempathy-gtk/empathy-contact-list-store.h:72 -msgid "Favorite People" -msgstr "Омиљени људи" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-individual-view.c:2376 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Да ли сте сигурни да желите да уклоните групу „%s“?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1988 -#: ../libempathy-gtk/empathy-individual-view.c:2379 -msgid "Removing group" -msgstr "Уклањам групу" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:2037 -#: ../libempathy-gtk/empathy-contact-list-view.c:2114 -#: ../libempathy-gtk/empathy-individual-view.c:2434 -#: ../libempathy-gtk/empathy-individual-view.c:2637 -msgid "_Remove" -msgstr "_Уклони" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2067 -#: ../libempathy-gtk/empathy-individual-view.c:2501 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Да ли сте сигурни да желите да уклоните пријатеља „%s“?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2069 -#: ../libempathy-gtk/empathy-individual-view.c:2522 -msgid "Removing contact" -msgstr "Уклањам пријатеља" - -#: ../libempathy-gtk/empathy-contact-menu.c:220 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "Дод_ај пријатеља…" - -#: ../libempathy-gtk/empathy-contact-menu.c:300 -msgid "_Block Contact" -msgstr "_Блокирај контакт" +msgid "Remove" +msgstr "Уклони" -#: ../libempathy-gtk/empathy-contact-menu.c:329 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "Ћа_скање" +#. Copy Link Address menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:322 +#: ../libempathy-gtk/empathy-webkit-utils.c:277 +msgid "_Copy Link Address" +msgstr "_Умножи адресу везе" -#: ../libempathy-gtk/empathy-contact-menu.c:361 -#: ../libempathy-gtk/empathy-individual-menu.c:849 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Аудио позив" +#. Open Link menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:329 +#: ../libempathy-gtk/empathy-webkit-utils.c:284 +msgid "_Open Link" +msgstr "_Отвори везу" -#: ../libempathy-gtk/empathy-contact-menu.c:394 -#: ../libempathy-gtk/empathy-individual-menu.c:894 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Видео позив" +#. Translators: timestamp displayed between conversations in +#. * chat windows (strftime format string) +#: ../libempathy-gtk/empathy-chat-text-view.c:417 +msgid "%A %B %d %Y" +msgstr "%A %B %d %Y" -#: ../libempathy-gtk/empathy-contact-menu.c:440 -#: ../libempathy-gtk/empathy-individual-menu.c:947 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "_Претходни разговори" +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +msgid "New Contact" +msgstr "Нови пријатељ" -#: ../libempathy-gtk/empathy-contact-menu.c:462 -#: ../libempathy-gtk/empathy-individual-menu.c:988 -msgid "Send File" -msgstr "Пошаљи датотеку" +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 +#, c-format +msgid "Block %s?" +msgstr "Блокирати %s?" -#: ../libempathy-gtk/empathy-contact-menu.c:485 -#: ../libempathy-gtk/empathy-individual-menu.c:1030 -msgid "Share My Desktop" -msgstr "Подели моју радну површ" +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#, c-format +msgid "Are you sure you want to block '%s' from contacting you again?" +msgstr "" +"Да ли сте сигурни да желите да блокирате да вас „%s“ више не контактира?" -#: ../libempathy-gtk/empathy-contact-menu.c:525 -#: ../libempathy-gtk/empathy-contact-widget.c:1886 -#: ../libempathy-gtk/empathy-individual-menu.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:1372 -msgid "Favorite" -msgstr "Омиљени" +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +msgid "_Block" +msgstr "_Блокирај" -#: ../libempathy-gtk/empathy-contact-menu.c:554 -#: ../libempathy-gtk/empathy-individual-menu.c:1093 -msgid "Infor_mation" -msgstr "_Подаци" +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +msgid "_Report this contact as abusive" +msgid_plural "_Report these contacts as abusive" +msgstr[0] "П_ријави овај контакт за злоупотребу" +msgstr[1] "П_ријави ове контакте за злоупотребу" +msgstr[2] "П_ријави ове контакте за злоупотребу" +msgstr[3] "П_ријави овај контакт за злоупотребу" -#: ../libempathy-gtk/empathy-contact-menu.c:600 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "Изм_ени" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 +msgid "Subscription Request" +msgstr "Захтев за претплату" -#: ../libempathy-gtk/empathy-contact-menu.c:654 -#: ../libempathy-gtk/empathy-individual-menu.c:1284 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Позивам вас у ову собу" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 +msgid "_Block User" +msgstr "_Блокирај корисника" -#: ../libempathy-gtk/empathy-contact-menu.c:685 -#: ../libempathy-gtk/empathy-individual-menu.c:1330 -msgid "_Invite to Chat Room" -msgstr "Позов_и у собу за ћаскање" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "Decide _Later" +msgstr "Од_лучи касније" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Претражи контакте" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Претрага:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "Дод_ај пријатеља" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Није пронађен ниједан пријатељ" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "Порука која вас представља:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "Молим вас обавестите не када сте на мрежи. Хвала!" -#: ../libempathy-gtk/empathy-contact-selector.c:129 -msgid "Select a contact" -msgstr "Изаберите пријатеља" - -#: ../libempathy-gtk/empathy-contact-widget.c:336 -#: ../libempathy-gtk/empathy-individual-widget.c:153 -msgid "Full name:" -msgstr "Пуно име:" - -#: ../libempathy-gtk/empathy-contact-widget.c:337 -#: ../libempathy-gtk/empathy-individual-widget.c:154 -msgid "Phone number:" -msgstr "Број телефона:" - -#: ../libempathy-gtk/empathy-contact-widget.c:338 -#: ../libempathy-gtk/empathy-individual-widget.c:155 -msgid "E-mail address:" -msgstr "Адреса е-поште:" - -#: ../libempathy-gtk/empathy-contact-widget.c:339 -#: ../libempathy-gtk/empathy-individual-widget.c:156 -msgid "Website:" -msgstr "Веб страница:" - -#: ../libempathy-gtk/empathy-contact-widget.c:340 -#: ../libempathy-gtk/empathy-individual-widget.c:157 -msgid "Birthday:" -msgstr "Рођендан:" - -#. Note to translators: this is the caption for a string of the form "5 -#. * minutes ago", and refers to the time since the contact last interacted -#. * with their IM client. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:346 -msgid "Last seen:" -msgstr "Виђен пре:" - -#: ../libempathy-gtk/empathy-contact-widget.c:348 -msgid "Connected from:" -msgstr "Повезан са:" - -#. FIXME: once Idle implements SimplePresence using this information, we can -#. * and should bin this. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:353 -msgid "Away message:" -msgstr "Порука за одсутност:" - -#: ../libempathy-gtk/empathy-contact-widget.c:606 +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Канали:" -#: ../libempathy-gtk/empathy-contact-widget.c:897 -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "ИСО код државе:" -#: ../libempathy-gtk/empathy-contact-widget.c:899 -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Држава:" -#: ../libempathy-gtk/empathy-contact-widget.c:901 -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Република:" -#: ../libempathy-gtk/empathy-contact-widget.c:903 -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Град:" -#: ../libempathy-gtk/empathy-contact-widget.c:905 -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Област:" -#: ../libempathy-gtk/empathy-contact-widget.c:907 -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Поштански код:" -#: ../libempathy-gtk/empathy-contact-widget.c:909 -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Улица:" -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Зграда:" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Спрат:" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Соба:" -#: ../libempathy-gtk/empathy-contact-widget.c:917 -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Текст:" -#: ../libempathy-gtk/empathy-contact-widget.c:919 -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Опис:" -#: ../libempathy-gtk/empathy-contact-widget.c:921 -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "Адреса:" -#: ../libempathy-gtk/empathy-contact-widget.c:923 -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Ниво тачности:" -#: ../libempathy-gtk/empathy-contact-widget.c:925 -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Грешка:" -#: ../libempathy-gtk/empathy-contact-widget.c:927 -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Усправна грешка (у метрима):" -#: ../libempathy-gtk/empathy-contact-widget.c:929 -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Водоравна грешка (у метрима):" -#: ../libempathy-gtk/empathy-contact-widget.c:931 -#: ../libempathy-gtk/empathy-individual-widget.c:503 +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Брзина:" -#: ../libempathy-gtk/empathy-contact-widget.c:933 -#: ../libempathy-gtk/empathy-individual-widget.c:505 +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Правац:" -#: ../libempathy-gtk/empathy-contact-widget.c:935 -#: ../libempathy-gtk/empathy-individual-widget.c:507 +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Брзина пењања:" -#: ../libempathy-gtk/empathy-contact-widget.c:937 -#: ../libempathy-gtk/empathy-individual-widget.c:509 +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Последњи пут ажурирано:" -#: ../libempathy-gtk/empathy-contact-widget.c:939 -#: ../libempathy-gtk/empathy-individual-widget.c:511 +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Географска дужина:" -#: ../libempathy-gtk/empathy-contact-widget.c:941 -#: ../libempathy-gtk/empathy-individual-widget.c:513 +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Географска ширина:" -#: ../libempathy-gtk/empathy-contact-widget.c:943 -#: ../libempathy-gtk/empathy-individual-widget.c:515 +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Висина:" -#: ../libempathy-gtk/empathy-contact-widget.c:996 -#: ../libempathy-gtk/empathy-contact-widget.c:1011 -#: ../libempathy-gtk/empathy-individual-widget.c:607 -#: ../libempathy-gtk/empathy-individual-widget.c:622 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:35 msgid "Location" msgstr "Локација" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:1013 -#: ../libempathy-gtk/empathy-individual-widget.c:624 +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:673 +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%e.%d.%Y у %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1147 -#: ../libempathy-gtk/empathy-individual-widget.c:915 +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Сачувај слику" -#: ../libempathy-gtk/empathy-contact-widget.c:1203 -#: ../libempathy-gtk/empathy-individual-widget.c:973 +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Не могу да сачувам слику" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -msgid "Location at (date)\t" -msgstr "Локација у (датум)\t" - -#. Alias -#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1308 -msgid "Alias:" -msgstr "Надимак:" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "Client Information" -msgstr "Подаци о клијенту" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 -msgid "Client:" -msgstr "Програм:" +#: ../libempathy-gtk/empathy-contact-widget.c:1446 +msgid "Personal Details" +msgstr "Лични подаци" +#: ../libempathy-gtk/empathy-contact-widget.c:1449 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" msgstr "Детаљи о пријатељу" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +msgid "Full name" +msgstr "Име и презиме" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "Број телефона" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "Адреса ел. поште" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +msgid "Website" +msgstr "Веб страница" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +msgid "Birthday" +msgstr "Рођендан" + +#. Note to translators: this is the caption for a string of the form "5 +#. * minutes ago", and refers to the time since the contact last interacted +#. * with their IM client. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +msgid "Last seen:" +msgstr "Виђен пре:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +msgid "Connected from:" +msgstr "Повезан са:" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +msgid "Away message:" +msgstr "Порука за одсутност:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +msgid "work" +msgstr "посао" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +msgid "home" +msgstr "кућа" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +msgid "mobile" +msgstr "мобилни" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +msgid "voice" +msgstr "гласовни" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +msgid "preferred" +msgstr "првенствени" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "поштански" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +msgid "parcel" +msgstr "пошиљка" + #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1517 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "Идентификатор:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +#. Alias +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 +msgid "Alias:" +msgstr "Надимак:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Location at (date)\t" +msgstr "Локација у (датум)\t" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 msgid "Information requested…" msgstr "Захтевани су подаци…" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Client Information" +msgstr "Подаци о клијенту" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "OS:" msgstr "ОС:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Version:" msgstr "Издање:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Client:" +msgstr "Програм:" + +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "Групе" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2166,21 +2075,21 @@ msgstr "" "Изаберите групе у којима желите да се пријатељ налази. Приметите да можете " "да одаберете и више група као и ниједну." -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "Дод_ај групу" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Изабери" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1807 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1951 msgid "Group" msgstr "Група" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Следећи идентитет ће бити блокиран:" @@ -2188,7 +2097,7 @@ msgstr[1] "Следећи идентитети ће бити блокирани: msgstr[2] "Следећи идентитети ће бити блокирани:" msgstr[3] "Следећи идентитет ће бити блокиран:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Следећи идентитет не може бити блокиран:" @@ -2196,79 +2105,144 @@ msgstr[1] "Следећи идентитети не могу бити блоки msgstr[2] "Следећи идентитети не могу бити блокирани:" msgstr[3] "Следећи идентитет не може бити блокиран:" -#. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 -msgid "Linked Contacts" -msgstr "Повезани пријатељи" - -#: ../libempathy-gtk/empathy-individual-linker.c:370 -msgid "Select contacts to link" -msgstr "Изаберите пријатеља за повезивање" - -#: ../libempathy-gtk/empathy-individual-linker.c:444 -msgid "New contact preview" -msgstr "Преглед новог пријатеља" - -#: ../libempathy-gtk/empathy-individual-linker.c:488 -msgid "Contacts selected in the list on the left will be linked together." -msgstr "Означени пријатељи на списку лево ће бити увезани заједно." +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Измени податке контакта" #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:145 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Изаберите налог који ће бити коришћен за позив" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 -#: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1299 -#: ../src/empathy-call-window.ui.h:2 +#: ../libempathy-gtk/empathy-individual-menu.c:348 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "Позив" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Мобилни" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Посао" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "КУЋА" -#. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:804 -#: ../libempathy-gtk/empathy-new-message-dialog.c:215 +#: ../libempathy-gtk/empathy-individual-menu.c:658 +msgid "_Block Contact" +msgstr "_Блокирај контакт" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1017 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:1 +msgid "_Chat" +msgstr "Ћа_скање" + +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:1052 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_СМС" -#: ../libempathy-gtk/empathy-individual-menu.c:1142 +#: ../libempathy-gtk/empathy-individual-menu.c:1085 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Аудио позив" + +#: ../libempathy-gtk/empathy-individual-menu.c:1118 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Видео позив" + +#: ../libempathy-gtk/empathy-individual-menu.c:1159 +#: ../src/empathy-roster-window-menubar.ui.h:4 +msgid "_Previous Conversations" +msgstr "_Претходни разговори" + +#: ../libempathy-gtk/empathy-individual-menu.c:1188 +msgid "Send File" +msgstr "Пошаљи датотеку" + +#: ../libempathy-gtk/empathy-individual-menu.c:1218 +msgid "Share My Desktop" +msgstr "Подели моју радну површ" + +#: ../libempathy-gtk/empathy-individual-menu.c:1244 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Омиљени" + +#: ../libempathy-gtk/empathy-individual-menu.c:1263 +msgid "gnome-contacts not installed" +msgstr "програм гномови контакти није инсталиран" + +#: ../libempathy-gtk/empathy-individual-menu.c:1266 +msgid "Please install gnome-contacts to access contacts details." +msgstr "Инсталирајте „gnome-contacts“ да приступите подацима контаката." + +#: ../libempathy-gtk/empathy-individual-menu.c:1380 +msgid "Infor_mation" +msgstr "_Подаци" + +#: ../libempathy-gtk/empathy-individual-menu.c:1429 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Уреди" -#. Translators: this is a verb meaning "to connect two contacts together -#. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1168 -msgctxt "Link individual (contextual menu)" -msgid "_Link Contacts…" -msgstr "_Повежи контакте…" +#: ../libempathy-gtk/empathy-individual-menu.c:1546 +#: ../src/empathy-chat-window.c:1175 +msgid "Inviting you to this room" +msgstr "Позивам вас у ову собу" -#: ../libempathy-gtk/empathy-individual-view.c:2341 +#: ../libempathy-gtk/empathy-individual-menu.c:1592 +msgid "_Invite to Chat Room" +msgstr "Позов_и у собу за ћаскање" + +#: ../libempathy-gtk/empathy-individual-menu.c:1788 +#: ../src/empathy-roster-window-menubar.ui.h:5 +msgid "_Add Contact…" +msgstr "Дод_ај пријатеља…" + +#: ../libempathy-gtk/empathy-individual-view.c:2306 msgid "Delete and _Block" msgstr "Избриши и _блокирај" -#: ../libempathy-gtk/empathy-individual-view.c:2510 +#: ../libempathy-gtk/empathy-individual-view.c:2341 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Да ли сте сигурни да желите да уклоните групу „%s“?" + +#: ../libempathy-gtk/empathy-individual-view.c:2344 +msgid "Removing group" +msgstr "Уклањам групу" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2399 +#: ../libempathy-gtk/empathy-individual-view.c:2603 +msgid "_Remove" +msgstr "_Уклони" + +#: ../libempathy-gtk/empathy-individual-view.c:2476 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Да ли сте сигурни да желите да уклоните пријатеља „%s“?" + +#: ../libempathy-gtk/empathy-individual-view.c:2485 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2277,7 +2251,11 @@ msgstr "" "Да ли стварно желите да уклоните увезани контакт „%s“? Ово ће уклонити и све " "контакте који су везани за овај контакт." -#: ../libempathy-gtk/empathy-individual-widget.c:1656 +#: ../libempathy-gtk/empathy-individual-view.c:2497 +msgid "Removing contact" +msgstr "Уклањам пријатеља" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2290,23 +2268,23 @@ msgstr[3] "Увезани пријатељ садржи један контак msgid "Location at (date)" msgstr "Локација у (датум)" -#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 msgid "Online from a phone or mobile device" msgstr "На вези преко телефона или мобилног уређаја" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "Нова мрежа" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "Одаберите ИРЦ мрежу" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "Ресетуј _мрежни списак" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Изабери" @@ -2319,91 +2297,48 @@ msgstr "нови сервер" msgid "SSL" msgstr "ССЛ" -#. Translators: this is the title of the linking dialogue (reached by -#. * right-clicking on a contact and selecting "Link…"). "Link" in this title -#. * is a verb. -#: ../libempathy-gtk/empathy-linking-dialog.c:115 -msgid "Link Contacts" -msgstr "Повежи пријатеље" - -#: ../libempathy-gtk/empathy-linking-dialog.c:120 -msgctxt "Unlink individual (button)" -msgid "_Unlink…" -msgstr "_Развежи…" - -#: ../libempathy-gtk/empathy-linking-dialog.c:121 -msgid "" -"Completely split the displayed linked contacts into the separate contacts." -msgstr "Раздваја увезане контакте у посебне пријатеље." - -#. Add button -#. Translators: this is an action button in the linking dialogue. "Link" is -#. * used here as a verb meaning "to connect two contacts to form a -#. * meta-contact". -#: ../libempathy-gtk/empathy-linking-dialog.c:136 -msgid "_Link" -msgstr "_Увежи" - -#: ../libempathy-gtk/empathy-linking-dialog.c:183 -#, c-format -msgid "Unlink linked contacts '%s'?" -msgstr "Да развежем увезаног пријатеља „%s“?" - -#: ../libempathy-gtk/empathy-linking-dialog.c:186 -msgid "" -"Are you sure you want to unlink these linked contacts? This will completely " -"split the linked contacts into separate contacts." -msgstr "" -"Да ли сте сигурни да желите да развежете увезаног пријатеља? Овим ћете " -"раздвојити увезане контакте у посебне пријатеље." - -#: ../libempathy-gtk/empathy-linking-dialog.c:190 -msgctxt "Unlink individual (button)" -msgid "_Unlink" -msgstr "_Развежи" - -#: ../libempathy-gtk/empathy-log-window.c:634 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Историјат" -#: ../libempathy-gtk/empathy-log-window.c:689 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Прикажи" -#: ../libempathy-gtk/empathy-log-window.c:711 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Потражи" -#: ../libempathy-gtk/empathy-log-window.c:1159 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Ћаскање у %s" -#: ../libempathy-gtk/empathy-log-window.c:1161 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Ћаскање са %s" -#: ../libempathy-gtk/empathy-log-window.c:1211 -#: ../libempathy-gtk/empathy-log-window.c:1358 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e %B %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1300 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1306 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" @@ -2412,7 +2347,7 @@ msgstr[1] "%s секунде" msgstr[2] "%s секунди" msgstr[3] "једне секунде" -#: ../libempathy-gtk/empathy-log-window.c:1389 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" @@ -2421,151 +2356,197 @@ msgstr[1] "%s минута" msgstr[2] "%s минута" msgstr[3] "једног минута" -#: ../libempathy-gtk/empathy-log-window.c:1397 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Позив је започет %s, а завршен је %s" -#: ../libempathy-gtk/empathy-log-window.c:1729 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Данас" -#: ../libempathy-gtk/empathy-log-window.c:1733 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Јуче" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1748 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e. %B %Y." #: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3444 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Било кад" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2372 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Било ко" -#: ../libempathy-gtk/empathy-log-window.c:2685 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Ко" -#: ../libempathy-gtk/empathy-log-window.c:2889 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Када" -#: ../libempathy-gtk/empathy-log-window.c:3005 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Било шта" -#: ../libempathy-gtk/empathy-log-window.c:3007 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Писана ћаскања" -#: ../libempathy-gtk/empathy-log-window.c:3009 -#: ../src/empathy-preferences.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "Позиви" -#: ../libempathy-gtk/empathy-log-window.c:3014 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Долазни позиви" -#: ../libempathy-gtk/empathy-log-window.c:3015 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Одлазећи позиви" -#: ../libempathy-gtk/empathy-log-window.c:3016 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Пропуштени позиви" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Шта" -#: ../libempathy-gtk/empathy-log-window.c:3747 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "" "Да ли сте сигурни да желите да обришете све дневнике претходних разговора?" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Очисти све" -#: ../libempathy-gtk/empathy-log-window.c:3758 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Обриши од:" #: ../libempathy-gtk/empathy-log-window.ui.h:1 -msgid "Loading..." -msgstr "Учитавам..." +msgid "_File" +msgstr "_Датотека" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 -#: ../src/empathy-chat-window.ui.h:3 -msgid "Chat" -msgstr "Ћаскање" +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:12 +msgid "_Edit" +msgstr "Изм_ени" -#: ../libempathy-gtk/empathy-log-window.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Delete All History..." msgstr "Обриши сав историјат..." -#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "Profile" msgstr "Профил" -#: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:20 -msgid "Video" -msgstr "Видео" +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:19 +msgid "Chat" +msgstr "Ћаскање" #: ../libempathy-gtk/empathy-log-window.ui.h:7 -#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 -msgid "_Edit" -msgstr "Изм_ени" +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "Video" +msgstr "Видео" #: ../libempathy-gtk/empathy-log-window.ui.h:8 -msgid "_File" -msgstr "_Датотека" - -#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "страна 2" -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 -msgid "Contact ID:" -msgstr "ИБ пријатеља:" +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "Loading..." +msgstr "Учитавам..." + +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 +msgid "The contact is offline" +msgstr "Контакт није на вези" -#. add chat button -#: ../libempathy-gtk/empathy-new-message-dialog.c:225 -msgid "C_hat" -msgstr "Ћ_аскај" +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 +msgid "The specified contact is either invalid or unknown" +msgstr "Наведени контакт или је неисправан или непознат" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 +msgid "The contact does not support this kind of conversation" +msgstr "Контакт не подржава ову врсту разговора" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 +msgid "The requested functionality is not implemented for this protocol" +msgstr "Захтевана функционалност није примењена за овај протокол" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 +msgid "Could not start a conversation with the given contact" +msgstr "Не могу да започнем разговор са датим контактом" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 +msgid "You are banned from this channel" +msgstr "Избачени сте са овог канала" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 +msgid "This channel is full" +msgstr "Овај канал је пун" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 +msgid "You must be invited to join this channel" +msgstr "Морате бити позвани да се придружите овом каналу" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 +msgid "Can't proceed while disconnected" +msgstr "Не могу да наставим док је веза прекинута" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 +msgid "Permission denied" +msgstr "Забрањен приступ" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 +msgid "There was an error starting the conversation" +msgstr "Дошло је до грешке приликом започињања разговора" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 +msgid "Enter a contact identifier or phone number:" +msgstr "Унесите одредник контакта или телефонски број:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:244 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Нови разговор" -#. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:204 -msgid "Send _Video" -msgstr "Пошаљи _видео" +#. add video button +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +msgid "_Video Call" +msgstr "_Видео позив" -#. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:215 -msgid "C_all" -msgstr "_Позови" +#. add audio button +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 +msgid "_Audio Call" +msgstr "_Аудио позив" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Нови позив" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Није успело потврђивање идентитета за налог %s" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2602,12 +2583,8 @@ msgstr "Кликните да поставите ову поруку стања msgid "Set status" msgstr "Постави стање" -#: ../libempathy-gtk/empathy-presence-chooser.c:943 -msgid "Set your presence and current status" -msgstr "Поставите ваше присуство и тренутно стање" - #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1131 +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 msgid "Custom messages…" msgstr "Произвољне поруке…" @@ -2625,20 +2602,20 @@ msgid "Find:" msgstr "Тражи:" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -msgid "Mat_ch case" -msgstr "_Упореди величину слова" +msgid "_Previous" +msgstr "_Претходно" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Phrase not found" -msgstr "Израз није пронађен" - -#: ../libempathy-gtk/empathy-search-bar.ui.h:4 msgid "_Next" msgstr "_Следеће" +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "Mat_ch case" +msgstr "_Упореди величину слова" + #: ../libempathy-gtk/empathy-search-bar.ui.h:5 -msgid "_Previous" -msgstr "_Претходно" +msgid "Phrase not found" +msgstr "Израз није пронађен" #: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" @@ -2684,12 +2661,12 @@ msgstr "Позив за разговор је завршен" msgid "Edit Custom Messages" msgstr "Уреди произвољне поруке" -#: ../libempathy-gtk/empathy-theme-adium.c:1036 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "Порука је уређена %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1726 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "Нормално" @@ -2766,34 +2743,39 @@ msgid "Certificate hostname: %s" msgstr "Име домаћина сертификата: %s" #: ../libempathy-gtk/empathy-tls-dialog.c:281 -msgid "Continue" -msgstr "Настави" +#| msgid "Continue" +msgid "C_ontinue" +msgstr "_Настави" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "Неповерљива веза" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Ова веза није од поверења. Желите ли ипак да наставите?" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "Запамти овај избор за наредне везе" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "Детаљи сертификата" -#: ../libempathy-gtk/empathy-ui-utils.c:1735 +#: ../libempathy-gtk/empathy-ui-utils.c:1741 msgid "Unable to open URI" msgstr "Не могу да отворим адресу" -#: ../libempathy-gtk/empathy-ui-utils.c:1831 +#: ../libempathy-gtk/empathy-ui-utils.c:1859 msgid "Select a file" msgstr "Изаберите датотеку" -#: ../libempathy-gtk/empathy-ui-utils.c:1903 +#: ../libempathy-gtk/empathy-ui-utils.c:1934 msgid "Insufficient free space to save file" msgstr "Нема довољно слободног места за чување датотеке" -#: ../libempathy-gtk/empathy-ui-utils.c:1911 +#: ../libempathy-gtk/empathy-ui-utils.c:1942 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2802,7 +2784,7 @@ msgstr "" "Потребно је %s за снимање ове датотеке, али је доступно само %s. Одаберите " "друго место за снимање." -#: ../libempathy-gtk/empathy-ui-utils.c:1955 +#: ../libempathy-gtk/empathy-ui-utils.c:1986 #, c-format msgid "Incoming file from %s" msgstr "Долазећа датотека од %s" @@ -2974,40 +2956,32 @@ msgstr "западни" msgid "Vietnamese" msgstr "вијетнамски" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 -msgid "The selected contact cannot receive files." -msgstr "Изабрани пријатељ не може да прими датотеке." - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 -msgid "The selected contact is offline." -msgstr "Изабрани пријатељ није на вези." - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Нема порука о грешкама" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Брза порука (Писмоноша)" -#: ../src/empathy.c:431 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Не повезуј се по покретању" -#: ../src/empathy.c:435 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "" "Не приказуј списак пријатеља нити било које друго прозорче по покретању" -#: ../src/empathy.c:450 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "— Интернет писмоноша за брзе поруке" -#: ../src/empathy.c:637 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Грешка при комуникацији са Управником налога" -#: ../src/empathy.c:639 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3055,11 +3029,11 @@ msgstr "" "адресу: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " "Boston, MA 02110-1301 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Гномов програм за брзе поруке" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Данило Шеган \n" @@ -3101,35 +3075,36 @@ msgstr "" "затворите помоћника и додате налоге касније из менија „Измени“." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1276 msgid "An error occurred" msgstr "Дошло је до грешке" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Који тип налога за ћаскање имате?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "Да ли имате још неки налог за ћаскање који желите да подесите?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Унесите детаље налога" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Који тип налога за ћаскање желите да направите?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Да ли желите да направите још налога за ћаскање?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Унесите детаље новог налога" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3141,42 +3116,42 @@ msgstr "" "програме за ћаскање. Са микрофоном и камером такође можете да обављате и " "аудио и видео позиве." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "" "Да ли имате налог који сте користили са неким другим програмом за ћаскање?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Да, увези детаље мог налога из " -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Да, ја ћу сам унети детаље налога" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Не, желим нови налог" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Не, за сада само желим да видим људе у близини" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Изаберите налоге које желите да увезете:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Да" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Не, то је све за сада" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3188,16 +3163,16 @@ msgstr "" "су детаљи испод тачни. Лако их можете изменити касније или искључити ову " "могућност из прозорчета „Налози“." -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 msgid "Edit->Accounts" msgstr "Измени->Налози" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "За сада _не желим да користим ову могућност" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1148 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3208,85 +3183,93 @@ msgstr "" "salut није инсталиран. Ако желите да омогућите ово, инсталирајте пакет " "telepathy-salut и направите налог „Људи у околини“ из прозорчета „Налози“." -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1154 msgid "telepathy-salut not installed" msgstr "telepathy-salut није инсталиран" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1200 msgid "Messaging and VoIP Accounts Assistant" msgstr "Асистент налога за брзе поруке и ВоИП" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1234 msgid "Welcome to Empathy" msgstr "Добродошли у Интернет Писмоношу" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1243 msgid "Import your existing accounts" msgstr "Увезите ваше постојеће налоге" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1261 msgid "Please enter personal details" msgstr "Унесите личне податке" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Постоје несачуване измене на вашем налогу %s." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Ваш нови налог још није сачуван." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:754 -#: ../src/empathy-call-window.c:1216 +#: ../src/empathy-accounts-dialog.c:344 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1332 msgid "Connecting…" msgstr "Повезујем се…" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:385 #, c-format msgid "Offline — %s" msgstr "Неповезан — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:397 #, c-format msgid "Disconnected — %s" msgstr "Веза је прекинута — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:408 msgid "Offline — No Network Connection" msgstr "Неповезан — Нема мрежне конекције" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:415 msgid "Unknown Status" msgstr "Непознато стање" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:427 msgid "Offline — Account Disabled" msgstr "Неповезан — Налог је онемогућен" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Овим ћете направити нови налог, занемаривши унете измене.\n" -"Да ли сигурно желите да наставите?" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "Уредите параметре повезивања" + +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "Нисам успео да довучем ваше личне податке са сервера." + +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "Успоставите везу да уредите ваше личне податке." -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "_Уреди параметре повезивања..." + +#: ../src/empathy-accounts-dialog.c:1289 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Да ли сте сигурни да желите да уклоните „%s“ са вашег рачунара?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1293 msgid "This will not remove your account on the server." msgstr "Ово неће уклонити ваш налог на серверу." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1529 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3295,15 +3278,15 @@ msgstr "" "Да ли сигурно желите да наставите?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1705 msgid "_Enable" msgstr "_Омогући" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1706 msgid "_Disable" msgstr "О_немогући" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2176 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3315,19 +3298,15 @@ msgstr "" msgid "Add…" msgstr "Додај…" -#: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Loading account information" -msgstr "Учитавам податке о налогу" - #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "No protocol installed" -msgstr "Ниједан протокол није инсталиран" +msgid "_Import…" +msgstr "_Увези…" #: ../src/empathy-accounts-dialog.ui.h:4 msgid "Protocol:" msgstr "Протокол:" -#: ../src/empathy-accounts-dialog.ui.h:6 +#: ../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." @@ -3335,15 +3314,19 @@ msgstr "" "Да додате нови налог, прво морате да инсталирате прикључке за све протоколе " "које желите да користите." +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "Ниједан протокол није инсталиран" + #: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Import…" -msgstr "_Увези…" +msgid "Loading account information" +msgstr "Учитавам податке о налогу" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr " — Интернет писмоноша клијент пријаве" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Интернет писмоноша клијент пријаве" @@ -3351,132 +3334,120 @@ msgstr "Интернет писмоноша клијент пријаве" msgid "People nearby" msgstr "Људи у околини" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:192 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:203 msgid "- Empathy Audio/Video Client" msgstr "— Интернет писмоноша Аудио/Видео клијент" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:217 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:228 msgid "Empathy Audio/Video Client" msgstr "Интернет писмоноша Аудио/Видео клијент" -#: ../src/empathy-streamed-media-window.c:431 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Контраст" -#: ../src/empathy-streamed-media-window.c:434 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Осветљеност" -#: ../src/empathy-streamed-media-window.c:437 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Гама" -#: ../src/empathy-streamed-media-window.c:542 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Јачина звука" -#: ../src/empathy-streamed-media-window.c:1110 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "_Бочна површ" -#: ../src/empathy-streamed-media-window.c:1130 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Звучни улаз" -#: ../src/empathy-streamed-media-window.c:1134 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Видео улаз" -#: ../src/empathy-streamed-media-window.c:1140 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Бројчаник" -#: ../src/empathy-streamed-media-window.c:1151 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Детаљи" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1220 -#: ../src/empathy-call-window.c:1825 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1934 #, c-format msgid "Call with %s" msgstr "Позив са корисником %s" -#: ../src/empathy-streamed-media-window.c:1453 -#: ../src/empathy-call-window.c:2069 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2178 msgid "The IP address as seen by the machine" msgstr "ИП адреса како је види овај рачунар" -#: ../src/empathy-streamed-media-window.c:1455 -#: ../src/empathy-call-window.c:2071 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2180 msgid "The IP address as seen by a server on the Internet" msgstr "ИП адреса како је види сервер на интернету" -#: ../src/empathy-streamed-media-window.c:1457 -#: ../src/empathy-call-window.c:2073 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2182 msgid "The IP address of the peer as seen by the other side" msgstr "ИП адреса вршњака како је види друга страна" -#: ../src/empathy-streamed-media-window.c:1459 -#: ../src/empathy-call-window.c:2075 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2184 msgid "The IP address of a relay server" msgstr "ИП адреса релејног сервера" -#: ../src/empathy-streamed-media-window.c:1461 -#: ../src/empathy-call-window.c:2077 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2186 msgid "The IP address of the multicast group" msgstr "ИП адреса групе за вишеструко емитовање" -#: ../src/empathy-streamed-media-window.c:1843 -msgctxt "encoding video codec" -msgid "Unknown" -msgstr "Непознато" - -#: ../src/empathy-streamed-media-window.c:1846 -msgctxt "encoding audio codec" -msgid "Unknown" -msgstr "Непознато" - -#: ../src/empathy-streamed-media-window.c:1849 -msgctxt "decoding video codec" -msgid "Unknown" -msgstr "Непознато" - -#: ../src/empathy-streamed-media-window.c:1852 -msgctxt "decoding audio codec" +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 +msgctxt "codec" msgid "Unknown" msgstr "Непознато" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2144 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "Повезан — %d:%02dм" -#: ../src/empathy-streamed-media-window.c:2205 -#: ../src/empathy-call-window.c:2846 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3040 msgid "Technical Details" msgstr "Технички детаљи" -#: ../src/empathy-streamed-media-window.c:2243 -#: ../src/empathy-call-window.c:2884 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3079 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " "computer" msgstr "Програм %s не разуме ниједан звучни формат који подржава ваш рачунар" -#: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:2889 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3084 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " "computer" msgstr "Програм %s не разуме ниједан видео формат који подржава ваш рачунар" -#: ../src/empathy-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:2895 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3485,27 +3456,27 @@ msgstr "" "Не могу да успоставим везу са %s. Можда је неко од вас двоје на мрежи која " "не дозвољава директне везе." -#: ../src/empathy-streamed-media-window.c:2260 -#: ../src/empathy-call-window.c:2901 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3096 msgid "There was a failure on the network" msgstr "Дошло је до грешке у мрежи" -#: ../src/empathy-streamed-media-window.c:2264 -#: ../src/empathy-call-window.c:2905 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3100 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "Звучни формати потребни за овај позив нису инсталирани на вашем рачунару" -#: ../src/empathy-streamed-media-window.c:2267 -#: ../src/empathy-call-window.c:2908 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3103 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Видео формати потребни за овај позив нису инсталирани на вашем рачунару" -#: ../src/empathy-streamed-media-window.c:2277 -#: ../src/empathy-call-window.c:2920 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3115 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please ову грешку и прикачите дневнике покупљене из прозора „Отклањање " "грешака“ у менију „Помоћ“." -#: ../src/empathy-streamed-media-window.c:2285 -#: ../src/empathy-call-window.c:2929 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3124 msgid "There was a failure in the call engine" msgstr "Дошло је до грешке у мотору за позиве" -#: ../src/empathy-streamed-media-window.c:2288 -#: ../src/empathy-call-window.c:2932 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3127 msgid "The end of the stream was reached" msgstr "Достигнут је крај тока" -#: ../src/empathy-streamed-media-window.c:2328 -#: ../src/empathy-call-window.c:2972 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3167 msgid "Can't establish audio stream" msgstr "Не могу да успоставим звучни ток" -#: ../src/empathy-streamed-media-window.c:2338 -#: ../src/empathy-call-window.c:2982 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3177 msgid "Can't establish video stream" msgstr "Не могу да успоставим видео ток" -#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2 +#: ../src/empathy-call-window.ui.h:1 #: ../src/empathy-streamed-media-window.ui.h:1 -msgid "Audio" -msgstr "Аудио" +msgid "_Call" +msgstr "_Позови" #: ../src/empathy-call-window.ui.h:3 -#: ../src/empathy-streamed-media-window.ui.h:5 -msgid "Decoding Codec:" -msgstr "Кодек за декодирање:" +msgid "_Microphone" +msgstr "Ми_крофон" #: ../src/empathy-call-window.ui.h:4 -msgid "Disable camera" -msgstr "Искључите камерицу" +msgid "_Camera" +msgstr "_Камерица" #: ../src/empathy-call-window.ui.h:5 -msgid "Display the dialpad" -msgstr "Прикажите бројчаник" +msgid "_Settings" +msgstr "По_дешавања" #: ../src/empathy-call-window.ui.h:6 -#: ../src/empathy-streamed-media-window.ui.h:9 -msgid "Encoding Codec:" -msgstr "Кодек за кодирање:" +#: ../src/empathy-roster-window-menubar.ui.h:17 +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "_View" +msgstr "Пре_глед" -#: ../src/empathy-call-window.ui.h:7 -#: ../src/empathy-streamed-media-window.ui.h:10 -msgid "Hang up" -msgstr "Прекини" +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:27 +msgid "_Help" +msgstr "По_моћ" -#: ../src/empathy-call-window.ui.h:8 -#: ../src/empathy-streamed-media-window.ui.h:11 -msgid "Hang up current call" -msgstr "Прекините тренутни позив" +#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:28 +msgid "_Contents" +msgstr "_Садржај" #: ../src/empathy-call-window.ui.h:9 -#: ../src/empathy-streamed-media-window.ui.h:12 -msgid "Local Candidate:" -msgstr "Локални кандидат:" +#: ../src/empathy-roster-window-menubar.ui.h:29 +msgid "_Debug" +msgstr "Отклањање _грешака" #: ../src/empathy-call-window.ui.h:10 -msgid "Maximise me" -msgstr "Увећај ме" +msgid "Swap camera" +msgstr "Размени камеру" #: ../src/empathy-call-window.ui.h:11 msgid "Minimise me" msgstr "Умањи ме" #: ../src/empathy-call-window.ui.h:12 -#: ../src/empathy-streamed-media-window.ui.h:15 -msgid "Remote Candidate:" -msgstr "Удаљени кандидат:" +msgid "Maximise me" +msgstr "Увећај ме" #: ../src/empathy-call-window.ui.h:13 -#: ../src/empathy-streamed-media-window.ui.h:16 -msgid "Send Audio" -msgstr "Пошаљи звук" +msgid "Disable camera" +msgstr "Искључите камерицу" #: ../src/empathy-call-window.ui.h:14 -msgid "Send Video" -msgstr "Пошаљи видео" +#: ../src/empathy-streamed-media-window.ui.h:2 +msgid "Hang up" +msgstr "Прекини" #: ../src/empathy-call-window.ui.h:15 -msgid "Show dialpad" -msgstr "Прикажи бројчаник" +#: ../src/empathy-streamed-media-window.ui.h:9 +msgid "Hang up current call" +msgstr "Прекините тренутни позив" #: ../src/empathy-call-window.ui.h:16 +msgid "Video call" +msgstr "Видео позив" + +#: ../src/empathy-call-window.ui.h:17 msgid "Start a video call" msgstr "Започните видео позив" -#: ../src/empathy-call-window.ui.h:17 +#: ../src/empathy-call-window.ui.h:19 msgid "Start an audio call" msgstr "Започните аудио позив" -#: ../src/empathy-call-window.ui.h:18 -msgid "Swap camera" -msgstr "Размени камеру" +#: ../src/empathy-call-window.ui.h:20 +msgid "Show dialpad" +msgstr "Прикажи бројчаник" -#: ../src/empathy-call-window.ui.h:19 -#: ../src/empathy-streamed-media-window.ui.h:17 -msgid "Toggle audio transmission" -msgstr "Укључи/искључи пренос звука" +#: ../src/empathy-call-window.ui.h:21 +msgid "Display the dialpad" +msgstr "Прикажите бројчаник" -#: ../src/empathy-call-window.ui.h:20 +#: ../src/empathy-call-window.ui.h:22 +msgid "Send Video" +msgstr "Пошаљи видео" + +#: ../src/empathy-call-window.ui.h:23 msgid "Toggle video transmission" msgstr "Укључи/искључи пренос видеа" -#: ../src/empathy-call-window.ui.h:21 -#: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477 -#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479 +#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Send Audio" +msgstr "Пошаљи звук" + +#: ../src/empathy-call-window.ui.h:25 +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Toggle audio transmission" +msgstr "Укључи/искључи пренос звука" + +#: ../src/empathy-call-window.ui.h:27 +#: ../src/empathy-streamed-media-window.ui.h:20 +msgid "Encoding Codec:" +msgstr "Кодек за кодирање:" + +#: ../src/empathy-call-window.ui.h:28 +#: ../src/empathy-streamed-media-window.ui.h:21 +#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588 +#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590 msgid "Unknown" msgstr "Непознато" -#: ../src/empathy-call-window.ui.h:23 -msgid "Video call" -msgstr "Видео позив" +#: ../src/empathy-call-window.ui.h:29 +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Decoding Codec:" +msgstr "Кодек за декодирање:" -#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-call-window.ui.h:30 +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Remote Candidate:" +msgstr "Удаљени кандидат:" + +#: ../src/empathy-call-window.ui.h:31 #: ../src/empathy-streamed-media-window.ui.h:24 -msgid "_Call" -msgstr "_Позови" +msgid "Local Candidate:" +msgstr "Локални кандидат:" -#: ../src/empathy-call-window.ui.h:25 -msgid "_Camera" -msgstr "_Камерица" +#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:25 +msgid "Audio" +msgstr "Аудио" -#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 -msgid "_Contents" -msgstr "_Садржај" +#: ../src/empathy-chat-window.c:285 +msgid "Close this window?" +msgstr "Да затворим овај прозор?" -#: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 -msgid "_Debug" -msgstr "Отклањање _грешака" +#: ../src/empathy-chat-window.c:290 +#, c-format +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "" +"Затварањем овог прозора биће напуштено %s. Нећете примати никакве будуће " +"поруке све док се поново не придружите." -#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 -msgid "_Help" -msgstr "По_моћ" +#: ../src/empathy-chat-window.c:301 +#, 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] "" +"Затварањем овог прозора биће напуштена %u соба за ћаскање. Нећете примати " +"никакве будуће поруке све док се поново не придружите." +msgstr[1] "" +"Затварањем овог прозора биће напуштене %u собе за ћаскање. Нећете примати " +"никакве будуће поруке све док се поново не придружите." +msgstr[2] "" +"Затварањем овог прозора биће напуштено %u соба за ћаскање. Нећете примати " +"никакве будуће поруке све док се поново не придружите." +msgstr[3] "" +"Затварањем овог прозора биће напуштена једна соба за ћаскање. Нећете примати " +"никакве будуће поруке све док се поново не придружите." + +#: ../src/empathy-chat-window.c:310 +#, c-format +msgid "Leave %s?" +msgstr "Да напустим %s?" -#: ../src/empathy-call-window.ui.h:30 -msgid "_Microphone" -msgstr "Ми_крофон" +#: ../src/empathy-chat-window.c:311 +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "" +"Нећете примати никакве будуће поруке из ове собе за ћаскање све док јој се " +"поново не придружите." -#: ../src/empathy-call-window.ui.h:31 -msgid "_Settings" -msgstr "По_дешавања" +#: ../src/empathy-chat-window.c:330 +msgid "Close window" +msgstr "Затвори прозор" -#: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 -#: ../src/empathy-streamed-media-window.ui.h:25 -msgid "_View" -msgstr "Пре_глед" +#: ../src/empathy-chat-window.c:330 +msgid "Leave room" +msgstr "Напусти собу" -#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 +#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -3679,7 +3705,7 @@ msgstr[1] "%s (%d непрочитане)" msgstr[2] "%s (%d непрочитаних)" msgstr[3] "%s (једна непрочитана)" -#: ../src/empathy-chat-window.c:493 +#: ../src/empathy-chat-window.c:648 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -3688,7 +3714,7 @@ msgstr[1] "%s (и %u друге)" msgstr[2] "%s (и %u других)" msgstr[3] "%s (и једна друга)" -#: ../src/empathy-chat-window.c:509 +#: ../src/empathy-chat-window.c:664 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -3697,7 +3723,7 @@ msgstr[1] "%s (%d непрочитане од осталих)" msgstr[2] "%s (%d непрочитаних од осталих)" msgstr[3] "%s (једна непрочитана од осталих)" -#: ../src/empathy-chat-window.c:518 +#: ../src/empathy-chat-window.c:673 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -3706,11 +3732,11 @@ msgstr[1] "%s (%d непрочитане од свих)" msgstr[2] "%s (%d непрочитаних од свих)" msgstr[3] "%s (једна непрочитана од свих)" -#: ../src/empathy-chat-window.c:733 +#: ../src/empathy-chat-window.c:888 msgid "SMS:" msgstr "СМС:" -#: ../src/empathy-chat-window.c:743 +#: ../src/empathy-chat-window.c:898 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3719,69 +3745,69 @@ msgstr[1] "Шаљем %d поруке." msgstr[2] "Шаљем %d порука." msgstr[3] "Шаљем једну поруку" -#: ../src/empathy-chat-window.c:765 +#: ../src/empathy-chat-window.c:920 msgid "Typing a message." msgstr "Пише поруку." #: ../src/empathy-chat-window.ui.h:1 -msgid "C_lear" -msgstr "_Очисти" +msgid "_Conversation" +msgstr "_Разговор" #: ../src/empathy-chat-window.ui.h:2 -msgid "C_ontact" -msgstr "_Пријатељ" +msgid "C_lear" +msgstr "_Очисти" -#: ../src/empathy-chat-window.ui.h:4 +#: ../src/empathy-chat-window.ui.h:3 msgid "Insert _Smiley" msgstr "Убаци _смешак" +#: ../src/empathy-chat-window.ui.h:4 +msgid "_Favorite Chat Room" +msgstr "Омиљена соба за _ћаскање" + #: ../src/empathy-chat-window.ui.h:5 -msgid "Invite _Participant…" -msgstr "Позови _учеснике…" +msgid "Notify for All Messages" +msgstr "Обавести за све поруке" -#: ../src/empathy-chat-window.ui.h:6 -msgid "Move Tab _Left" -msgstr "Премести језичак _лево" +#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1 +msgid "_Show Contact List" +msgstr "Прикажи _списак пријатеља" #: ../src/empathy-chat-window.ui.h:7 -msgid "Move Tab _Right" -msgstr "Премести језичак _десно" +msgid "Invite _Participant…" +msgstr "Позови _учеснике…" #: ../src/empathy-chat-window.ui.h:8 -msgid "Notify for All Messages" -msgstr "Обавести за све поруке" +msgid "C_ontact" +msgstr "_Пријатељ" #: ../src/empathy-chat-window.ui.h:10 -msgid "_Conversation" -msgstr "_Разговор" +msgid "_Tabs" +msgstr "_Листови" #: ../src/empathy-chat-window.ui.h:11 -msgid "_Detach Tab" -msgstr "_Откачи лист" - -#: ../src/empathy-chat-window.ui.h:13 -msgid "_Favorite Chat Room" -msgstr "Омиљена соба за _ћаскање" +msgid "_Previous Tab" +msgstr "_Претходни лист" -#: ../src/empathy-chat-window.ui.h:15 +#: ../src/empathy-chat-window.ui.h:12 msgid "_Next Tab" msgstr "_Следећи лист" -#: ../src/empathy-chat-window.ui.h:16 -msgid "_Previous Tab" -msgstr "_Претходни лист" +#: ../src/empathy-chat-window.ui.h:13 +msgid "_Undo Close Tab" +msgstr "_Опозови затварање језичка" -#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5 -msgid "_Show Contact List" -msgstr "Прикажи _списак пријатеља" +#: ../src/empathy-chat-window.ui.h:14 +msgid "Move Tab _Left" +msgstr "Премести језичак _лево" -#: ../src/empathy-chat-window.ui.h:18 -msgid "_Tabs" -msgstr "_Листови" +#: ../src/empathy-chat-window.ui.h:15 +msgid "Move Tab _Right" +msgstr "Премести језичак _десно" -#: ../src/empathy-chat-window.ui.h:19 -msgid "_Undo Close Tab" -msgstr "_Опозови затварање језичка" +#: ../src/empathy-chat-window.ui.h:16 +msgid "_Detach Tab" +msgstr "_Откачи лист" #: ../src/empathy-chatrooms-window.c:251 msgid "Name" @@ -3795,100 +3821,100 @@ msgstr "Соба" msgid "Auto-Connect" msgstr "Аутоматско повезивање" -#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-chatrooms-window.ui.h:1 msgid "Manage Favorite Rooms" msgstr "Уреди омиљене собе" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Долазни видео позив" -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562 msgid "Incoming call" msgstr "Долазни позив" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s вас зове видео позивом. Желите ли да се јавите?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s вас зове. Желите ли да се јавите?" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568 #, c-format msgid "Incoming call from %s" msgstr "Долазни позив од %s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "_Одбаци" -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_Јави се" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "Одговори са _видеом" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1455 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1568 #, c-format msgid "Incoming video call from %s" msgstr "Долазни видео позив од %s" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Позивнице за собу" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Позивница да се придружите у %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s вас позива да се придружите %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_Одбиј" -#: ../src/empathy-event-manager.c:858 -#: ../src/empathy-new-chatroom-dialog.ui.h:7 +#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "_Join" msgstr "_Прикључи се" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s вас позива да се придружите %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "Позвани сте да се придружите у %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Долазни пренос датотеке од %s" -#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372 msgid "Password required" msgstr "Захтевана је лозинка" -#: ../src/empathy-event-manager.c:1190 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s тражи одобрење да види када сте на вези" -#: ../src/empathy-event-manager.c:1194 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3898,105 +3924,105 @@ msgstr "" "Порука: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Непознато" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s од %s при %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s од %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Примам „%s“ од %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Шаљем „%s“ за %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Грешка при примању „%s“ од %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Грешка при примању датотеке" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Грешка при слању „%s“ за %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Грешка при слању датотеке" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "„%s“ је примљен од %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr " „%s“ је послат за %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Пренос датотеке је завршен" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Чекам на одговор друге стране" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Проверавам интегритет датотеке „%s“" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Тражим хеш датотеке „%s“" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Датотека" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Преостало" @@ -4021,166 +4047,193 @@ msgid "Import Accounts" msgstr "Увезите налоге" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "Увези" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Протокол" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Извор" -#: ../src/empathy-main-window.c:392 +#: ../src/empathy-roster-window.c:389 msgid "Provide Password" msgstr "Унесите лозинку" -#: ../src/empathy-main-window.c:398 +#: ../src/empathy-roster-window.c:395 msgid "Disconnect" msgstr "Веза је прекинута" -#: ../src/empathy-main-window.c:622 +#: ../src/empathy-roster-window.c:644 +msgid "You need to setup an account to see contacts here." +msgstr "Морате да подесите налог да бисте овде видели контакте." + +#: ../src/empathy-roster-window.c:660 msgid "No match found" msgstr "Нема поклапања" -#: ../src/empathy-main-window.c:777 +#: ../src/empathy-roster-window.c:765 +#, c-format +msgid "Sorry, %s accounts can’t be used until your %s software is updated." +msgstr "" +"Извините, %s налози не могу бити коришћени све док не ажурирате ваш %s " +"софтвер." + +#: ../src/empathy-roster-window.c:831 +msgid "Update software..." +msgstr "Ажурирај софтвер..." + +#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954 +msgid "Close" +msgstr "Затвори" + +#: ../src/empathy-roster-window.c:942 msgid "Reconnect" msgstr "Поново се повежи" -#: ../src/empathy-main-window.c:783 +#: ../src/empathy-roster-window.c:948 msgid "Edit Account" msgstr "Измени налог" -#: ../src/empathy-main-window.c:789 -msgid "Close" -msgstr "Затвори" - #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:928 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1092 #, c-format msgid "Top up %s (%s)..." msgstr "Допуни %s (%s)..." -#: ../src/empathy-main-window.c:975 +#: ../src/empathy-roster-window.c:1138 msgid "Top up account credit" msgstr "Допуните кредит налога" #. top up button -#: ../src/empathy-main-window.c:1046 +#: ../src/empathy-roster-window.c:1210 msgid "Top Up..." msgstr "Допуни..." -#: ../src/empathy-main-window.c:1789 +#: ../src/empathy-roster-window.c:1933 msgid "Contact" msgstr "Пријатељ" -#: ../src/empathy-main-window.c:2121 +#: ../src/empathy-roster-window.c:2131 +msgid "You need to enable one of your accounts to see contacts here." +msgstr "" +"Морате да укључите један од ваших налога да бисте овде видели контакте." + +#. translators: argument is an account name +#: ../src/empathy-roster-window.c:2139 +#, c-format +msgid "You need to enable %s to see contacts here." +msgstr "Морате да укључите %s да бисте овде видели контакте." + +#: ../src/empathy-roster-window.c:2419 msgid "Contact List" msgstr "Списак пријатеља" -#: ../src/empathy-main-window-menubar.ui.h:1 -msgid "Contacts on a _Map" -msgstr "Пријатељи на _мапи" +#: ../src/empathy-roster-window.ui.h:1 +msgid "Account settings" +msgstr "Подешавања налога" -#: ../src/empathy-main-window-menubar.ui.h:2 -msgid "Credit Balance" -msgstr "Износ готовине" +#: ../src/empathy-roster-window-menubar.ui.h:2 +#: ../src/empathy-status-icon.ui.h:2 +msgid "_New Conversation…" +msgstr "_Нови разговор…" -#: ../src/empathy-main-window-menubar.ui.h:3 -msgid "Find in Contact _List" -msgstr "Пронађи у _списку пријатеља" +#: ../src/empathy-roster-window-menubar.ui.h:3 +#: ../src/empathy-status-icon.ui.h:3 +msgid "New _Call…" +msgstr "Нови _позив…" -#: ../src/empathy-main-window-menubar.ui.h:4 -msgid "Join _Favorites" -msgstr "Придружи се _омиљеним" +#: ../src/empathy-roster-window-menubar.ui.h:6 +msgid "_Search for Contacts…" +msgstr "_Тражи пријатеље…" -#: ../src/empathy-main-window-menubar.ui.h:5 -msgid "Manage Favorites" -msgstr "Уреди омиљене" +#: ../src/empathy-roster-window-menubar.ui.h:7 +msgid "_File Transfers" +msgstr "Преноси _датотека" -#: ../src/empathy-main-window-menubar.ui.h:6 -msgid "N_ormal Size" -msgstr "Н_ормална величина" +#: ../src/empathy-roster-window-menubar.ui.h:8 +msgid "_Offline Contacts" +msgstr "Неп_овезани пријатељи" -#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 -msgid "New _Call…" -msgstr "Нови _позив…" +#: ../src/empathy-roster-window-menubar.ui.h:9 +msgid "Show P_rotocols" +msgstr "Прикажи _протоколе" -#: ../src/empathy-main-window-menubar.ui.h:8 -msgid "Normal Size With _Avatars" -msgstr "Нормална величина са _аватарима" +#: ../src/empathy-roster-window-menubar.ui.h:10 +msgid "Credit Balance" +msgstr "Износ готовине" + +#: ../src/empathy-roster-window-menubar.ui.h:11 +msgid "Contacts on a _Map" +msgstr "Пријатељи на _мапи" + +#: ../src/empathy-roster-window-menubar.ui.h:13 +msgid "_Accounts" +msgstr "Н_алози" + +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Blocked Contacts" +msgstr "_Блокирани пријатељи" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "P_references" msgstr "_Поставке" -#: ../src/empathy-main-window-menubar.ui.h:10 -msgid "Show P_rotocols" -msgstr "Прикажи _протоколе" +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "Find in Contact _List" +msgstr "Пронађи у _списку пријатеља" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "Sort by _Name" msgstr "Поређај према _имену" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "Sort by _Status" msgstr "Поређај према _стању" -#: ../src/empathy-main-window-menubar.ui.h:13 -msgid "_Accounts" -msgstr "Н_алози" +#: ../src/empathy-roster-window-menubar.ui.h:20 +msgid "Normal Size With _Avatars" +msgstr "Нормална величина са _аватарима" -#: ../src/empathy-main-window-menubar.ui.h:15 -msgid "_Blocked Contacts" -msgstr "_Блокирани пријатељи" +#: ../src/empathy-roster-window-menubar.ui.h:21 +msgid "N_ormal Size" +msgstr "Н_ормална величина" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Compact Size" msgstr "_Компактна величина" -#: ../src/empathy-main-window-menubar.ui.h:21 -msgid "_File Transfers" -msgstr "Преноси _датотека" +#: ../src/empathy-roster-window-menubar.ui.h:23 +msgid "_Room" +msgstr "_Соба" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:24 msgid "_Join…" msgstr "_Прикључи се…" -#: ../src/empathy-main-window-menubar.ui.h:24 -#: ../src/empathy-status-icon.ui.h:3 -msgid "_New Conversation…" -msgstr "_Нови разговор…" - -#: ../src/empathy-main-window-menubar.ui.h:25 -msgid "_Offline Contacts" -msgstr "Неп_овезани пријатељи" - -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "Лични _подаци" - -#: ../src/empathy-main-window-menubar.ui.h:28 -msgid "_Room" -msgstr "_Соба" +#: ../src/empathy-roster-window-menubar.ui.h:25 +msgid "Join _Favorites" +msgstr "Придружи се _омиљеним" -#: ../src/empathy-main-window-menubar.ui.h:29 -msgid "_Search for Contacts…" -msgstr "_Тражи пријатеље…" +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "Manage Favorites" +msgstr "Уреди омиљене" -#: ../src/empathy-new-chatroom-dialog.c:337 +#: ../src/empathy-new-chatroom-dialog.c:369 msgid "Chat Room" msgstr "Соба за ћаскање" -#: ../src/empathy-new-chatroom-dialog.c:353 +#: ../src/empathy-new-chatroom-dialog.c:385 msgid "Members" msgstr "Чланови" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:553 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4193,22 +4246,22 @@ msgstr "" "Потребна лозинка: %s\n" "Чланови: %s" -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "Не" -#: ../src/empathy-new-chatroom-dialog.c:584 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "Не могу да покренем листање списка соба" -#: ../src/empathy-new-chatroom-dialog.c:594 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "Не могу да зауставим листање списка соба" -#: ../src/empathy-new-chatroom-dialog.ui.h:2 -msgid "Couldn't load room list" -msgstr "Не могу да учитам списак соба" +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Join Room" +msgstr "Придружи се соби" #: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "" @@ -4217,6 +4270,10 @@ msgstr "" "Овде унесите име собе за придруживање или кликните на неку од соба на списку." #: ../src/empathy-new-chatroom-dialog.ui.h:4 +msgid "_Room:" +msgstr "_Соба:" + +#: ../src/empathy-new-chatroom-dialog.ui.h:5 msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" @@ -4224,313 +4281,313 @@ msgstr "" "Унесите сервер који угошћава собе, или оставите празно ако су собе на " "серверу на којем вам је налог" -#: ../src/empathy-new-chatroom-dialog.ui.h:5 -msgid "Join Room" -msgstr "Придружи се соби" +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "Couldn't load room list" +msgstr "Не могу да учитам списак соба" -#: ../src/empathy-new-chatroom-dialog.ui.h:6 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 msgid "Room List" msgstr "Списак соба" -#: ../src/empathy-new-chatroom-dialog.ui.h:8 -msgid "_Room:" -msgstr "_Соба:" - -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Порука је примљена" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Порука је послата" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Нови разговор" -#: ../src/empathy-preferences.c:172 -msgid "Contact goes online" +#: ../src/empathy-preferences.c:169 +msgid "Contact comes online" msgstr "Пријатељ се пријавио" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "Пријатељ се одјавио" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Налог је на вези" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Налог није на вези" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Језик" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:726 msgid "Juliet" msgstr "Паја" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:733 msgid "Romeo" msgstr "Јаре" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:739 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Јао, куме, готов сам!! Ја сам бивши човек!!!" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:743 msgid "Deny thy father and refuse thy name;" msgstr "Пајо, шта је било, Пајооо??" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:746 msgid "Or if thou wilt not, be but sworn my love" msgstr "Како шта је било?? Нема је више, украли су ми је!!" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:749 msgid "And I'll no longer be a Capulet." msgstr "Шта су ти украли, Пајо?? Штаааа??" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:752 msgid "Shall I hear more, or shall I speak at this?" msgstr "Како шта?? Ама лађу, украли су ми лађу!! Јао мени!!!" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" msgstr "Сав очајан, Паја је прекинуо везу." -#: ../src/empathy-preferences.c:1166 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "Поставке" #: ../src/empathy-preferences.ui.h:1 +msgid "Show _smileys as images" +msgstr "Прикажи слике _смешака" + +#: ../src/empathy-preferences.ui.h:2 +msgid "Show contact _list in rooms" +msgstr "Прикажи списак _пријатеља у собама" + +#: ../src/empathy-preferences.ui.h:3 msgid "Appearance" msgstr "Изглед" -#: ../src/empathy-preferences.ui.h:3 -msgid "Behavior" -msgstr "Понашање" +#: ../src/empathy-preferences.ui.h:4 +msgid "Start chats in:" +msgstr "Започни ћаскања у:" #: ../src/empathy-preferences.ui.h:5 -msgid "Chat Th_eme:" -msgstr "_Тема ћаскања:" +msgid "new ta_bs" +msgstr "новим _језичцима" #: ../src/empathy-preferences.ui.h:6 -msgid "Disable notifications when _away or busy" -msgstr "Искључи обавештења када сам _одсутан или заузет" +msgid "new _windows" +msgstr "новим _прозорима" #: ../src/empathy-preferences.ui.h:7 -msgid "Disable sounds when _away or busy" -msgstr "Искључи звуке када сам _одсутан или заузет" - -#: ../src/empathy-preferences.ui.h:8 msgid "Display incoming events in the notification area" msgstr "Прикажи долазне догађаје у обавештајној зони" +#: ../src/empathy-preferences.ui.h:8 +msgid "_Automatically connect on startup" +msgstr "_Сам се повежи након покретања" + #: ../src/empathy-preferences.ui.h:9 -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 "" -"Уклањање одјека чини да ваш глас другој особи звучи јасније, али може да " -"изазове проблеме на неким рачунарима. Ако ви или ваш саговорник чујете чудне " -"шумове или крчање за време позива, покушајте да искључите уклањање одјека и " -"поново покрените позив." +msgid "Log conversations" +msgstr "Забележи разговоре" #: ../src/empathy-preferences.ui.h:10 -msgid "Enable notifications when a contact comes online" -msgstr "Омогући обавештења када пријатељ дође на мрежу" +msgid "Behavior" +msgstr "Понашање" #: ../src/empathy-preferences.ui.h:11 -msgid "Enable notifications when a contact goes offline" -msgstr "Омогући обавештења када пријатељ оде са мреже" +msgid "General" +msgstr "Опште" #: ../src/empathy-preferences.ui.h:12 -msgid "Enable notifications when the _chat is not focused" -msgstr "Омогући обавештења када _ћаскања нису у фокусу" +msgid "_Enable bubble notifications" +msgstr "_Омогући обавештења у облачићима" #: ../src/empathy-preferences.ui.h:13 -msgid "Enable spell checking for languages:" -msgstr "Омогући проверу правописа за следеће језике:" +msgid "Disable notifications when _away or busy" +msgstr "Искључи обавештења када сам _одсутан или заузет" #: ../src/empathy-preferences.ui.h:14 -msgid "General" -msgstr "Опште" +msgid "Enable notifications when the _chat is not focused" +msgstr "Омогући обавештења када _ћаскања нису у фокусу" #: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "Улазни ниво:" +msgid "Enable notifications when a contact comes online" +msgstr "Омогући обавештења када пријатељ дође на мрежу" #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "Јачина улазног звука:" +msgid "Enable notifications when a contact goes offline" +msgstr "Омогући обавештења када пријатељ оде са мреже" + +#: ../src/empathy-preferences.ui.h:17 +msgid "Notifications" +msgstr "Обавештења" #: ../src/empathy-preferences.ui.h:18 -msgid "Location sources:" -msgstr "Извори локација:" +msgid "_Enable sound notifications" +msgstr "Омогући _звучна обавештења" #: ../src/empathy-preferences.ui.h:19 -msgid "Log conversations" -msgstr "Забележи разговоре" +msgid "Disable sounds when _away or busy" +msgstr "Искључи звуке када сам _одсутан или заузет" #: ../src/empathy-preferences.ui.h:20 -msgid "Notifications" -msgstr "Обавештења" - -#: ../src/empathy-preferences.ui.h:21 msgid "Play sound for events" msgstr "Пусти звук за догађаје" +#: ../src/empathy-preferences.ui.h:21 +msgid "Sounds" +msgstr "Звуци" + #: ../src/empathy-preferences.ui.h:22 -msgid "Privacy" -msgstr "Приватност" +msgid "Use _echo cancellation to improve call quality" +msgstr "Користи уклањање _одјека да побољшаш квалитет позива" #: ../src/empathy-preferences.ui.h:23 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." +"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 "" -"Умањена тачност локације значи да ће најтачнији објављени подаци о вашој " -"локацији бити град и држава. ГПС координате ће бити тачне до 1. децимале." - -#: ../src/empathy-preferences.ui.h:24 -msgid "Show _smileys as images" -msgstr "Прикажи слике _смешака" - -#: ../src/empathy-preferences.ui.h:25 -msgid "Show contact _list in rooms" -msgstr "Прикажи списак _пријатеља у собама" +"Уклањање одјека чини да ваш глас другој особи звучи јасније, али може да " +"изазове проблеме на неким рачунарима. Ако ви или ваш саговорник чујете чудне " +"шумове или крчање за време позива, покушајте да искључите уклањање одјека и " +"поново покрените позив." #: ../src/empathy-preferences.ui.h:26 -msgid "Sounds" -msgstr "Звуци" +msgid "_Publish location to my contacts" +msgstr "Објави локацију мојим _пријатељима" #: ../src/empathy-preferences.ui.h:27 -msgid "Spell Checking" -msgstr "Провера писања" - -#: ../src/empathy-preferences.ui.h:28 msgid "" -"The list of languages reflects only the languages for which you have a " -"dictionary installed." +"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 "" -"Овај списак језика представља само оне језике за које имате инсталиране " -"речнике." +"Умањена тачност локације значи да ће најтачнији објављени подаци о вашој " +"локацији бити град и држава. ГПС координате ће бити тачне до 1. децимале." +#. 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:29 -msgid "Themes" -msgstr "Теме" +msgid "_Reduce location accuracy" +msgstr "Умањи _тачност локације" #: ../src/empathy-preferences.ui.h:30 -msgid "Variant:" -msgstr "Варијанта:" +msgid "Privacy" +msgstr "Приватност" #: ../src/empathy-preferences.ui.h:31 -msgid "_Automatically connect on startup" -msgstr "_Сам се повежи након покретања" +msgid "_GPS" +msgstr "_ГПС" #: ../src/empathy-preferences.ui.h:32 msgid "_Cellphone" msgstr "_Мобилни телефон" #: ../src/empathy-preferences.ui.h:33 -msgid "_Enable bubble notifications" -msgstr "_Омогући обавештења у облачићима" +msgid "_Network (IP, Wi-Fi)" +msgstr "_Мрежа (ИП, бежична)" #: ../src/empathy-preferences.ui.h:34 -msgid "_Enable sound notifications" -msgstr "Омогући _звучна обавештења" - -#: ../src/empathy-preferences.ui.h:35 -msgid "_GPS" -msgstr "_ГПС" +msgid "Location sources:" +msgstr "Извори локација:" #: ../src/empathy-preferences.ui.h:36 -msgid "_Network (IP, Wi-Fi)" -msgstr "_Мрежа (ИП, бежична)" +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "" +"Овај списак језика представља само оне језике за које имате инсталиране " +"речнике." #: ../src/empathy-preferences.ui.h:37 -msgid "_Open new chats in separate windows" -msgstr "_Отварај ћаскања у новим прозорима" +msgid "Enable spell checking for languages:" +msgstr "Омогући проверу правописа за следеће језике:" #: ../src/empathy-preferences.ui.h:38 -msgid "_Publish location to my contacts" -msgstr "Објави локацију мојим _пријатељима" +msgid "Spell Checking" +msgstr "Провера писања" + +#: ../src/empathy-preferences.ui.h:39 +msgid "Chat Th_eme:" +msgstr "_Тема ћаскања:" -#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees. #: ../src/empathy-preferences.ui.h:40 -msgid "_Reduce location accuracy" -msgstr "Умањи _тачност локације" +msgid "Variant:" +msgstr "Варијанта:" -#: ../src/empathy-status-icon.ui.h:2 +#: ../src/empathy-preferences.ui.h:41 +msgid "Themes" +msgstr "Теме" + +#: ../src/empathy-status-icon.ui.h:4 msgid "Status" msgstr "Стање" -#: ../src/empathy-status-icon.ui.h:4 +#: ../src/empathy-status-icon.ui.h:5 msgid "_Quit" msgstr "_Изађи" -#: ../src/empathy-streamed-media-window.ui.h:2 -msgid "Call the contact again" -msgstr "Позови пријатеља поново" - #: ../src/empathy-streamed-media-window.ui.h:3 -msgid "Camera Off" -msgstr "Искљ. камеру" +msgid "Redial" +msgstr "Поново зови" #: ../src/empathy-streamed-media-window.ui.h:4 -msgid "Camera On" -msgstr "Укљ. камеру" +msgid "V_ideo" +msgstr "В_идео" + +#: ../src/empathy-streamed-media-window.ui.h:5 +msgid "Video Off" +msgstr "Искљ. видео" #: ../src/empathy-streamed-media-window.ui.h:6 -msgid "Disable camera and stop sending video" -msgstr "Онемогући камеру и престани да шаљеш видео" +msgid "Video Preview" +msgstr "Преглед видеа" #: ../src/empathy-streamed-media-window.ui.h:7 -msgid "Enable camera and send video" -msgstr "Омогући камеру и шаљи видео" +msgid "Video On" +msgstr "Укљ. видео" -#: ../src/empathy-streamed-media-window.ui.h:8 -msgid "Enable camera but don't send video" -msgstr "Омогући камеру, али не шаљи видео" +#: ../src/empathy-streamed-media-window.ui.h:10 +msgid "Call the contact again" +msgstr "Позови пријатеља поново" #: ../src/empathy-streamed-media-window.ui.h:13 -msgid "Preview" -msgstr "Преглед" +msgid "Camera Off" +msgstr "Искљ. камеру" #: ../src/empathy-streamed-media-window.ui.h:14 -msgid "Redial" -msgstr "Поново зови" +msgid "Disable camera and stop sending video" +msgstr "Онемогући камеру и престани да шаљеш видео" -#: ../src/empathy-streamed-media-window.ui.h:19 -msgid "V_ideo" -msgstr "В_идео" +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Preview" +msgstr "Преглед" -#: ../src/empathy-streamed-media-window.ui.h:21 -msgid "Video Off" -msgstr "Искљ. видео" +#: ../src/empathy-streamed-media-window.ui.h:16 +msgid "Enable camera but don't send video" +msgstr "Омогући камеру, али не шаљи видео" -#: ../src/empathy-streamed-media-window.ui.h:22 -msgid "Video On" -msgstr "Укљ. видео" +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Camera On" +msgstr "Укљ. камеру" -#: ../src/empathy-streamed-media-window.ui.h:23 -msgid "Video Preview" -msgstr "Преглед видеа" +#: ../src/empathy-streamed-media-window.ui.h:18 +msgid "Enable camera and send video" +msgstr "Омогући камеру и шаљи видео" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Мапа пријатеља" @@ -4597,16 +4654,16 @@ msgid "" msgstr "" "Изабрани управник везе не подржава проширење за удаљено отклањање грешака." -#: ../src/empathy-invite-participant-dialog.c:179 -#: ../src/empathy-invite-participant-dialog.c:205 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Позови учеснике" -#: ../src/empathy-invite-participant-dialog.c:180 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Изаберите пријатеља за позивање у овај разговор:" -#: ../src/empathy-invite-participant-dialog.c:201 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Позови" @@ -4630,23 +4687,27 @@ msgstr "" msgid "" msgstr "<идентификација налога>" -#: ../src/empathy-accounts.c:198 +#: ../src/empathy-accounts.c:196 +msgid "Show account assistant" +msgstr "Приказује помоћника налога" + +#: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" msgstr "— Налози Писмоноше" -#: ../src/empathy-accounts.c:237 +#: ../src/empathy-accounts.c:238 msgid "Empathy Accounts" msgstr "Налози Писмоноше" -#: ../src/empathy-debugger.c:70 +#: ../src/empathy-debugger.c:69 msgid "Show a particular service" msgstr "Прикажи посебну услугу" -#: ../src/empathy-debugger.c:75 +#: ../src/empathy-debugger.c:74 msgid "- Empathy Debugger" msgstr "— Отклањање грешака Писмоноше" -#: ../src/empathy-debugger.c:114 +#: ../src/empathy-debugger.c:113 msgid "Empathy Debugger" msgstr "Отклањање грешака Писмоноше" @@ -4654,39 +4715,39 @@ msgstr "Отклањање грешака Писмоноше" msgid "- Empathy Chat Client" msgstr "— Писмоноша програм за ћаскање" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Одговори" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1459 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1572 msgid "Reject" msgstr "Одбаци" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1460 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1573 msgid "Answer" msgstr "Јави се" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Одговори са видеом" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Одбиј" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Прихвати" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Обезбеди" @@ -4697,32 +4758,198 @@ msgstr "%s је покушао да вас зове, али сте ви били #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111 +#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202 msgid "i" msgstr "и" -#: ../src/empathy-call-window.c:2775 +#: ../src/empathy-call-window.c:2936 msgid "On hold" msgstr "На чекању" -#: ../src/empathy-call-window.c:2778 +#: ../src/empathy-call-window.c:2939 msgid "Mute" msgstr "Утишај" -#: ../src/empathy-call-window.c:2780 +#: ../src/empathy-call-window.c:2941 msgid "Duration" msgstr "Трајање" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2783 +#: ../src/empathy-call-window.c:2944 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" +#: ../src/empathy-call-window.c:3214 +#, c-format +msgid "Your current balance is %s." +msgstr "Ваше тренутно стање је %s." + +#: ../src/empathy-call-window.c:3218 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "Извините, али немате довољно кредита за овај позив." + +#: ../src/empathy-call-window.c:3220 +msgid "Top Up" +msgstr "Допуни" + #: ../libempathy-gtk/empathy-search-bar.c:243 msgid "_Match case" msgstr "_Упореди величину слова" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Додајем нови налог" + +#~ msgid "Call volume" +#~ msgstr "Јачина звука позива" + +#~ msgid "Call volume, as a percentage." +#~ msgstr "Јачина звука позива, у процентима." + +#~ msgid "Empathy has migrated butterfly logs" +#~ msgstr "Писмоноша је пребацио дневнике из лептира" + +#~ msgid "Whether Empathy has migrated butterfly logs." +#~ msgstr "Да ли је Писмоноша пребацио дневнике из лептира." + +#~ msgid "Socket type not supported" +#~ msgstr "Врста прикључка није подржана" + +#~ msgid "My Web Accounts" +#~ msgstr "Моји веб налози" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "Налог %s је измењен путем %s." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "Налог %s не може бити уређиван из Писмоноше." + +#~ msgid "Launch My Web Accounts" +#~ msgstr "Покрени Моје веб налоге" + +#~ msgid "Edit %s" +#~ msgstr "Измени %s" + +#~ msgid "Ca_ncel" +#~ msgstr "По_ништи" + +#~ msgid "Personal Information" +#~ msgstr "Подаци о профилу" + +#~ msgid "Ungrouped" +#~ msgstr "Негруписано" + +#~ msgid "Favorite People" +#~ msgstr "Омиљени људи" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "Изм_ени" + +#~ msgid "Select a contact" +#~ msgstr "Изаберите пријатеља" + +#~ msgid "Linked Contacts" +#~ msgstr "Повезани пријатељи" + +#~ msgid "Select contacts to link" +#~ msgstr "Изаберите пријатеља за повезивање" + +#~ msgid "New contact preview" +#~ msgstr "Преглед новог пријатеља" + +#~ msgid "Contacts selected in the list on the left will be linked together." +#~ msgstr "Означени пријатељи на списку лево ће бити увезани заједно." + +#~ msgctxt "Link individual (contextual menu)" +#~ msgid "_Link Contacts…" +#~ msgstr "_Повежи контакте…" + +#~ msgid "Link Contacts" +#~ msgstr "Повежи пријатеље" + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink…" +#~ msgstr "_Развежи…" + +#~ msgid "" +#~ "Completely split the displayed linked contacts into the separate contacts." +#~ msgstr "Раздваја увезане контакте у посебне пријатеље." + +#~ msgid "_Link" +#~ msgstr "_Увежи" + +#~ msgid "Unlink linked contacts '%s'?" +#~ msgstr "Да развежем увезаног пријатеља „%s“?" + +#~ msgid "" +#~ "Are you sure you want to unlink these linked contacts? This will " +#~ "completely split the linked contacts into separate contacts." +#~ msgstr "" +#~ "Да ли сте сигурни да желите да развежете увезаног пријатеља? Овим ћете " +#~ "раздвојити увезане контакте у посебне пријатеље." + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink" +#~ msgstr "_Развежи" + +#~ msgid "Contact ID:" +#~ msgstr "ИБ пријатеља:" + +#~ msgid "C_hat" +#~ msgstr "Ћ_аскај" + +#~ msgid "Send _Video" +#~ msgstr "Пошаљи _видео" + +#~ msgid "C_all" +#~ msgstr "_Позови" + +#~ msgid "Set your presence and current status" +#~ msgstr "Поставите ваше присуство и тренутно стање" + +#~ msgid "The selected contact cannot receive files." +#~ msgstr "Изабрани пријатељ не може да прими датотеке." + +#~ msgid "The selected contact is offline." +#~ msgstr "Изабрани пријатељ није на вези." + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "Овим ћете направити нови налог, занемаривши унете измене.\n" +#~ "Да ли сигурно желите да наставите?" + +#~ msgctxt "encoding video codec" +#~ msgid "Unknown" +#~ msgstr "Непознато" + +#~ msgctxt "encoding audio codec" +#~ msgid "Unknown" +#~ msgstr "Непознато" + +#~ msgctxt "decoding video codec" +#~ msgid "Unknown" +#~ msgstr "Непознато" + +#~ msgctxt "decoding audio codec" +#~ msgid "Unknown" +#~ msgstr "Непознато" + +#~ msgid "_Personal Information" +#~ msgstr "Лични _подаци" + +#~ msgid "Input level:" +#~ msgstr "Улазни ниво:" + +#~ msgid "Input volume:" +#~ msgstr "Јачина улазног звука:" + +#~ msgid "_Open new chats in separate windows" +#~ msgstr "_Отварај ћаскања у новим прозорима" + #~ msgid "All" #~ msgstr "Све" diff --git a/po/sr@latin.po b/po/sr@latin.po index 4c3713bb..b06d482d 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -1,5 +1,5 @@ # Serbian translation of Empathy -# Courtesy of Prevod.org team (http://prevod.org/) -- 2003-2009. +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012. # This file is distributed under the same license as the Empathy package. # From Pidgin translation: # Danilo Segan , 2003, 2004, 2005. @@ -11,524 +11,563 @@ # Reviewed on 11.05.2009 by Miloš Popović # Miloš Popović , 2010. # Branko Kokanović , 2011. -# Miroslav Nikolić , 2011. +# Miroslav Nikolić , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: empathy\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2011-09-19 19:10+0000\n" -"PO-Revision-Date: 2011-09-19 11:52+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath" +"y&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2012-02-13 13:31+0000\n" +"PO-Revision-Date: 2012-02-14 10:31+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%" -"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Virtaal 0.6.1\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " +"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "" -"Ćaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za " -"ćaskanje" - -#: ../data/empathy.desktop.in.in.h:2 msgid "Empathy" msgstr "Internet pismonoša" +#: ../data/empathy.desktop.in.in.h:2 +msgid "IM Client" +msgstr "Program za brze poruke" + #: ../data/empathy.desktop.in.in.h:3 msgid "Empathy Internet Messaging" msgstr "Dopisivanje preko Internet pismonoše" #: ../data/empathy.desktop.in.in.h:4 -msgid "IM Client" -msgstr "Program za brze poruke" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "" +"Ćaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za " +"ćaskanje" #: ../data/org.gnome.Empathy.gschema.xml.in.h:1 -msgid "Always open a separate chat window for new chats." -msgstr "Uvek otvara poseban prozor za nova ćaskanja." +msgid "Connection managers should be used" +msgstr "Da li će biti korišćen upravnik mrežom" +# Nije connect već disconnect!!! ~Miloš #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Jačina zvuka poziva" +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." +msgstr "" +"Da li treba koristiti upravnika mreže za automatsko prekidanje i ponovno " +"uspostavljanje veze." #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Jačina zvuka poziva, u procentima." +msgid "Empathy should auto-connect on startup" +msgstr "Da li Pismonoša da sam uspostaviti vezu po pokretanju" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -msgid "Camera device" -msgstr "Uređaj kamerice" +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "Da li Pismonoša da se sam prijavi na postojeće naloge nakon pokretanja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:5 -msgid "Camera position" -msgstr "Položaj kamerice" +msgid "Empathy should auto-away when idle" +msgstr "Da li Pismonoša da pređe u stanje automatskog odsustva u mirovanju" #: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." +"Whether Empathy should go into away mode automatically if the user is idle." msgstr "" -"Znak za dodavanje posle nadimka kada se koristi automatsko dovršavanje nadimka " -"(tab) u grupnim ćaskanjima." +"Da li Pismonoša da automatski pređe u stanje odsustva prilikom mirovanja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:7 -msgid "Chat window theme" -msgstr "Tema prozora za ćaskanje" +msgid "Empathy default download folder" +msgstr "Pismonošina podrazumevana fascikla za preuzimanja" #: ../data/org.gnome.Empathy.gschema.xml.in.h:8 -msgid "Chat window theme variant" -msgstr "Varijanta teme prozora za ćaskanje" +msgid "The default folder to save file transfers in." +msgstr "Podrazumevana fascikla za čuvanje prenesenih datoteka." #: ../data/org.gnome.Empathy.gschema.xml.in.h:9 -msgid "" -"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "" -"Spisak jezika odvojen zarezima koje koristi provera pravopisa (npr. „sr, en, " -"fr“)." +msgid "Show offline contacts" +msgstr "Prikazuje prijatelje van mreže" #: ../data/org.gnome.Empathy.gschema.xml.in.h:10 -msgid "Compact contact list" -msgstr "Zbijeni spisak prijatelja" +msgid "Whether to show contacts that are offline in the contact list." +msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:11 -msgid "Connection managers should be used" -msgstr "Da li će biti korišćen upravnik mrežom" +msgid "Show avatars" +msgstr "Prikazuje slike" #: ../data/org.gnome.Empathy.gschema.xml.in.h:12 -msgid "Contact list sort criterion" -msgstr "Kriterijum za sortiranje prijatelja" +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "" +"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:13 -msgid "Default camera device to use in video calls, e.g. /dev/video0." -msgstr "" -"Osnovna video kamerica koja će biti korišćena u video pozivima, npr. „/dev/" -"video0“." +msgid "Show protocols" +msgstr "Prikazuje protokole" #: ../data/org.gnome.Empathy.gschema.xml.in.h:14 -msgid "Default directory to select an avatar image from" -msgstr "Podrazumevana fascikla za izbor slike" +msgid "Whether to show protocols for contacts in the contact list." +msgstr "" +"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:15 -msgid "Disable popup notifications when away" -msgstr "Isključuje iskačuća obaveštenja kada smo odsutni" +msgid "Show Balance in contact list" +msgstr "Prikazuje gotovinu na spisku prijatelja" #: ../data/org.gnome.Empathy.gschema.xml.in.h:16 -msgid "Disable sounds when away" -msgstr "Onemogućava zvuke kada smo odsutni" +msgid "Whether to show account balances in the contact list." +msgstr "Da li da prikazuje iznos gotovine naloga u spisku prijatelja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:17 -msgid "Display incoming events in the status area" -msgstr "Prikazuje dolazne događaje na liniji stanja" +msgid "Compact contact list" +msgstr "Zbijeni spisak prijatelja" #: ../data/org.gnome.Empathy.gschema.xml.in.h:18 -msgid "" -"Display incoming events in the status area. If false, present them to the " -"user immediately." -msgstr "" -"Prikazuje dolazne događaje na liniji stanja. Ako nije postavljeno, odmah ih " -"prikazuje korisniku." +msgid "Whether to show the contact list in compact mode." +msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu." #: ../data/org.gnome.Empathy.gschema.xml.in.h:19 -msgid "Echo cancellation support" -msgstr "Podrška za uklanjanje odjeka" +msgid "Hide main window" +msgstr "Sakriva glavni prozor" #: ../data/org.gnome.Empathy.gschema.xml.in.h:20 -msgid "Empathy can publish the user's location" -msgstr "Da li Pismonoša sme da objavljuje lokaciju korisnika" +msgid "Hide the main window." +msgstr "Sakriva glavni prozor programa." #: ../data/org.gnome.Empathy.gschema.xml.in.h:21 -msgid "Empathy can use the GPS to guess the location" -msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju" +msgid "Default directory to select an avatar image from" +msgstr "Podrazumevana fascikla za izbor slike" #: ../data/org.gnome.Empathy.gschema.xml.in.h:22 -msgid "Empathy can use the cellular network to guess the location" -msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju" +msgid "The last directory that an avatar image was chosen from." +msgstr "Poslednja fascikla iz koje je izabrana slika." #: ../data/org.gnome.Empathy.gschema.xml.in.h:23 -msgid "Empathy can use the network to guess the location" -msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju" +msgid "Open new chats in separate windows" +msgstr "Otvara nova ćaskanja u različitim prozorima" #: ../data/org.gnome.Empathy.gschema.xml.in.h:24 -msgid "Empathy default download folder" -msgstr "Pismonošina podrazumevana fascikla za preuzimanja" +msgid "Always open a separate chat window for new chats." +msgstr "Uvek otvara poseban prozor za nova ćaskanja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:25 -msgid "Empathy has migrated butterfly logs" -msgstr "Pismonoša je prebacio dnevnike iz leptira" +msgid "Display incoming events in the status area" +msgstr "Prikazuje dolazne događaje na liniji stanja" #: ../data/org.gnome.Empathy.gschema.xml.in.h:26 -msgid "Empathy should auto-away when idle" -msgstr "Da li Pismonoša da pređe u stanje automatskog odsustva u mirovanju" +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." +msgstr "" +"Prikazuje dolazne događaje na liniji stanja. Ako nije postavljeno, odmah ih " +"prikazuje korisniku." #: ../data/org.gnome.Empathy.gschema.xml.in.h:27 -msgid "Empathy should auto-connect on startup" -msgstr "Da li Pismonoša da sam uspostaviti vezu po pokretanju" +msgid "The position for the chat window side pane" +msgstr "Položaj bočne površi prozora za ćaskanje" #: ../data/org.gnome.Empathy.gschema.xml.in.h:28 -msgid "Empathy should reduce the location's accuracy" -msgstr "Da li Pismonoša da umanji preciznost lokacije" +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "Sačuvan položaj (u tačkama) bočne površi prozora za ćaskanje." #: ../data/org.gnome.Empathy.gschema.xml.in.h:29 -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "" -"Da li Pismonoša da koristi sliku prijatelja kao ikonicu prozora za ćaskanje" +msgid "Show contact groups" +msgstr "Prikazuje grupe kontakta" #: ../data/org.gnome.Empathy.gschema.xml.in.h:30 -msgid "Enable WebKit Developer Tools" -msgstr "Omogućava Veb kit razvojne alate" +msgid "Whether to show groups in the contact list." +msgstr "Da li da prikazuje grupe u spisku kontakta." #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 -msgid "Enable popup notifications for new messages" -msgstr "Omogućava iskačuća obaveštenja za nove poruke" +msgid "Contact list sort criterion" +msgstr "Kriterijum za sortiranje prijatelja" #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 -msgid "Enable spell checker" -msgstr "Omogućava proveru pisanja" +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." +msgstr "" +"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se " +"koristi „state“ (sortiranje po stanju prijatelja). Ako je vrednost „name“, " +"sortiranje se vrši po imenu prijatelja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:33 -msgid "Hide main window" -msgstr "Sakriva glavni prozor" +msgid "Use notification sounds" +msgstr "Koristi zvukove za obaveštenja" #: ../data/org.gnome.Empathy.gschema.xml.in.h:34 -msgid "Hide the main window." -msgstr "Sakriva glavni prozor programa." +msgid "Whether to play a sound to notify of events." +msgstr "Da li da pusti obaveštajni zvuk za događaje." #: ../data/org.gnome.Empathy.gschema.xml.in.h:35 -msgid "Nick completed character" -msgstr "Znak za dovršavanje nadimka" +msgid "Disable sounds when away" +msgstr "Onemogućava zvuke kada smo odsutni" #: ../data/org.gnome.Empathy.gschema.xml.in.h:36 -msgid "Open new chats in separate windows" -msgstr "Otvara nova ćaskanja u različitim prozorima" +msgid "Whether to play sound notifications when away or busy." +msgstr "Da li da pusti obaveštajni zvuk kada postanete zauzeti ili odsutni." #: ../data/org.gnome.Empathy.gschema.xml.in.h:37 -msgid "Path of the Adium theme to use" -msgstr "Putanja do Adijum teme za korišćenje" +msgid "Play a sound for incoming messages" +msgstr "Pušta zvuk za dolazeće poruke" #: ../data/org.gnome.Empathy.gschema.xml.in.h:38 -msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "" -"Putanja do Adijum teme za korišćenje, ako se koristi Adijum tema za ćaskanje." +msgid "Whether to play a sound to notify of incoming messages." +msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka." #: ../data/org.gnome.Empathy.gschema.xml.in.h:39 -msgid "Play a sound for incoming messages" -msgstr "Pušta zvuk za dolazeće poruke" +msgid "Play a sound for outgoing messages" +msgstr "Pušta zvuk za odlazeće poruke" #: ../data/org.gnome.Empathy.gschema.xml.in.h:40 -msgid "Play a sound for new conversations" -msgstr "Pušta zvuk za nove razgovore" +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "Da li da pusti obaveštajni zvuk kada pošaljete poruku." #: ../data/org.gnome.Empathy.gschema.xml.in.h:41 -msgid "Play a sound for outgoing messages" -msgstr "Pušta zvuk za odlazeće poruke" +msgid "Play a sound for new conversations" +msgstr "Pušta zvuk za nove razgovore" #: ../data/org.gnome.Empathy.gschema.xml.in.h:42 -msgid "Play a sound when a contact logs in" -msgstr "Pušta zvuk kada se prijatelj prijavi" +msgid "Whether to play a sound to notify of new conversations." +msgstr "Da li da pusti obaveštajni zvuk na novi razgovor." #: ../data/org.gnome.Empathy.gschema.xml.in.h:43 -msgid "Play a sound when a contact logs out" -msgstr "Pušta zvuk kada se prijatelj odjavi" +msgid "Play a sound when a contact logs in" +msgstr "Pušta zvuk kada se prijatelj prijavi" #: ../data/org.gnome.Empathy.gschema.xml.in.h:44 -msgid "Play a sound when we log in" -msgstr "Pušta zvuk kada se ja prijavim" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu." #: ../data/org.gnome.Empathy.gschema.xml.in.h:45 -msgid "Play a sound when we log out" -msgstr "Pušta zvuk kada se ja odjavim" +msgid "Play a sound when a contact logs out" +msgstr "Pušta zvuk kada se prijatelj odjavi" #: ../data/org.gnome.Empathy.gschema.xml.in.h:46 -msgid "Pop up notifications if the chat isn't focused" -msgstr "Ispisuje obaveštenja ako ćaskanje nije u fokusu" +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji odjave sa mreže." #: ../data/org.gnome.Empathy.gschema.xml.in.h:47 -msgid "Pop up notifications when a contact logs in" -msgstr "Ispisuje obaveštenja kada se prijatelj prijavi" +msgid "Play a sound when we log in" +msgstr "Pušta zvuk kada se ja prijavim" #: ../data/org.gnome.Empathy.gschema.xml.in.h:48 -msgid "Pop up notifications when a contact logs out" -msgstr "Ispisuje obaveštenja kada se prijatelj odjavi" +msgid "Whether to play a sound when logging into a network." +msgstr "Da li da pusti zvuk kada se prijavite na mrežu." #: ../data/org.gnome.Empathy.gschema.xml.in.h:49 -msgid "Position the camera preview should be during a call." -msgstr "Položaj prikaza kamerice za vreme poziva." +msgid "Play a sound when we log out" +msgstr "Pušta zvuk kada se ja odjavim" #: ../data/org.gnome.Empathy.gschema.xml.in.h:50 -msgid "Show Balance in contact list" -msgstr "Prikazuje gotovinu na spisku prijatelja" +msgid "Whether to play a sound when logging out of a network." +msgstr "Da li da pusti zvuk kada se odjavite sa mreže." #: ../data/org.gnome.Empathy.gschema.xml.in.h:51 -msgid "Show avatars" -msgstr "Prikazuje slike" +msgid "Enable popup notifications for new messages" +msgstr "Omogućava iskačuća obaveštenja za nove poruke" #: ../data/org.gnome.Empathy.gschema.xml.in.h:52 -msgid "Show contact list in rooms" -msgstr "Prikazuje spisak prijatelja u sobama" +msgid "Whether to show a popup notification when receiving a new message." +msgstr "Da li da prikazuje oblačić obaveštenja kada primite novu poruku." #: ../data/org.gnome.Empathy.gschema.xml.in.h:53 -msgid "Show hint about closing the main window" -msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora" +msgid "Disable popup notifications when away" +msgstr "Isključuje iskačuća obaveštenja kada smo odsutni" #: ../data/org.gnome.Empathy.gschema.xml.in.h:54 -msgid "Show offline contacts" -msgstr "Prikazuje prijatelje van mreže" +msgid "Whether to show popup notifications when away or busy." +msgstr "Da li da prikazuje oblačić obaveštenja kada ste zauzeti ili odsutni." #: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -msgid "Show protocols" -msgstr "Prikazuje protokole" +msgid "Pop up notifications if the chat isn't focused" +msgstr "Ispisuje obaveštenja ako ćaskanje nije u fokusu" #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 -msgid "Spell checking languages" -msgstr "Jezici za proveru pisanja" +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" +"Da li da prikazuje oblačić obaveštenja sa pristiglim porukama čak i kada je " +"prozor za ćaskanje otvoren, ali nije u fokusu." #: ../data/org.gnome.Empathy.gschema.xml.in.h:57 -msgid "The default folder to save file transfers in." -msgstr "Podrazumevana fascikla za čuvanje prenesenih datoteka." +msgid "Pop up notifications when a contact logs in" +msgstr "Ispisuje obaveštenja kada se prijatelj prijavi" #: ../data/org.gnome.Empathy.gschema.xml.in.h:58 -msgid "The last directory that an avatar image was chosen from." -msgstr "Poslednja fascikla iz koje je izabrana slika." +msgid "Whether to show a popup notification when a contact goes online." +msgstr "" +"Da li da prikazuje oblačić obaveštenja kada se prijatelj prijavi na mrežu." #: ../data/org.gnome.Empathy.gschema.xml.in.h:59 -msgid "The position for the chat window side pane" -msgstr "Položaj bočne površi prozora za ćaskanje" +msgid "Pop up notifications when a contact logs out" +msgstr "Ispisuje obaveštenja kada se prijatelj odjavi" #: ../data/org.gnome.Empathy.gschema.xml.in.h:60 -msgid "The stored position (in pixels) of the chat window side pane." -msgstr "Sačuvan položaj (u tačkama) bočne površi prozora za ćaskanje." +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "" +"Da li da prikazuje oblačić obaveštenja kada se prijatelj odjavi sa mreže." #: ../data/org.gnome.Empathy.gschema.xml.in.h:61 -msgid "The theme that is used to display the conversation in chat windows." -msgstr "Tema za prikaz razgovora u prozoru ćaskanja." +msgid "Use graphical smileys" +msgstr "Prikazuje sličicu sa smeškom" #: ../data/org.gnome.Empathy.gschema.xml.in.h:62 -msgid "" -"The theme variant that is used to display the conversation in chat windows." -msgstr "Varijanta teme koja se koristi za prikaz razgovora u prozoru ćaskanja." +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "Da li da prikazuje smeške kao sličice unutar razgovora." #: ../data/org.gnome.Empathy.gschema.xml.in.h:63 -msgid "Use graphical smileys" -msgstr "Prikazuje sličicu sa smeškom" +msgid "Show contact list in rooms" +msgstr "Prikazuje spisak prijatelja u sobama" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 -msgid "Use notification sounds" -msgstr "Koristi zvukove za obaveštenja" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +msgid "Whether to show the contact list in chat rooms." +msgstr "Da li da prikazuje spisak prijatelja u sobama za ćaskanje." #: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "Use theme for chat rooms" -msgstr "Koristi teme za sobe ćaskanja" +msgid "Chat window theme" +msgstr "Tema prozora za ćaskanje" #: ../data/org.gnome.Empathy.gschema.xml.in.h:66 -msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "Da li Pismonoša da objavljuje lokaciju korisnika njegovim prijateljima." +msgid "The theme that is used to display the conversation in chat windows." +msgstr "Tema za prikaz razgovora u prozoru ćaskanja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:67 -msgid "Whether Empathy can use the GPS to guess the location." -msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju." +msgid "Chat window theme variant" +msgstr "Varijanta teme prozora za ćaskanje" #: ../data/org.gnome.Empathy.gschema.xml.in.h:68 -msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju." +msgid "" +"The theme variant that is used to display the conversation in chat windows." +msgstr "Varijanta teme koja se koristi za prikaz razgovora u prozoru ćaskanja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:69 -msgid "Whether Empathy can use the network to guess the location." -msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju." +msgid "Path of the Adium theme to use" +msgstr "Putanja do Adijum teme za korišćenje" #: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "Whether Empathy has migrated butterfly logs." -msgstr "Da li je Pismonoša prebacio dnevnike iz leptira." +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "" +"Putanja do Adijum teme za korišćenje, ako se koristi Adijum tema za ćaskanje." #: ../data/org.gnome.Empathy.gschema.xml.in.h:71 -msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "Da li Pismonoša da se sam prijavi na postojeće naloge nakon pokretanja." +msgid "Enable WebKit Developer Tools" +msgstr "Omogućava Veb kit razvojne alate" #: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" -"Whether Empathy should go into away mode automatically if the user is idle." +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" -"Da li Pismonoša da automatski pređe u stanje odsustva prilikom mirovanja." +"Da li će biti omogućeni Veb kit razvojni alati, kao što je Veb Inspektor." #: ../data/org.gnome.Empathy.gschema.xml.in.h:73 -msgid "" -"Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "" -"Da li Pismonoša da umanji preciznost lokacije zbog povećane privatnosti." +msgid "Inform other users when you are typing to them" +msgstr "Obaveštava ostale korisnike kada im pišete poruku" #: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" -"Whether Empathy should use the avatar of the contact as the chat window icon." +"Whether to send the 'composing' or 'paused' chat states. Does not currently " +"affect the 'gone' state." msgstr "" -"Da li Pismonoša da koristi sliku prijatelja kao ikonu u prozoru ćaskanja." +"Da li će da pošalje stanja ćaskanja „sastavlja“ ili „pauziran“. Neće uticati na " +"stanje „otišao“." #: ../data/org.gnome.Empathy.gschema.xml.in.h:75 -msgid "" -"Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "" -"Da li će biti omogućeni Veb kit razvojni alati, kao što je Veb Inspektor." +msgid "Use theme for chat rooms" +msgstr "Koristi teme za sobe ćaskanja" -# Nije connect već disconnect!!! ~Miloš #: ../data/org.gnome.Empathy.gschema.xml.in.h:76 -msgid "" -"Whether connectivity managers should be used to automatically disconnect/" -"reconnect." -msgstr "" -"Da li treba koristiti upravnika mreže za automatsko prekidanje i ponovno " -"uspostavljanje veze." +msgid "Whether to use the theme for chat rooms." +msgstr "Da li da koristi temu za sobe razgovora." #: ../data/org.gnome.Empathy.gschema.xml.in.h:77 -msgid "" -"Whether to check words typed against the languages you want to check with." -msgstr "Da li da proverava pisanje reči za izabrane jezike." +msgid "Spell checking languages" +msgstr "Jezici za proveru pisanja" #: ../data/org.gnome.Empathy.gschema.xml.in.h:78 -msgid "Whether to convert smileys into graphical images in conversations." -msgstr "Da li da prikazuje smeške kao sličice unutar razgovora." +msgid "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +msgstr "" +"Spisak jezika odvojen zarezima koje koristi provera pravopisa (npr. „sr, en, " +"fr“)." #: ../data/org.gnome.Empathy.gschema.xml.in.h:79 -msgid "Whether to enable Pulseaudio's echo cancellation filter." -msgstr "Da li će biti uključen filter Pulse audia za uklanjanje odjeka." +msgid "Enable spell checker" +msgstr "Omogućava proveru pisanja" #: ../data/org.gnome.Empathy.gschema.xml.in.h:80 -msgid "Whether to play a sound to notify of contacts logging into the network." -msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu." +msgid "" +"Whether to check words typed against the languages you want to check with." +msgstr "Da li da proverava pisanje reči za izabrane jezike." #: ../data/org.gnome.Empathy.gschema.xml.in.h:81 -msgid "" -"Whether to play a sound to notify of contacts logging out of the network." -msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji odjave sa mreže." +msgid "Nick completed character" +msgstr "Znak za dovršavanje nadimka" #: ../data/org.gnome.Empathy.gschema.xml.in.h:82 -msgid "Whether to play a sound to notify of events." -msgstr "Da li da pusti obaveštajni zvuk za događaje." +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "" +"Znak za dodavanje posle nadimka kada se koristi automatsko dovršavanje nadimka " +"(tab) u grupnim ćaskanjima." #: ../data/org.gnome.Empathy.gschema.xml.in.h:83 -msgid "Whether to play a sound to notify of incoming messages." -msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka." +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "" +"Da li Pismonoša da koristi sliku prijatelja kao ikonicu prozora za ćaskanje" #: ../data/org.gnome.Empathy.gschema.xml.in.h:84 -msgid "Whether to play a sound to notify of new conversations." -msgstr "Da li da pusti obaveštajni zvuk na novi razgovor." +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." +msgstr "" +"Da li Pismonoša da koristi sliku prijatelja kao ikonu u prozoru ćaskanja." #: ../data/org.gnome.Empathy.gschema.xml.in.h:85 -msgid "Whether to play a sound to notify of outgoing messages." -msgstr "Da li da pusti obaveštajni zvuk kada pošaljete poruku." +msgid "Last account selected in Join Room dialog" +msgstr "Poslednji izabrani nalog u prozorčetu za pridruživanje sobi" #: ../data/org.gnome.Empathy.gschema.xml.in.h:86 -msgid "Whether to play a sound when logging into a network." -msgstr "Da li da pusti zvuk kada se prijavite na mrežu." +msgid "D-Bus object path of the last account selected to join a room." +msgstr "Putanja objekta D-basa poslednjeg naloga izabranog za pridruživanje sobi" #: ../data/org.gnome.Empathy.gschema.xml.in.h:87 -msgid "Whether to play a sound when logging out of a network." -msgstr "Da li da pusti zvuk kada se odjavite sa mreže." +msgid "Camera device" +msgstr "Uređaj kamerice" #: ../data/org.gnome.Empathy.gschema.xml.in.h:88 -msgid "Whether to play sound notifications when away or busy." -msgstr "Da li da pusti obaveštajni zvuk kada postanete zauzeti ili odsutni." +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "" +"Osnovna video kamerica koja će biti korišćena u video pozivima, npr. „/dev/" +"video0“." #: ../data/org.gnome.Empathy.gschema.xml.in.h:89 -msgid "Whether to show a popup notification when a contact goes offline." -msgstr "" -"Da li da prikazuje oblačić obaveštenja kada se prijatelj odjavi sa mreže." +msgid "Camera position" +msgstr "Položaj kamerice" #: ../data/org.gnome.Empathy.gschema.xml.in.h:90 -msgid "Whether to show a popup notification when a contact goes online." -msgstr "" -"Da li da prikazuje oblačić obaveštenja kada se prijatelj prijavi na mrežu." +msgid "Position the camera preview should be during a call." +msgstr "Položaj prikaza kamerice za vreme poziva." #: ../data/org.gnome.Empathy.gschema.xml.in.h:91 -msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." -msgstr "" -"Da li da prikazuje oblačić obaveštenja sa pristiglim porukama čak i kada je " -"prozor za ćaskanje otvoren, ali nije u fokusu." +msgid "Echo cancellation support" +msgstr "Podrška za uklanjanje odjeka" #: ../data/org.gnome.Empathy.gschema.xml.in.h:92 -msgid "Whether to show a popup notification when receiving a new message." -msgstr "Da li da prikazuje oblačić obaveštenja kada primite novu poruku." +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "Da li će biti uključen filter Pulse audia za uklanjanje odjeka." #: ../data/org.gnome.Empathy.gschema.xml.in.h:93 -msgid "Whether to show account balances in the contact list." -msgstr "Da li da prikazuje iznos gotovine naloga u spisku prijatelja." +msgid "Show hint about closing the main window" +msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora" #: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "" -"Whether to show avatars for contacts in the contact list and chat windows." +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." msgstr "" -"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja." +"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na " +"„x“ dugme." #: ../data/org.gnome.Empathy.gschema.xml.in.h:95 -msgid "Whether to show contacts that are offline in the contact list." -msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja." +msgid "Empathy can publish the user's location" +msgstr "Da li Pismonoša sme da objavljuje lokaciju korisnika" #: ../data/org.gnome.Empathy.gschema.xml.in.h:96 -msgid "Whether to show popup notifications when away or busy." -msgstr "Da li da prikazuje oblačić obaveštenja kada ste zauzeti ili odsutni." +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "Da li Pismonoša da objavljuje lokaciju korisnika njegovim prijateljima." #: ../data/org.gnome.Empathy.gschema.xml.in.h:97 -msgid "Whether to show protocols for contacts in the contact list." -msgstr "" -"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja." +msgid "Empathy can use the network to guess the location" +msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju" #: ../data/org.gnome.Empathy.gschema.xml.in.h:98 -msgid "Whether to show the contact list in chat rooms." -msgstr "Da li da prikazuje spisak prijatelja u sobama za ćaskanje." +msgid "Whether Empathy can use the network to guess the location." +msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju." #: ../data/org.gnome.Empathy.gschema.xml.in.h:99 -msgid "Whether to show the contact list in compact mode." -msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu." +msgid "Empathy can use the cellular network to guess the location" +msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju" #: ../data/org.gnome.Empathy.gschema.xml.in.h:100 -msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." -msgstr "" -"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na " -"„x“ dugme." +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju." #: ../data/org.gnome.Empathy.gschema.xml.in.h:101 -msgid "Whether to use the theme for chat rooms." -msgstr "Da li da koristi temu za sobe razgovora." +msgid "Empathy can use the GPS to guess the location" +msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju" #: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 +msgid "Empathy should reduce the location's accuracy" +msgstr "Da li Pismonoša da umanji preciznost lokacije" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 msgid "" -"Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." +"Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" -"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se " -"koristi „name“ (sortiranje po imenu prijatelja). Ako je vrednost „state“, " -"sortiranje se vrši po stanju prijatelja." +"Da li Pismonoša da umanji preciznost lokacije zbog povećane privatnosti." +#. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2327 +msgid "Messaging and VoIP Accounts" +msgstr "Nalozi za dopisivanje i VoIP" + +#: ../data/empathy-accounts.desktop.in.in.h:2 msgid "Manage Messaging and VoIP accounts" msgstr "Upravljajte nalozima za dopisivanje i VoIP" -#. Tweak the dialog -#: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2324 -msgid "Messaging and VoIP Accounts" -msgstr "Nalozi za dopisivanje i VoIP" +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Nije naveden razlog" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Zahtevana je promena stanja" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Obustavili ste prenos datoteke" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Druga strana je prekinula prenos datoteke" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Greška prilikom prenosa datoteke" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Druga strana nije u mogućnosti da prenese datoteku" -#: ../libempathy/empathy-ft-handler.c:825 +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "Nepoznat razlog" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Prenos datoteke je završen, ali je datoteka oštećena" -#: ../libempathy/empathy-ft-handler.c:1111 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Druga strana ne podržava prenos datoteka" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Izabrana datoteka nije obična datoteka" -#: ../libempathy/empathy-ft-handler.c:1176 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Izabrana datoteka je prazna" @@ -548,169 +587,138 @@ msgstr "Poziv korisnika %s" msgid "Call from %s" msgstr "Poziv od %s" -#: ../libempathy/empathy-tp-file.c:268 -msgid "Socket type not supported" -msgstr "Vrsta priključka nije podržana" - -#: ../libempathy/empathy-tp-file.c:387 -msgid "No reason was specified" -msgstr "Nije naveden razlog" - -#: ../libempathy/empathy-tp-file.c:390 -msgid "The change in state was requested" -msgstr "Zahtevana je promena stanja" - -#: ../libempathy/empathy-tp-file.c:393 -msgid "You canceled the file transfer" -msgstr "Obustavili ste prenos datoteke" - -#: ../libempathy/empathy-tp-file.c:396 -msgid "The other participant canceled the file transfer" -msgstr "Druga strana je prekinula prenos datoteke" - -#: ../libempathy/empathy-tp-file.c:399 -msgid "Error while trying to transfer the file" -msgstr "Greška prilikom prenosa datoteke" - -#: ../libempathy/empathy-tp-file.c:402 -msgid "The other participant is unable to transfer the file" -msgstr "Druga strana nije u mogućnosti da prenese datoteku" - -#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Nepoznat razlog" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "Dostupan" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "Zauzet" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "Odsutan" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "Nevidljiv" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "Nepovezan" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "Nepoznato" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "Nije naveden razlog" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "Stanje je postavljeno na „nepovezan“" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Greška u mreži" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "Neuspešna prijava" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "Greška pri šifrovanju" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "Ime je u upotrebi" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "Sertifikat nije prosleđen" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "Sertifikat nije od poverenja" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "Sertifikat je istekao" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "Sertifikat nije aktiviran" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "Ime domaćina sertifikata se ne poklapa" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "Otisak sertifikata se ne poklapa" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "Sertifikat je samopotpisan" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "Greška u sertifikatu" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "Šifrovanje nije dostupno" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "Sertifikat nije ispravan" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "Veza je odbijena" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "Veza ne može da se uspostavi" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "Veza je izgubljena" -#: ../libempathy/empathy-utils.c:354 -msgid "This resource is already connected to the server" -msgstr "Ovaj resurs je već povezan sa serverom" +#: ../libempathy/empathy-utils.c:355 +msgid "This account is already connected to the server" +msgstr "Ovaj nalog je već povezan sa serverom" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "Veza je zamenjena novom vezom koristeći isti resurs" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "Ovaj nalog već postoji na serveru" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "Server je trenutno previše zauzet da bi uspostavio vezu" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "Sertifikat je opozvan" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "Sertifikat koristi nebezbedni algoritam šifrovanja ili je kriptografski slab" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:369 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -718,24 +726,31 @@ msgstr "" "Dužina sertifikata servera, ili dubina lanca sertifikata servera premašuje " "granice biblioteke za šifrovanje" -#: ../libempathy/empathy-utils.c:529 -#: ../libempathy-gtk/empathy-contact-list-store.h:73 +#: ../libempathy/empathy-utils.c:373 +msgid "Your software is too old" +msgstr "Vaš softver je previše star" + +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "Unutrašnja greška" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "Ljudi u okolini" -#: ../libempathy/empathy-utils.c:534 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Jahu! Japan" -#: ../libempathy/empathy-utils.c:563 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Gugl razgovor" -#: ../libempathy/empathy-utils.c:564 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Fejsbuk ćaskanje" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" @@ -744,7 +759,7 @@ msgstr[1] "Pre %d sekunde" msgstr[2] "Pre %d sekundi" msgstr[3] "Pre jedne sekunde" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -753,7 +768,7 @@ msgstr[1] "Pre %d minuta" msgstr[2] "Pre %d minuta" msgstr[3] "Pre jednog minuta" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -762,7 +777,7 @@ msgstr[1] "Pre %d sata" msgstr[2] "Pre %d sati" msgstr[3] "Pre jednog sata" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -771,7 +786,7 @@ msgstr[1] "Pre %d dana" msgstr[2] "Pre %d dana" msgstr[3] "Pre jednog dana" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -780,7 +795,7 @@ msgstr[1] "Pre %d nedelje" msgstr[2] "Pre %d nedelja" msgstr[3] "Pre jedne nedelje" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -789,224 +804,196 @@ msgstr[1] "Pre %d meseca" msgstr[2] "Pre %d meseci" msgstr[3] "Pre jednog meseca" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "u budućnosti" -#: ../libempathy-gtk/empathy-account-chooser.c:540 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "Svi nalozi" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Nalog" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Lozinka" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Server" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Port" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:765 +#: ../libempathy-gtk/empathy-account-widget.c:817 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -msgid "My Web Accounts" -msgstr "Moji veb nalozi" - -#: ../libempathy-gtk/empathy-account-widget.c:1208 -#, c-format -msgid "The account %s is edited via %s." -msgstr "Nalog %s je izmenjen putem %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1214 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Nalog %s ne može biti uređivan iz Pismonoše." - -#: ../libempathy-gtk/empathy-account-widget.c:1233 -msgid "Launch My Web Accounts" -msgstr "Pokreni Moje veb naloge" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1241 -#, c-format -msgid "Edit %s" -msgstr "Izmeni %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1591 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget.c:1398 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Username:" msgstr "Korisničko ime:" -#: ../libempathy-gtk/empathy-account-widget.c:1909 +#: ../libempathy-gtk/empathy-account-widget.c:1710 msgid "A_pply" msgstr "_Primeni" -#: ../libempathy-gtk/empathy-account-widget.c:1939 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "L_og in" msgstr "Prijavi _me" -#: ../libempathy-gtk/empathy-account-widget.c:2013 +#: ../libempathy-gtk/empathy-account-widget.c:1812 msgid "This account already exists on the server" msgstr "Ovaj nalog već postoji na serveru" -#: ../libempathy-gtk/empathy-account-widget.c:2016 +#: ../libempathy-gtk/empathy-account-widget.c:1816 msgid "Create a new account on the server" msgstr "Napravi novi nalog na serveru" -#: ../libempathy-gtk/empathy-account-widget.c:2208 -msgid "Ca_ncel" -msgstr "Po_ništi" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2486 +#: ../libempathy-gtk/empathy-account-widget.c:2241 #, 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:2512 +#: ../libempathy-gtk/empathy-account-widget.c:2267 #, c-format msgid "%s Account" msgstr "%s nalog" -#: ../libempathy-gtk/empathy-account-widget.c:2516 +#: ../libempathy-gtk/empathy-account-widget.c:2271 msgid "New account" msgstr "Novi nalog" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 -msgid "Example: MyScreenName" -msgstr "Primer: MojNadimak" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Pass_word:" +msgstr "_Lozinka:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 -msgid "Advanced" -msgstr "Napredno" +msgid "Screen _Name:" +msgstr "_Nadimak:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +msgid "Example: MyScreenName" +msgstr "Primer: MojNadimak" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 -msgid "Pass_word:" -msgstr "_Lozinka:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "Zapamti lozinku" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -msgid "Remember Password" -msgstr "Zapamti lozinku" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Port:" +msgstr "_Port:" -#. remember password ticky box -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 -msgid "Remember password" -msgstr "Zapamti lozinku" - -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 -msgid "Screen _Name:" -msgstr "_Nadimak:" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "_Server:" +msgstr "_Server:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 -msgid "What is your AIM password?" -msgstr "Koja je vaša AIM lozinka?" +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Advanced" +msgstr "Napredno" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 msgid "What is your AIM screen name?" msgstr "Koji je vaš AIM nadimak?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 -msgid "_Port:" -msgstr "_Port:" +msgid "What is your AIM password?" +msgstr "Koja je vaša AIM lozinka?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../src/empathy-new-chatroom-dialog.ui.h:9 -msgid "_Server:" -msgstr "_Server:" - -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "Example: username" -msgstr "Primer: korisničko_ime" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "Remember Password" +msgstr "Zapamti lozinku" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "_Korisničko ime:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Example: username" +msgstr "Primer: korisničko_ime" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 msgid "What is your GroupWise User ID?" msgstr "Koji je vaš Group Vajz korisnički IB?" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 msgid "What is your GroupWise password?" msgstr "Koja je vaša Group Vajz lozinka?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "ICKu _KIB:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "Example: 123456789" msgstr "Primer: 123456789" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "Ch_aracter set:" msgstr "Kodni r_aspored:" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 -msgid "ICQ _UIN:" -msgstr "ICKu _KIB:" - -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 msgid "What is your ICQ UIN?" msgstr "Koji je vaš ICKu KIB?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 msgid "What is your ICQ password?" msgstr "Koja je vaša ICKu lozinka?" @@ -1043,11 +1030,23 @@ msgstr "Opcije" msgid "None" msgstr "Ništa" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Network" +msgstr "Mreža" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +msgid "Network:" +msgstr "Mreža:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Character set:" msgstr "Kodni raspored:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +msgid "Servers" +msgstr "Serveri" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." @@ -1055,14 +1054,6 @@ msgstr "" "Većina IRC servera ne traži lozinku, zato ako niste sigurni, nemojte je " "unositi." -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 -msgid "Network" -msgstr "Mreža" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 -msgid "Network:" -msgstr "Mreža:" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "Nadimak:" @@ -1079,48 +1070,20 @@ msgstr "Poruka za kraj:" msgid "Real name:" msgstr "Pravo ime:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 -msgid "Servers" -msgstr "Serveri" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 -msgid "What is your IRC nickname?" -msgstr "Koji je vaš IRC nadimak?" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Which IRC network?" msgstr "Koja IRC mreža?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "Example: user@gmail.com" -msgstr "Primer: korisnik@gmail.com" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "Example: user@jabber.org" -msgstr "Primer: korisnik@jabber.org" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 -msgid "Encr_yption required (TLS/SSL)" -msgstr "Zahteva se _šifrovanje(TLS/SSL)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 -msgid "I_gnore SSL certificate errors" -msgstr "_Zanemari greške SSL sertifikata" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 -msgid "Override server settings" -msgstr "Prevaziđi postavke servera" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 -msgid "Priori_ty:" -msgstr "_Prioritet:" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "What is your IRC nickname?" +msgstr "Koji je vaš IRC nadimak?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 -msgid "Reso_urce:" -msgstr "_Resurs:" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "What is your Facebook username?" +msgstr "Koje je vaše Fejsbuk korisničko ime?" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/badger, enter badger.\n" @@ -1132,179 +1095,203 @@ msgstr "" "Ukoliko nemate korisničko ime za Fejsbuk, idite na ovu stranu da ga izaberete." -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 -msgid "Use old SS_L" -msgstr "Koristi stari SS_L" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "What is your Facebook password?" msgstr "Koja je vaša Fejsbuk lozinka?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 -msgid "What is your Facebook username?" -msgstr "Koje je vaše Fejsbuk korisničko ime?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "What is your Google ID?" msgstr "Koji je vaš Gugl IB?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Example: user@gmail.com" +msgstr "Primer: korisnik@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "What is your Google password?" msgstr "Koja je vaša Gugl lozinka?" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +msgid "Example: user@jabber.org" +msgstr "Primer: korisnik@jabber.org" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "I_gnore SSL certificate errors" +msgstr "_Zanemari greške SSL sertifikata" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +msgid "Priori_ty:" +msgstr "_Prioritet:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +msgid "Reso_urce:" +msgstr "_Resurs:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "Encr_yption required (TLS/SSL)" +msgstr "Zahteva se _šifrovanje(TLS/SSL)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "Use old SS_L" +msgstr "Koristi stari SS_L" + #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "Override server settings" +msgstr "Prevaziđi postavke servera" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 msgid "What is your Jabber ID?" msgstr "Koji je vaš Džaber IB?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 -msgid "What is your Jabber password?" -msgstr "Koja je vaša Džaber lozinka?" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 msgid "What is your desired Jabber ID?" msgstr "Koji je vaš željeni Džaber IB?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +msgid "What is your Jabber password?" +msgstr "Koja je vaša Džaber lozinka?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 msgid "What is your desired Jabber password?" msgstr "Koja ja vaša željena Džaber lozinka?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 msgid "Example: user@hotmail.com" msgstr "Primer: korisnik@hotmail.com" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 msgid "What is your Windows Live ID?" msgstr "Koji je vaš Vindouz Uživo IB ?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 msgid "What is your Windows Live password?" msgstr "Koja je vaša Vindouz Uživo lozinka?" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "E-_mail address:" -msgstr "Adresa _e-pošte:" - -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 msgid "Nic_kname:" msgstr "_Nadimak:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "_Last Name:" +msgstr "_Prezime:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 msgid "_First Name:" msgstr "_Ime:" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +msgid "_Published Name:" +msgstr "Ime za _objavu:" + #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Jabber ID:" msgstr "_Džaber ID:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 -msgid "_Last Name:" -msgstr "_Prezime:" +msgid "E-_mail address:" +msgstr "Adresa _e-pošte:" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -msgid "_Published Name:" -msgstr "Ime za _objavu:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "_Username:" +msgstr "_Korisničko ime:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Example: user@my.sip.server" msgstr "Primer: korisnik@moj.sip.server" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "Authentication username:" -msgstr "Korisničko ime za prijavu:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover Binding" -msgstr "Otkrij povezivanja" - #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "Discover the STUN server automatically" -msgstr "Automatski otkrij STUN server" +msgid "Use this account to call _landlines and mobile phones" +msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 -msgid "Ignore TLS Errors" -msgstr "Zanemari TLS greške" +msgid "NAT Traversal Options" +msgstr "Opcije prolaska kroz NAT" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "Interval (seconds)" -msgstr "Period (u sekundama)" +msgid "Proxy Options" +msgstr "Opcije posrednika" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -msgid "Keep-Alive Options" -msgstr "Opcije za održavanje stalne veze" +msgid "Miscellaneous Options" +msgstr "Razne opcije" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 -msgid "Loose Routing" -msgstr "Slabo rutiranje" +msgid "STUN Server:" +msgstr "STUN server:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 -msgid "Mechanism:" -msgstr "Mehanizam:" +msgid "Discover the STUN server automatically" +msgstr "Automatski otkrij STUN server" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 -msgid "Miscellaneous Options" -msgstr "Razne opcije" +msgid "Discover Binding" +msgstr "Otkrij povezivanja" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -msgid "NAT Traversal Options" -msgstr "Opcije prolaska kroz NAT" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "Server:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Keep-Alive Options" +msgstr "Opcije za održavanje stalne veze" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 -msgid "Port:" -msgstr "Port:" +msgid "Mechanism:" +msgstr "Mehanizam:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 -msgid "Proxy Options" -msgstr "Opcije posrednika" +msgid "Interval (seconds)" +msgstr "Period (u sekundama)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Authentication username:" +msgstr "Korisničko ime za prijavu:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Transport:" +msgstr "Transport:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -msgid "STUN Server:" -msgstr "STUN server:" +msgid "Loose Routing" +msgstr "Slabo rutiranje" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contact-widget.c:347 -msgid "Server:" -msgstr "Server:" +msgid "Ignore TLS Errors" +msgstr "Zanemari TLS greške" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -msgid "Transport:" -msgstr "Transport:" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -msgid "Use this account to call _landlines and mobile phones" -msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona" +msgid "Port:" +msgstr "Port:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 -msgid "What is your SIP account password?" -msgstr "Koja je lozinka za vaš SIP nalog?" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Koja je identifikacija za SIP prijavu?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 -msgid "_Username:" -msgstr "_Korisničko ime:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP account password?" +msgstr "Koja je lozinka za vaš SIP nalog?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Yahoo! I_D:" +msgstr "Jahu! I_B:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "I_gnore conference and chat room invitations" msgstr "_Zanemari pozivnice za pričaonice i konferencije" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Room List locale:" +msgstr "Lok_alni spisak soba:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "What is your Yahoo! ID?" msgstr "Koji je vaš Jahu! IB?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "What is your Yahoo! password?" msgstr "Koja je vaša Jahu! lozinka?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "Yahoo! I_D:" -msgstr "Jahu! I_B:" - -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 -msgid "_Room List locale:" -msgstr "Lok_alni spisak soba:" - #: ../libempathy-gtk/empathy-avatar-chooser.c:471 #: ../libempathy-gtk/empathy-avatar-chooser.c:556 msgid "Couldn't convert image" @@ -1343,7 +1330,7 @@ msgid "Click to enlarge" msgstr "Kliknite da uvećate" #: ../libempathy-gtk/empathy-call-utils.c:44 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:62 msgid "There was an error starting the call" msgstr "Došlo je do greške prilikom pozivanja" @@ -1363,63 +1350,67 @@ msgstr "Navedeni kontakt nije ispravan" msgid "Emergency calls are not supported on this protocol" msgstr "Ovaj protokol ne podržava hitne pozive" -#: ../libempathy-gtk/empathy-chat.c:704 +#: ../libempathy-gtk/empathy-call-utils.c:59 +msgid "You don't have enough credit in order to place this call" +msgstr "Nemate dovoljno kredita da biste mogli da obavite ovaj poziv" + +#: ../libempathy-gtk/empathy-chat.c:728 msgid "Failed to open private chat" msgstr "Nisam uspeo da otvorim privatno ćaskanje" -#: ../libempathy-gtk/empathy-chat.c:765 +#: ../libempathy-gtk/empathy-chat.c:786 msgid "Topic not supported on this conversation" msgstr "Teme nisu podržane u ovom razgovoru" -#: ../libempathy-gtk/empathy-chat.c:771 +#: ../libempathy-gtk/empathy-chat.c:792 msgid "You are not allowed to change the topic" msgstr "Nije vam dozvoljeno da promenite temu" -#: ../libempathy-gtk/empathy-chat.c:975 +#: ../libempathy-gtk/empathy-chat.c:991 #, c-format msgid "“%s” is not a valid contact ID" msgstr "„%s“ nije ispravan IB kontakta" -#: ../libempathy-gtk/empathy-chat.c:1060 +#: ../libempathy-gtk/empathy-chat.c:1086 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: čisti sve poruke iz ovog razgovora" -#: ../libempathy-gtk/empathy-chat.c:1063 +#: ../libempathy-gtk/empathy-chat.c:1089 msgid "/topic : set the topic of the current conversation" msgstr "/topic : postavlja temu trenutnog razgovora" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/join : join a new chat room" msgstr "/join : priključuje se novoj sobi za ćaskanje" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "/j : join a new chat room" msgstr "/j : priključuje se novoj sobi za ćaskanje" -#: ../libempathy-gtk/empathy-chat.c:1073 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "" "/part [] []: leave the chat room, by default the " "current one" msgstr "" "/part [] []: napušta sobu za ćaskanje, podrazumevano trenutnu" -#: ../libempathy-gtk/empathy-chat.c:1077 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "/query []: open a private chat" msgstr "/query []: otvara privatno ćaskanje" -#: ../libempathy-gtk/empathy-chat.c:1080 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "/msg : open a private chat" msgstr "/msg : otvara privatno ćaskanje" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "/nick : change your nickname on the current server" msgstr "/nick : menja vaš nadimak na trenutnom serveru" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "/me : send an ACTION message to the current conversation" msgstr "/me : šalje poruku RADNJA na trenutni razgovor" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1429,11 +1420,11 @@ msgstr "" "poruka koje počinju sa „/“. Na primer: „/say /join se koristi za priključivanje " "u novu sobu za ćaskanje“" -#: ../libempathy-gtk/empathy-chat.c:1094 +#: ../libempathy-gtk/empathy-chat.c:1120 msgid "/whois : display information about a contact" msgstr "/whois : prikazuje podatke o kontaktu" -#: ../libempathy-gtk/empathy-chat.c:1097 +#: ../libempathy-gtk/empathy-chat.c:1123 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1441,113 +1432,126 @@ msgstr "" "/help []: prikazuje sve podržane naredbe. Ako se da i konkretna " ", prikazuje njeno uputstvo za upotrebu." -#: ../libempathy-gtk/empathy-chat.c:1114 +#: ../libempathy-gtk/empathy-chat.c:1142 #, c-format msgid "Usage: %s" msgstr "Korišćenje: %s" -#: ../libempathy-gtk/empathy-chat.c:1159 +#: ../libempathy-gtk/empathy-chat.c:1187 msgid "Unknown command" msgstr "Nepoznata naredba" -#: ../libempathy-gtk/empathy-chat.c:1285 +#: ../libempathy-gtk/empathy-chat.c:1313 msgid "Unknown command; see /help for the available commands" msgstr "Nepoznata naredba; pogledajte /help za dostupne naredbe" -#. translators: error used when user doesn't have enough credit on his -#. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1455 +#: ../libempathy-gtk/empathy-chat.c:1564 msgid "insufficient balance to send message" msgstr "nema dovoljno gotovine za slanje poruke" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582 +#: ../libempathy-gtk/empathy-chat.c:1645 +#, c-format +msgid "Error sending message '%s': %s" +msgstr "Greška pri slanju poruke „%s“: %s" + +#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587 +#: ../libempathy-gtk/empathy-chat.c:1649 +#, c-format +msgid "Error sending message: %s" +msgstr "Greška pri slanju poruke: %s" + +#. translators: error used when user doesn't have enough credit on his +#. * account to send the message. +#: ../libempathy-gtk/empathy-chat.c:1576 +#, c-format +msgid "insufficient balance to send message. Top up." +msgstr "nema dovoljno gotovine za slanje poruke. Dopunite." + +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "not capable" msgstr "nesposoban" -#: ../libempathy-gtk/empathy-chat.c:1464 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "offline" msgstr "nepovezan" -#: ../libempathy-gtk/empathy-chat.c:1467 +#: ../libempathy-gtk/empathy-chat.c:1626 msgid "invalid contact" msgstr "neispravan prijatelj" -#: ../libempathy-gtk/empathy-chat.c:1470 +#: ../libempathy-gtk/empathy-chat.c:1629 msgid "permission denied" msgstr "pristup je zabranjen" -#: ../libempathy-gtk/empathy-chat.c:1473 +#: ../libempathy-gtk/empathy-chat.c:1632 msgid "too long message" msgstr "poruka je preduga" -#: ../libempathy-gtk/empathy-chat.c:1476 +#: ../libempathy-gtk/empathy-chat.c:1635 msgid "not implemented" msgstr "nije podržano" -#: ../libempathy-gtk/empathy-chat.c:1480 +#: ../libempathy-gtk/empathy-chat.c:1639 msgid "unknown" msgstr "nepoznato" -#: ../libempathy-gtk/empathy-chat.c:1486 -#, c-format -msgid "Error sending message '%s': %s" -msgstr "Greška pri slanju poruke „%s“: %s" - -#: ../libempathy-gtk/empathy-chat.c:1490 -#, c-format -msgid "Error sending message: %s" -msgstr "Greška pri slanju poruke: %s" - -#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "Tema:" -#: ../libempathy-gtk/empathy-chat.c:1563 +#: ../libempathy-gtk/empathy-chat.c:1721 #, c-format msgid "Topic set to: %s" msgstr "Tema je postavljena na: %s" -#: ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1723 +#, c-format +msgid "Topic set by %s to: %s" +msgstr "Temu je postavio %s na: %s" + +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1728 msgid "No topic defined" msgstr "Tema nije postavljena" -#: ../libempathy-gtk/empathy-chat.c:2074 +#: ../libempathy-gtk/empathy-chat.c:2244 msgid "(No Suggestions)" msgstr "(nema predloga)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2142 +#: ../libempathy-gtk/empathy-chat.c:2312 #, c-format msgid "Add '%s' to Dictionary" msgstr "Dodaj „%s“ u rečnik" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2179 +#: ../libempathy-gtk/empathy-chat.c:2349 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Dodaj „%s“ u rečnik za %s jezik" -#: ../libempathy-gtk/empathy-chat.c:2249 +#: ../libempathy-gtk/empathy-chat.c:2419 msgid "Insert Smiley" msgstr "Ubaci smešak" #. send button -#: ../libempathy-gtk/empathy-chat.c:2267 -#: ../libempathy-gtk/empathy-ui-utils.c:1839 +#: ../libempathy-gtk/empathy-chat.c:2437 +#: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "_Pošalji" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2321 +#: ../libempathy-gtk/empathy-chat.c:2494 msgid "_Spelling Suggestions" msgstr "Predlozi pravopi_sa" -#: ../libempathy-gtk/empathy-chat.c:2410 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Nisam uspeo da preuzmem skorašnje dnevnike" -#: ../libempathy-gtk/empathy-chat.c:2547 +#: ../libempathy-gtk/empathy-chat.c:2722 #, c-format msgid "%s has disconnected" msgstr "%s je otišao sa veze" @@ -1555,12 +1559,12 @@ msgstr "%s je otišao sa veze" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2554 +#: ../libempathy-gtk/empathy-chat.c:2729 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s je izbacio korisnika %1$s" -#: ../libempathy-gtk/empathy-chat.c:2557 +#: ../libempathy-gtk/empathy-chat.c:2732 #, c-format msgid "%s was kicked" msgstr "%s je izbačen" @@ -1568,17 +1572,17 @@ msgstr "%s je izbačen" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2565 +#: ../libempathy-gtk/empathy-chat.c:2740 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s je zabranio pristup korisniku %1$s" -#: ../libempathy-gtk/empathy-chat.c:2568 +#: ../libempathy-gtk/empathy-chat.c:2743 #, c-format msgid "%s was banned" msgstr "Korisniku %s je zabranjen pristup" -#: ../libempathy-gtk/empathy-chat.c:2572 +#: ../libempathy-gtk/empathy-chat.c:2747 #, c-format msgid "%s has left the room" msgstr "%s je napustio(la) pričaonicu" @@ -1588,17 +1592,17 @@ msgstr "%s je napustio(la) pričaonicu" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2581 +#: ../libempathy-gtk/empathy-chat.c:2756 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2606 +#: ../libempathy-gtk/empathy-chat.c:2781 #, c-format msgid "%s has joined the room" msgstr "%s je pristupio(la) pričaonici" -#: ../libempathy-gtk/empathy-chat.c:2631 +#: ../libempathy-gtk/empathy-chat.c:2806 #, c-format msgid "%s is now known as %s" msgstr "%s je sada poznat kao %s" @@ -1606,90 +1610,90 @@ msgstr "%s je sada poznat kao %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:2784 -#: ../src/empathy-streamed-media-window.c:1894 -#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432 -#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527 +#: ../libempathy-gtk/empathy-chat.c:2993 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545 +#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638 msgid "Disconnected" msgstr "Veza je prekinuta" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3428 +#: ../libempathy-gtk/empathy-chat.c:3657 msgid "Would you like to store this password?" msgstr "Da li želite da zapamtite ovu lozinku?" -#: ../libempathy-gtk/empathy-chat.c:3434 +#: ../libempathy-gtk/empathy-chat.c:3663 msgid "Remember" msgstr "Zapamti" -#: ../libempathy-gtk/empathy-chat.c:3444 +#: ../libempathy-gtk/empathy-chat.c:3673 msgid "Not now" msgstr "Ne sada" -#: ../libempathy-gtk/empathy-chat.c:3488 +#: ../libempathy-gtk/empathy-chat.c:3717 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Pokušaj ponovo" -#: ../libempathy-gtk/empathy-chat.c:3492 +#: ../libempathy-gtk/empathy-chat.c:3721 msgid "Wrong password; please try again:" msgstr "Pogrešna lozinka, pokušajte ponovo:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3622 +#: ../libempathy-gtk/empathy-chat.c:3851 msgid "This room is protected by a password:" msgstr "Ova soba je zaštićena lozinkom:" -#: ../libempathy-gtk/empathy-chat.c:3649 +#: ../libempathy-gtk/empathy-chat.c:3878 msgid "Join" msgstr "Priključi se" -#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261 +#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Povezan" -#: ../libempathy-gtk/empathy-chat.c:3906 +#: ../libempathy-gtk/empathy-chat.c:4125 msgid "Conversation" msgstr "Razgovor" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3911 +#: ../libempathy-gtk/empathy-chat.c:4130 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Nepoznati ili neispravan identifikator" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Blokiranje prijatelja je trenutno nedostupno" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Blokiranje prijatelja nije dostupno" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Pristup je zabranjen" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Ne mogu da blokiram prijatelja" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Izmeni blokirane prijatelje" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1489 -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "Account:" msgstr "Nalog:" @@ -1699,466 +1703,371 @@ msgstr "Blokirani prijatelji" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:2 #: ../src/empathy-chatrooms-window.ui.h:3 -msgid "Remove" -msgstr "Ukloni" - -#. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 -#: ../libempathy-gtk/empathy-webkit-utils.c:277 -msgid "_Copy Link Address" -msgstr "_Umnoži adresu veze" - -#. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 -#: ../libempathy-gtk/empathy-webkit-utils.c:284 -msgid "_Open Link" -msgstr "_Otvori vezu" - -#. Translators: timestamp displayed between conversations in -#. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 -msgid "%A %B %d %Y" -msgstr "%A %B %d %Y" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Izmeni podatke kontakta" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 -msgid "Personal Information" -msgstr "Podaci o profilu" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 -msgid "New Contact" -msgstr "Novi prijatelj" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 -#, c-format -msgid "Block %s?" -msgstr "Blokirati %s?" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 -#, c-format -msgid "Are you sure you want to block '%s' from contacting you again?" -msgstr "" -"Da li ste sigurni da želite da blokirate da vas „%s“ više ne kontaktira?" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 -msgid "_Block" -msgstr "_Blokiraj" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 -msgid "_Report this contact as abusive" -msgid_plural "_Report these contacts as abusive" -msgstr[0] "P_rijavi ovaj kontakt za zloupotrebu" -msgstr[1] "P_rijavi ove kontakte za zloupotrebu" -msgstr[2] "P_rijavi ove kontakte za zloupotrebu" -msgstr[3] "P_rijavi ovaj kontakt za zloupotrebu" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "Od_luči kasnije" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 -msgid "Subscription Request" -msgstr "Zahtev za pretplatu" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 -msgid "_Block User" -msgstr "_Blokiraj korisnika" - -#: ../libempathy-gtk/empathy-contact-list-store.h:71 -msgid "Ungrouped" -msgstr "Negrupisano" - -#: ../libempathy-gtk/empathy-contact-list-store.h:72 -msgid "Favorite People" -msgstr "Omiljeni ljudi" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-individual-view.c:2376 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1988 -#: ../libempathy-gtk/empathy-individual-view.c:2379 -msgid "Removing group" -msgstr "Uklanjam grupu" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:2037 -#: ../libempathy-gtk/empathy-contact-list-view.c:2114 -#: ../libempathy-gtk/empathy-individual-view.c:2434 -#: ../libempathy-gtk/empathy-individual-view.c:2637 -msgid "_Remove" -msgstr "_Ukloni" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2067 -#: ../libempathy-gtk/empathy-individual-view.c:2501 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2069 -#: ../libempathy-gtk/empathy-individual-view.c:2522 -msgid "Removing contact" -msgstr "Uklanjam prijatelja" - -#: ../libempathy-gtk/empathy-contact-menu.c:220 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "Dod_aj prijatelja…" - -#: ../libempathy-gtk/empathy-contact-menu.c:300 -msgid "_Block Contact" -msgstr "_Blokiraj kontakt" +msgid "Remove" +msgstr "Ukloni" -#: ../libempathy-gtk/empathy-contact-menu.c:329 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "Ća_skanje" +#. Copy Link Address menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:322 +#: ../libempathy-gtk/empathy-webkit-utils.c:277 +msgid "_Copy Link Address" +msgstr "_Umnoži adresu veze" -#: ../libempathy-gtk/empathy-contact-menu.c:361 -#: ../libempathy-gtk/empathy-individual-menu.c:849 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Audio poziv" +#. Open Link menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:329 +#: ../libempathy-gtk/empathy-webkit-utils.c:284 +msgid "_Open Link" +msgstr "_Otvori vezu" -#: ../libempathy-gtk/empathy-contact-menu.c:394 -#: ../libempathy-gtk/empathy-individual-menu.c:894 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Video poziv" +#. Translators: timestamp displayed between conversations in +#. * chat windows (strftime format string) +#: ../libempathy-gtk/empathy-chat-text-view.c:417 +msgid "%A %B %d %Y" +msgstr "%A %B %d %Y" -#: ../libempathy-gtk/empathy-contact-menu.c:440 -#: ../libempathy-gtk/empathy-individual-menu.c:947 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "_Prethodni razgovori" +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +msgid "New Contact" +msgstr "Novi prijatelj" -#: ../libempathy-gtk/empathy-contact-menu.c:462 -#: ../libempathy-gtk/empathy-individual-menu.c:988 -msgid "Send File" -msgstr "Pošalji datoteku" +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 +#, c-format +msgid "Block %s?" +msgstr "Blokirati %s?" -#: ../libempathy-gtk/empathy-contact-menu.c:485 -#: ../libempathy-gtk/empathy-individual-menu.c:1030 -msgid "Share My Desktop" -msgstr "Podeli moju radnu površ" +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#, c-format +msgid "Are you sure you want to block '%s' from contacting you again?" +msgstr "" +"Da li ste sigurni da želite da blokirate da vas „%s“ više ne kontaktira?" -#: ../libempathy-gtk/empathy-contact-menu.c:525 -#: ../libempathy-gtk/empathy-contact-widget.c:1886 -#: ../libempathy-gtk/empathy-individual-menu.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:1372 -msgid "Favorite" -msgstr "Omiljeni" +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +msgid "_Block" +msgstr "_Blokiraj" -#: ../libempathy-gtk/empathy-contact-menu.c:554 -#: ../libempathy-gtk/empathy-individual-menu.c:1093 -msgid "Infor_mation" -msgstr "_Podaci" +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +msgid "_Report this contact as abusive" +msgid_plural "_Report these contacts as abusive" +msgstr[0] "P_rijavi ovaj kontakt za zloupotrebu" +msgstr[1] "P_rijavi ove kontakte za zloupotrebu" +msgstr[2] "P_rijavi ove kontakte za zloupotrebu" +msgstr[3] "P_rijavi ovaj kontakt za zloupotrebu" -#: ../libempathy-gtk/empathy-contact-menu.c:600 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "Izm_eni" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 +msgid "Subscription Request" +msgstr "Zahtev za pretplatu" -#: ../libempathy-gtk/empathy-contact-menu.c:654 -#: ../libempathy-gtk/empathy-individual-menu.c:1284 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Pozivam vas u ovu sobu" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 +msgid "_Block User" +msgstr "_Blokiraj korisnika" -#: ../libempathy-gtk/empathy-contact-menu.c:685 -#: ../libempathy-gtk/empathy-individual-menu.c:1330 -msgid "_Invite to Chat Room" -msgstr "Pozov_i u sobu za ćaskanje" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "Decide _Later" +msgstr "Od_luči kasnije" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Pretraži kontakte" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Pretraga:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "Dod_aj prijatelja" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Nije pronađen nijedan prijatelj" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "Poruka koja vas predstavlja:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "Molim vas obavestite ne kada ste na mreži. Hvala!" -#: ../libempathy-gtk/empathy-contact-selector.c:129 -msgid "Select a contact" -msgstr "Izaberite prijatelja" - -#: ../libempathy-gtk/empathy-contact-widget.c:336 -#: ../libempathy-gtk/empathy-individual-widget.c:153 -msgid "Full name:" -msgstr "Puno ime:" - -#: ../libempathy-gtk/empathy-contact-widget.c:337 -#: ../libempathy-gtk/empathy-individual-widget.c:154 -msgid "Phone number:" -msgstr "Broj telefona:" - -#: ../libempathy-gtk/empathy-contact-widget.c:338 -#: ../libempathy-gtk/empathy-individual-widget.c:155 -msgid "E-mail address:" -msgstr "Adresa e-pošte:" - -#: ../libempathy-gtk/empathy-contact-widget.c:339 -#: ../libempathy-gtk/empathy-individual-widget.c:156 -msgid "Website:" -msgstr "Veb stranica:" - -#: ../libempathy-gtk/empathy-contact-widget.c:340 -#: ../libempathy-gtk/empathy-individual-widget.c:157 -msgid "Birthday:" -msgstr "Rođendan:" - -#. 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-contact-widget.c:346 -msgid "Last seen:" -msgstr "Viđen pre:" - -#: ../libempathy-gtk/empathy-contact-widget.c:348 -msgid "Connected from:" -msgstr "Povezan sa:" - -#. FIXME: once Idle implements SimplePresence using this information, we can -#. * and should bin this. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:353 -msgid "Away message:" -msgstr "Poruka za odsutnost:" - -#: ../libempathy-gtk/empathy-contact-widget.c:606 +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Kanali:" -#: ../libempathy-gtk/empathy-contact-widget.c:897 -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "ISO kod države:" -#: ../libempathy-gtk/empathy-contact-widget.c:899 -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Država:" -#: ../libempathy-gtk/empathy-contact-widget.c:901 -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Republika:" -#: ../libempathy-gtk/empathy-contact-widget.c:903 -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Grad:" -#: ../libempathy-gtk/empathy-contact-widget.c:905 -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Oblast:" -#: ../libempathy-gtk/empathy-contact-widget.c:907 -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Poštanski kod:" -#: ../libempathy-gtk/empathy-contact-widget.c:909 -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Ulica:" -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Zgrada:" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Sprat:" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Soba:" -#: ../libempathy-gtk/empathy-contact-widget.c:917 -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Tekst:" -#: ../libempathy-gtk/empathy-contact-widget.c:919 -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Opis:" -#: ../libempathy-gtk/empathy-contact-widget.c:921 -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "Adresa:" -#: ../libempathy-gtk/empathy-contact-widget.c:923 -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Nivo tačnosti:" -#: ../libempathy-gtk/empathy-contact-widget.c:925 -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Greška:" -#: ../libempathy-gtk/empathy-contact-widget.c:927 -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Uspravna greška (u metrima):" -#: ../libempathy-gtk/empathy-contact-widget.c:929 -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Vodoravna greška (u metrima):" -#: ../libempathy-gtk/empathy-contact-widget.c:931 -#: ../libempathy-gtk/empathy-individual-widget.c:503 +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Brzina:" -#: ../libempathy-gtk/empathy-contact-widget.c:933 -#: ../libempathy-gtk/empathy-individual-widget.c:505 +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Pravac:" -#: ../libempathy-gtk/empathy-contact-widget.c:935 -#: ../libempathy-gtk/empathy-individual-widget.c:507 +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Brzina penjanja:" -#: ../libempathy-gtk/empathy-contact-widget.c:937 -#: ../libempathy-gtk/empathy-individual-widget.c:509 +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Poslednji put ažurirano:" -#: ../libempathy-gtk/empathy-contact-widget.c:939 -#: ../libempathy-gtk/empathy-individual-widget.c:511 +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Geografska dužina:" -#: ../libempathy-gtk/empathy-contact-widget.c:941 -#: ../libempathy-gtk/empathy-individual-widget.c:513 +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Geografska širina:" -#: ../libempathy-gtk/empathy-contact-widget.c:943 -#: ../libempathy-gtk/empathy-individual-widget.c:515 +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Visina:" -#: ../libempathy-gtk/empathy-contact-widget.c:996 -#: ../libempathy-gtk/empathy-contact-widget.c:1011 -#: ../libempathy-gtk/empathy-individual-widget.c:607 -#: ../libempathy-gtk/empathy-individual-widget.c:622 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:35 msgid "Location" msgstr "Lokacija" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:1013 -#: ../libempathy-gtk/empathy-individual-widget.c:624 +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:673 +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%e.%d.%Y u %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1147 -#: ../libempathy-gtk/empathy-individual-widget.c:915 +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Sačuvaj sliku" -#: ../libempathy-gtk/empathy-contact-widget.c:1203 -#: ../libempathy-gtk/empathy-individual-widget.c:973 +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Ne mogu da sačuvam sliku" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -msgid "Location at (date)\t" -msgstr "Lokacija u (datum)\t" - -#. Alias -#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1308 -msgid "Alias:" -msgstr "Nadimak:" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "Client Information" -msgstr "Podaci o klijentu" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 -msgid "Client:" -msgstr "Program:" +#: ../libempathy-gtk/empathy-contact-widget.c:1446 +msgid "Personal Details" +msgstr "Lični podaci" +#: ../libempathy-gtk/empathy-contact-widget.c:1449 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" msgstr "Detalji o prijatelju" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +msgid "Full name" +msgstr "Ime i prezime" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "Broj telefona" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "Adresa el. pošte" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +msgid "Website" +msgstr "Veb stranica" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +msgid "Birthday" +msgstr "Rođendan" + +#. 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:113 +msgid "Last seen:" +msgstr "Viđen pre:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +msgid "Connected from:" +msgstr "Povezan sa:" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +msgid "Away message:" +msgstr "Poruka za odsutnost:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +msgid "work" +msgstr "posao" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +msgid "home" +msgstr "kuća" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +msgid "mobile" +msgstr "mobilni" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +msgid "voice" +msgstr "glasovni" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +msgid "preferred" +msgstr "prvenstveni" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "poštanski" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +msgid "parcel" +msgstr "pošiljka" + #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1517 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "Identifikator:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +#. Alias +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 +msgid "Alias:" +msgstr "Nadimak:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Location at (date)\t" +msgstr "Lokacija u (datum)\t" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 msgid "Information requested…" msgstr "Zahtevani su podaci…" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Client Information" +msgstr "Podaci o klijentu" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "OS:" msgstr "OS:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Version:" msgstr "Izdanje:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Client:" +msgstr "Program:" + +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "Grupe" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2166,21 +2075,21 @@ msgstr "" "Izaberite grupe u kojima želite da se prijatelj nalazi. Primetite da možete " "da odaberete i više grupa kao i nijednu." -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "Dod_aj grupu" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Izaberi" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1807 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1951 msgid "Group" msgstr "Grupa" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Sledeći identitet će biti blokiran:" @@ -2188,7 +2097,7 @@ msgstr[1] "Sledeći identiteti će biti blokirani:" msgstr[2] "Sledeći identiteti će biti blokirani:" msgstr[3] "Sledeći identitet će biti blokiran:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Sledeći identitet ne može biti blokiran:" @@ -2196,79 +2105,144 @@ msgstr[1] "Sledeći identiteti ne mogu biti blokirani:" msgstr[2] "Sledeći identiteti ne mogu biti blokirani:" msgstr[3] "Sledeći identitet ne može biti blokiran:" -#. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 -msgid "Linked Contacts" -msgstr "Povezani prijatelji" - -#: ../libempathy-gtk/empathy-individual-linker.c:370 -msgid "Select contacts to link" -msgstr "Izaberite prijatelja za povezivanje" - -#: ../libempathy-gtk/empathy-individual-linker.c:444 -msgid "New contact preview" -msgstr "Pregled novog prijatelja" - -#: ../libempathy-gtk/empathy-individual-linker.c:488 -msgid "Contacts selected in the list on the left will be linked together." -msgstr "Označeni prijatelji na spisku levo će biti uvezani zajedno." +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Izmeni podatke kontakta" #. 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:145 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Izaberite nalog koji će biti korišćen za poziv" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 -#: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1299 -#: ../src/empathy-call-window.ui.h:2 +#: ../libempathy-gtk/empathy-individual-menu.c:348 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "Poziv" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Mobilni" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Posao" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "KUĆA" -#. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:804 -#: ../libempathy-gtk/empathy-new-message-dialog.c:215 +#: ../libempathy-gtk/empathy-individual-menu.c:658 +msgid "_Block Contact" +msgstr "_Blokiraj kontakt" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1017 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:1 +msgid "_Chat" +msgstr "Ća_skanje" + +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:1052 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1142 +#: ../libempathy-gtk/empathy-individual-menu.c:1085 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Audio poziv" + +#: ../libempathy-gtk/empathy-individual-menu.c:1118 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Video poziv" + +#: ../libempathy-gtk/empathy-individual-menu.c:1159 +#: ../src/empathy-roster-window-menubar.ui.h:4 +msgid "_Previous Conversations" +msgstr "_Prethodni razgovori" + +#: ../libempathy-gtk/empathy-individual-menu.c:1188 +msgid "Send File" +msgstr "Pošalji datoteku" + +#: ../libempathy-gtk/empathy-individual-menu.c:1218 +msgid "Share My Desktop" +msgstr "Podeli moju radnu površ" + +#: ../libempathy-gtk/empathy-individual-menu.c:1244 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Omiljeni" + +#: ../libempathy-gtk/empathy-individual-menu.c:1263 +msgid "gnome-contacts not installed" +msgstr "program gnomovi kontakti nije instaliran" + +#: ../libempathy-gtk/empathy-individual-menu.c:1266 +msgid "Please install gnome-contacts to access contacts details." +msgstr "Instalirajte „gnome-contacts“ da pristupite podacima kontakata." + +#: ../libempathy-gtk/empathy-individual-menu.c:1380 +msgid "Infor_mation" +msgstr "_Podaci" + +#: ../libempathy-gtk/empathy-individual-menu.c:1429 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Uredi" -#. Translators: this is a verb meaning "to connect two contacts together -#. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1168 -msgctxt "Link individual (contextual menu)" -msgid "_Link Contacts…" -msgstr "_Poveži kontakte…" +#: ../libempathy-gtk/empathy-individual-menu.c:1546 +#: ../src/empathy-chat-window.c:1175 +msgid "Inviting you to this room" +msgstr "Pozivam vas u ovu sobu" -#: ../libempathy-gtk/empathy-individual-view.c:2341 +#: ../libempathy-gtk/empathy-individual-menu.c:1592 +msgid "_Invite to Chat Room" +msgstr "Pozov_i u sobu za ćaskanje" + +#: ../libempathy-gtk/empathy-individual-menu.c:1788 +#: ../src/empathy-roster-window-menubar.ui.h:5 +msgid "_Add Contact…" +msgstr "Dod_aj prijatelja…" + +#: ../libempathy-gtk/empathy-individual-view.c:2306 msgid "Delete and _Block" msgstr "Izbriši i _blokiraj" -#: ../libempathy-gtk/empathy-individual-view.c:2510 +#: ../libempathy-gtk/empathy-individual-view.c:2341 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?" + +#: ../libempathy-gtk/empathy-individual-view.c:2344 +msgid "Removing group" +msgstr "Uklanjam grupu" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2399 +#: ../libempathy-gtk/empathy-individual-view.c:2603 +msgid "_Remove" +msgstr "_Ukloni" + +#: ../libempathy-gtk/empathy-individual-view.c:2476 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?" + +#: ../libempathy-gtk/empathy-individual-view.c:2485 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2277,7 +2251,11 @@ msgstr "" "Da li stvarno želite da uklonite uvezani kontakt „%s“? Ovo će ukloniti i sve " "kontakte koji su vezani za ovaj kontakt." -#: ../libempathy-gtk/empathy-individual-widget.c:1656 +#: ../libempathy-gtk/empathy-individual-view.c:2497 +msgid "Removing contact" +msgstr "Uklanjam prijatelja" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2290,23 +2268,23 @@ msgstr[3] "Uvezani prijatelj sadrži jedan kontakt" msgid "Location at (date)" msgstr "Lokacija u (datum)" -#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 msgid "Online from a phone or mobile device" msgstr "Na vezi preko telefona ili mobilnog uređaja" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "Nova mreža" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "Odaberite IRC mrežu" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "Resetuj _mrežni spisak" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Izaberi" @@ -2319,91 +2297,48 @@ msgstr "novi server" msgid "SSL" msgstr "SSL" -#. Translators: this is the title of the linking dialogue (reached by -#. * right-clicking on a contact and selecting "Link…"). "Link" in this title -#. * is a verb. -#: ../libempathy-gtk/empathy-linking-dialog.c:115 -msgid "Link Contacts" -msgstr "Poveži prijatelje" - -#: ../libempathy-gtk/empathy-linking-dialog.c:120 -msgctxt "Unlink individual (button)" -msgid "_Unlink…" -msgstr "_Razveži…" - -#: ../libempathy-gtk/empathy-linking-dialog.c:121 -msgid "" -"Completely split the displayed linked contacts into the separate contacts." -msgstr "Razdvaja uvezane kontakte u posebne prijatelje." - -#. Add button -#. Translators: this is an action button in the linking dialogue. "Link" is -#. * used here as a verb meaning "to connect two contacts to form a -#. * meta-contact". -#: ../libempathy-gtk/empathy-linking-dialog.c:136 -msgid "_Link" -msgstr "_Uveži" - -#: ../libempathy-gtk/empathy-linking-dialog.c:183 -#, c-format -msgid "Unlink linked contacts '%s'?" -msgstr "Da razvežem uvezanog prijatelja „%s“?" - -#: ../libempathy-gtk/empathy-linking-dialog.c:186 -msgid "" -"Are you sure you want to unlink these linked contacts? This will completely " -"split the linked contacts into separate contacts." -msgstr "" -"Da li ste sigurni da želite da razvežete uvezanog prijatelja? Ovim ćete " -"razdvojiti uvezane kontakte u posebne prijatelje." - -#: ../libempathy-gtk/empathy-linking-dialog.c:190 -msgctxt "Unlink individual (button)" -msgid "_Unlink" -msgstr "_Razveži" - -#: ../libempathy-gtk/empathy-log-window.c:634 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Istorijat" -#: ../libempathy-gtk/empathy-log-window.c:689 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Prikaži" -#: ../libempathy-gtk/empathy-log-window.c:711 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Potraži" -#: ../libempathy-gtk/empathy-log-window.c:1159 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Ćaskanje u %s" -#: ../libempathy-gtk/empathy-log-window.c:1161 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Ćaskanje sa %s" -#: ../libempathy-gtk/empathy-log-window.c:1211 -#: ../libempathy-gtk/empathy-log-window.c:1358 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e %B %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1300 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1306 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" @@ -2412,7 +2347,7 @@ msgstr[1] "%s sekunde" msgstr[2] "%s sekundi" msgstr[3] "jedne sekunde" -#: ../libempathy-gtk/empathy-log-window.c:1389 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" @@ -2421,151 +2356,197 @@ msgstr[1] "%s minuta" msgstr[2] "%s minuta" msgstr[3] "jednog minuta" -#: ../libempathy-gtk/empathy-log-window.c:1397 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Poziv je započet %s, a završen je %s" -#: ../libempathy-gtk/empathy-log-window.c:1729 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Danas" -#: ../libempathy-gtk/empathy-log-window.c:1733 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Juče" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1748 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e. %B %Y." #: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3444 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Bilo kad" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2372 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Bilo ko" -#: ../libempathy-gtk/empathy-log-window.c:2685 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Ko" -#: ../libempathy-gtk/empathy-log-window.c:2889 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Kada" -#: ../libempathy-gtk/empathy-log-window.c:3005 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Bilo šta" -#: ../libempathy-gtk/empathy-log-window.c:3007 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Pisana ćaskanja" -#: ../libempathy-gtk/empathy-log-window.c:3009 -#: ../src/empathy-preferences.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "Pozivi" -#: ../libempathy-gtk/empathy-log-window.c:3014 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Dolazni pozivi" -#: ../libempathy-gtk/empathy-log-window.c:3015 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Odlazeći pozivi" -#: ../libempathy-gtk/empathy-log-window.c:3016 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Propušteni pozivi" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Šta" -#: ../libempathy-gtk/empathy-log-window.c:3747 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "" "Da li ste sigurni da želite da obrišete sve dnevnike prethodnih razgovora?" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Očisti sve" -#: ../libempathy-gtk/empathy-log-window.c:3758 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Obriši od:" #: ../libempathy-gtk/empathy-log-window.ui.h:1 -msgid "Loading..." -msgstr "Učitavam..." +msgid "_File" +msgstr "_Datoteka" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 -#: ../src/empathy-chat-window.ui.h:3 -msgid "Chat" -msgstr "Ćaskanje" +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:12 +msgid "_Edit" +msgstr "Izm_eni" -#: ../libempathy-gtk/empathy-log-window.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Delete All History..." msgstr "Obriši sav istorijat..." -#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "Profile" msgstr "Profil" -#: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:20 -msgid "Video" -msgstr "Video" +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:19 +msgid "Chat" +msgstr "Ćaskanje" #: ../libempathy-gtk/empathy-log-window.ui.h:7 -#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 -msgid "_Edit" -msgstr "Izm_eni" +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "Video" +msgstr "Video" #: ../libempathy-gtk/empathy-log-window.ui.h:8 -msgid "_File" -msgstr "_Datoteka" - -#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "strana 2" -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 -msgid "Contact ID:" -msgstr "IB prijatelja:" +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "Loading..." +msgstr "Učitavam..." + +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 +msgid "The contact is offline" +msgstr "Kontakt nije na vezi" -#. add chat button -#: ../libempathy-gtk/empathy-new-message-dialog.c:225 -msgid "C_hat" -msgstr "Ć_askaj" +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 +msgid "The specified contact is either invalid or unknown" +msgstr "Navedeni kontakt ili je neispravan ili nepoznat" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 +msgid "The contact does not support this kind of conversation" +msgstr "Kontakt ne podržava ovu vrstu razgovora" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 +msgid "The requested functionality is not implemented for this protocol" +msgstr "Zahtevana funkcionalnost nije primenjena za ovaj protokol" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 +msgid "Could not start a conversation with the given contact" +msgstr "Ne mogu da započnem razgovor sa datim kontaktom" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 +msgid "You are banned from this channel" +msgstr "Izbačeni ste sa ovog kanala" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 +msgid "This channel is full" +msgstr "Ovaj kanal je pun" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 +msgid "You must be invited to join this channel" +msgstr "Morate biti pozvani da se pridružite ovom kanalu" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 +msgid "Can't proceed while disconnected" +msgstr "Ne mogu da nastavim dok je veza prekinuta" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 +msgid "Permission denied" +msgstr "Zabranjen pristup" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 +msgid "There was an error starting the conversation" +msgstr "Došlo je do greške prilikom započinjanja razgovora" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 +msgid "Enter a contact identifier or phone number:" +msgstr "Unesite odrednik kontakta ili telefonski broj:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:244 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Novi razgovor" -#. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:204 -msgid "Send _Video" -msgstr "Pošalji _video" +#. add video button +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +msgid "_Video Call" +msgstr "_Video poziv" -#. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:215 -msgid "C_all" -msgstr "_Pozovi" +#. add audio button +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 +msgid "_Audio Call" +msgstr "_Audio poziv" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Novi poziv" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Nije uspelo potvrđivanje identiteta za nalog %s" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2602,12 +2583,8 @@ msgstr "Kliknite da postavite ovu poruku stanja kao omiljenu" msgid "Set status" msgstr "Postavi stanje" -#: ../libempathy-gtk/empathy-presence-chooser.c:943 -msgid "Set your presence and current status" -msgstr "Postavite vaše prisustvo i trenutno stanje" - #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1131 +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 msgid "Custom messages…" msgstr "Proizvoljne poruke…" @@ -2625,20 +2602,20 @@ msgid "Find:" msgstr "Traži:" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -msgid "Mat_ch case" -msgstr "_Uporedi veličinu slova" +msgid "_Previous" +msgstr "_Prethodno" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Phrase not found" -msgstr "Izraz nije pronađen" - -#: ../libempathy-gtk/empathy-search-bar.ui.h:4 msgid "_Next" msgstr "_Sledeće" +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "Mat_ch case" +msgstr "_Uporedi veličinu slova" + #: ../libempathy-gtk/empathy-search-bar.ui.h:5 -msgid "_Previous" -msgstr "_Prethodno" +msgid "Phrase not found" +msgstr "Izraz nije pronađen" #: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" @@ -2684,12 +2661,12 @@ msgstr "Poziv za razgovor je završen" msgid "Edit Custom Messages" msgstr "Uredi proizvoljne poruke" -#: ../libempathy-gtk/empathy-theme-adium.c:1036 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "Poruka je uređena %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1726 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "Normalno" @@ -2766,34 +2743,39 @@ msgid "Certificate hostname: %s" msgstr "Ime domaćina sertifikata: %s" #: ../libempathy-gtk/empathy-tls-dialog.c:281 -msgid "Continue" -msgstr "Nastavi" +#| msgid "Continue" +msgid "C_ontinue" +msgstr "_Nastavi" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "Nepoverljiva veza" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Ova veza nije od poverenja. Želite li ipak da nastavite?" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "Zapamti ovaj izbor za naredne veze" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "Detalji sertifikata" -#: ../libempathy-gtk/empathy-ui-utils.c:1735 +#: ../libempathy-gtk/empathy-ui-utils.c:1741 msgid "Unable to open URI" msgstr "Ne mogu da otvorim adresu" -#: ../libempathy-gtk/empathy-ui-utils.c:1831 +#: ../libempathy-gtk/empathy-ui-utils.c:1859 msgid "Select a file" msgstr "Izaberite datoteku" -#: ../libempathy-gtk/empathy-ui-utils.c:1903 +#: ../libempathy-gtk/empathy-ui-utils.c:1934 msgid "Insufficient free space to save file" msgstr "Nema dovoljno slobodnog mesta za čuvanje datoteke" -#: ../libempathy-gtk/empathy-ui-utils.c:1911 +#: ../libempathy-gtk/empathy-ui-utils.c:1942 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2802,7 +2784,7 @@ msgstr "" "Potrebno je %s za snimanje ove datoteke, ali je dostupno samo %s. Odaberite " "drugo mesto za snimanje." -#: ../libempathy-gtk/empathy-ui-utils.c:1955 +#: ../libempathy-gtk/empathy-ui-utils.c:1986 #, c-format msgid "Incoming file from %s" msgstr "Dolazeća datoteka od %s" @@ -2974,40 +2956,32 @@ msgstr "zapadni" msgid "Vietnamese" msgstr "vijetnamski" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 -msgid "The selected contact cannot receive files." -msgstr "Izabrani prijatelj ne može da primi datoteke." - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 -msgid "The selected contact is offline." -msgstr "Izabrani prijatelj nije na vezi." - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Nema poruka o greškama" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Brza poruka (Pismonoša)" -#: ../src/empathy.c:431 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Ne povezuj se po pokretanju" -#: ../src/empathy.c:435 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "" "Ne prikazuj spisak prijatelja niti bilo koje drugo prozorče po pokretanju" -#: ../src/empathy.c:450 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "— Internet pismonoša za brze poruke" -#: ../src/empathy.c:637 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Greška pri komunikaciji sa Upravnikom naloga" -#: ../src/empathy.c:639 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3055,11 +3029,11 @@ msgstr "" "adresu: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " "Boston, MA 02110-1301 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Gnomov program za brze poruke" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Danilo Šegan \n" @@ -3101,35 +3075,36 @@ msgstr "" "zatvorite pomoćnika i dodate naloge kasnije iz menija „Izmeni“." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1276 msgid "An error occurred" msgstr "Došlo je do greške" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Koji tip naloga za ćaskanje imate?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "Da li imate još neki nalog za ćaskanje koji želite da podesite?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Unesite detalje naloga" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Koji tip naloga za ćaskanje želite da napravite?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Da li želite da napravite još naloga za ćaskanje?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Unesite detalje novog naloga" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3141,42 +3116,42 @@ msgstr "" "programe za ćaskanje. Sa mikrofonom i kamerom takođe možete da obavljate i " "audio i video pozive." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "" "Da li imate nalog koji ste koristili sa nekim drugim programom za ćaskanje?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Da, uvezi detalje mog naloga iz " -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Da, ja ću sam uneti detalje naloga" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Ne, želim novi nalog" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Ne, za sada samo želim da vidim ljude u blizini" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Izaberite naloge koje želite da uvezete:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Da" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Ne, to je sve za sada" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3188,16 +3163,16 @@ msgstr "" "su detalji ispod tačni. Lako ih možete izmeniti kasnije ili isključiti ovu " "mogućnost iz prozorčeta „Nalozi“." -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 msgid "Edit->Accounts" msgstr "Izmeni->Nalozi" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "Za sada _ne želim da koristim ovu mogućnost" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1148 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3208,85 +3183,93 @@ msgstr "" "salut nije instaliran. Ako želite da omogućite ovo, instalirajte paket " "telepathy-salut i napravite nalog „Ljudi u okolini“ iz prozorčeta „Nalozi“." -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1154 msgid "telepathy-salut not installed" msgstr "telepathy-salut nije instaliran" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1200 msgid "Messaging and VoIP Accounts Assistant" msgstr "Asistent naloga za brze poruke i VoIP" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1234 msgid "Welcome to Empathy" msgstr "Dobrodošli u Internet Pismonošu" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1243 msgid "Import your existing accounts" msgstr "Uvezite vaše postojeće naloge" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1261 msgid "Please enter personal details" msgstr "Unesite lične podatke" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Postoje nesačuvane izmene na vašem nalogu %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:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Vaš novi nalog još nije sačuvan." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:754 -#: ../src/empathy-call-window.c:1216 +#: ../src/empathy-accounts-dialog.c:344 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1332 msgid "Connecting…" msgstr "Povezujem se…" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:385 #, c-format msgid "Offline — %s" msgstr "Nepovezan — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:397 #, c-format msgid "Disconnected — %s" msgstr "Veza je prekinuta — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:408 msgid "Offline — No Network Connection" msgstr "Nepovezan — Nema mrežne konekcije" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:415 msgid "Unknown Status" msgstr "Nepoznato stanje" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:427 msgid "Offline — Account Disabled" msgstr "Nepovezan — Nalog je onemogućen" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Ovim ćete napraviti novi nalog, zanemarivši unete izmene.\n" -"Da li sigurno želite da nastavite?" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "Uredite parametre povezivanja" + +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "Nisam uspeo da dovučem vaše lične podatke sa servera." + +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "Uspostavite vezu da uredite vaše lične podatke." -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "_Uredi parametre povezivanja..." + +#: ../src/empathy-accounts-dialog.c:1289 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Da li ste sigurni da želite da uklonite „%s“ sa vašeg računara?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1293 msgid "This will not remove your account on the server." msgstr "Ovo neće ukloniti vaš nalog na serveru." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1529 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3295,15 +3278,15 @@ msgstr "" "Da li sigurno želite da nastavite?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1705 msgid "_Enable" msgstr "_Omogući" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1706 msgid "_Disable" msgstr "O_nemogući" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2176 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3315,19 +3298,15 @@ msgstr "" msgid "Add…" msgstr "Dodaj…" -#: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Loading account information" -msgstr "Učitavam podatke o nalogu" - #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "No protocol installed" -msgstr "Nijedan protokol nije instaliran" +msgid "_Import…" +msgstr "_Uvezi…" #: ../src/empathy-accounts-dialog.ui.h:4 msgid "Protocol:" msgstr "Protokol:" -#: ../src/empathy-accounts-dialog.ui.h:6 +#: ../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." @@ -3335,15 +3314,19 @@ msgstr "" "Da dodate novi nalog, prvo morate da instalirate priključke za sve protokole " "koje želite da koristite." +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "Nijedan protokol nije instaliran" + #: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Import…" -msgstr "_Uvezi…" +msgid "Loading account information" +msgstr "Učitavam podatke o nalogu" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr " — Internet pismonoša klijent prijave" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Internet pismonoša klijent prijave" @@ -3351,132 +3334,120 @@ msgstr "Internet pismonoša klijent prijave" msgid "People nearby" msgstr "Ljudi u okolini" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:192 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:203 msgid "- Empathy Audio/Video Client" msgstr "— Internet pismonoša Audio/Video klijent" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:217 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:228 msgid "Empathy Audio/Video Client" msgstr "Internet pismonoša Audio/Video klijent" -#: ../src/empathy-streamed-media-window.c:431 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Kontrast" -#: ../src/empathy-streamed-media-window.c:434 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Osvetljenost" -#: ../src/empathy-streamed-media-window.c:437 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Gama" -#: ../src/empathy-streamed-media-window.c:542 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Jačina zvuka" -#: ../src/empathy-streamed-media-window.c:1110 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "_Bočna površ" -#: ../src/empathy-streamed-media-window.c:1130 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Zvučni ulaz" -#: ../src/empathy-streamed-media-window.c:1134 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Video ulaz" -#: ../src/empathy-streamed-media-window.c:1140 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Brojčanik" -#: ../src/empathy-streamed-media-window.c:1151 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Detalji" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1220 -#: ../src/empathy-call-window.c:1825 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1934 #, c-format msgid "Call with %s" msgstr "Poziv sa korisnikom %s" -#: ../src/empathy-streamed-media-window.c:1453 -#: ../src/empathy-call-window.c:2069 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2178 msgid "The IP address as seen by the machine" msgstr "IP adresa kako je vidi ovaj računar" -#: ../src/empathy-streamed-media-window.c:1455 -#: ../src/empathy-call-window.c:2071 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2180 msgid "The IP address as seen by a server on the Internet" msgstr "IP adresa kako je vidi server na internetu" -#: ../src/empathy-streamed-media-window.c:1457 -#: ../src/empathy-call-window.c:2073 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2182 msgid "The IP address of the peer as seen by the other side" msgstr "IP adresa vršnjaka kako je vidi druga strana" -#: ../src/empathy-streamed-media-window.c:1459 -#: ../src/empathy-call-window.c:2075 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2184 msgid "The IP address of a relay server" msgstr "IP adresa relejnog servera" -#: ../src/empathy-streamed-media-window.c:1461 -#: ../src/empathy-call-window.c:2077 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2186 msgid "The IP address of the multicast group" msgstr "IP adresa grupe za višestruko emitovanje" -#: ../src/empathy-streamed-media-window.c:1843 -msgctxt "encoding video codec" -msgid "Unknown" -msgstr "Nepoznato" - -#: ../src/empathy-streamed-media-window.c:1846 -msgctxt "encoding audio codec" -msgid "Unknown" -msgstr "Nepoznato" - -#: ../src/empathy-streamed-media-window.c:1849 -msgctxt "decoding video codec" -msgid "Unknown" -msgstr "Nepoznato" - -#: ../src/empathy-streamed-media-window.c:1852 -msgctxt "decoding audio codec" +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 +msgctxt "codec" msgid "Unknown" msgstr "Nepoznato" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2144 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "Povezan — %d:%02dm" -#: ../src/empathy-streamed-media-window.c:2205 -#: ../src/empathy-call-window.c:2846 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3040 msgid "Technical Details" msgstr "Tehnički detalji" -#: ../src/empathy-streamed-media-window.c:2243 -#: ../src/empathy-call-window.c:2884 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3079 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " "computer" msgstr "Program %s ne razume nijedan zvučni format koji podržava vaš računar" -#: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:2889 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3084 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " "computer" msgstr "Program %s ne razume nijedan video format koji podržava vaš računar" -#: ../src/empathy-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:2895 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3485,27 +3456,27 @@ msgstr "" "Ne mogu da uspostavim vezu sa %s. Možda je neko od vas dvoje na mreži koja " "ne dozvoljava direktne veze." -#: ../src/empathy-streamed-media-window.c:2260 -#: ../src/empathy-call-window.c:2901 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3096 msgid "There was a failure on the network" msgstr "Došlo je do greške u mreži" -#: ../src/empathy-streamed-media-window.c:2264 -#: ../src/empathy-call-window.c:2905 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3100 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "Zvučni formati potrebni za ovaj poziv nisu instalirani na vašem računaru" -#: ../src/empathy-streamed-media-window.c:2267 -#: ../src/empathy-call-window.c:2908 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3103 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Video formati potrebni za ovaj poziv nisu instalirani na vašem računaru" -#: ../src/empathy-streamed-media-window.c:2277 -#: ../src/empathy-call-window.c:2920 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3115 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please ovu grešku i prikačite dnevnike pokupljene iz prozora „Otklanjanje " "grešaka“ u meniju „Pomoć“." -#: ../src/empathy-streamed-media-window.c:2285 -#: ../src/empathy-call-window.c:2929 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3124 msgid "There was a failure in the call engine" msgstr "Došlo je do greške u motoru za pozive" -#: ../src/empathy-streamed-media-window.c:2288 -#: ../src/empathy-call-window.c:2932 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3127 msgid "The end of the stream was reached" msgstr "Dostignut je kraj toka" -#: ../src/empathy-streamed-media-window.c:2328 -#: ../src/empathy-call-window.c:2972 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3167 msgid "Can't establish audio stream" msgstr "Ne mogu da uspostavim zvučni tok" -#: ../src/empathy-streamed-media-window.c:2338 -#: ../src/empathy-call-window.c:2982 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3177 msgid "Can't establish video stream" msgstr "Ne mogu da uspostavim video tok" -#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2 +#: ../src/empathy-call-window.ui.h:1 #: ../src/empathy-streamed-media-window.ui.h:1 -msgid "Audio" -msgstr "Audio" +msgid "_Call" +msgstr "_Pozovi" #: ../src/empathy-call-window.ui.h:3 -#: ../src/empathy-streamed-media-window.ui.h:5 -msgid "Decoding Codec:" -msgstr "Kodek za dekodiranje:" +msgid "_Microphone" +msgstr "Mi_krofon" #: ../src/empathy-call-window.ui.h:4 -msgid "Disable camera" -msgstr "Isključite kamericu" +msgid "_Camera" +msgstr "_Kamerica" #: ../src/empathy-call-window.ui.h:5 -msgid "Display the dialpad" -msgstr "Prikažite brojčanik" +msgid "_Settings" +msgstr "Po_dešavanja" #: ../src/empathy-call-window.ui.h:6 -#: ../src/empathy-streamed-media-window.ui.h:9 -msgid "Encoding Codec:" -msgstr "Kodek za kodiranje:" +#: ../src/empathy-roster-window-menubar.ui.h:17 +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "_View" +msgstr "Pre_gled" -#: ../src/empathy-call-window.ui.h:7 -#: ../src/empathy-streamed-media-window.ui.h:10 -msgid "Hang up" -msgstr "Prekini" +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:27 +msgid "_Help" +msgstr "Po_moć" -#: ../src/empathy-call-window.ui.h:8 -#: ../src/empathy-streamed-media-window.ui.h:11 -msgid "Hang up current call" -msgstr "Prekinite trenutni poziv" +#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:28 +msgid "_Contents" +msgstr "_Sadržaj" #: ../src/empathy-call-window.ui.h:9 -#: ../src/empathy-streamed-media-window.ui.h:12 -msgid "Local Candidate:" -msgstr "Lokalni kandidat:" +#: ../src/empathy-roster-window-menubar.ui.h:29 +msgid "_Debug" +msgstr "Otklanjanje _grešaka" #: ../src/empathy-call-window.ui.h:10 -msgid "Maximise me" -msgstr "Uvećaj me" +msgid "Swap camera" +msgstr "Razmeni kameru" #: ../src/empathy-call-window.ui.h:11 msgid "Minimise me" msgstr "Umanji me" #: ../src/empathy-call-window.ui.h:12 -#: ../src/empathy-streamed-media-window.ui.h:15 -msgid "Remote Candidate:" -msgstr "Udaljeni kandidat:" +msgid "Maximise me" +msgstr "Uvećaj me" #: ../src/empathy-call-window.ui.h:13 -#: ../src/empathy-streamed-media-window.ui.h:16 -msgid "Send Audio" -msgstr "Pošalji zvuk" +msgid "Disable camera" +msgstr "Isključite kamericu" #: ../src/empathy-call-window.ui.h:14 -msgid "Send Video" -msgstr "Pošalji video" +#: ../src/empathy-streamed-media-window.ui.h:2 +msgid "Hang up" +msgstr "Prekini" #: ../src/empathy-call-window.ui.h:15 -msgid "Show dialpad" -msgstr "Prikaži brojčanik" +#: ../src/empathy-streamed-media-window.ui.h:9 +msgid "Hang up current call" +msgstr "Prekinite trenutni poziv" #: ../src/empathy-call-window.ui.h:16 +msgid "Video call" +msgstr "Video poziv" + +#: ../src/empathy-call-window.ui.h:17 msgid "Start a video call" msgstr "Započnite video poziv" -#: ../src/empathy-call-window.ui.h:17 +#: ../src/empathy-call-window.ui.h:19 msgid "Start an audio call" msgstr "Započnite audio poziv" -#: ../src/empathy-call-window.ui.h:18 -msgid "Swap camera" -msgstr "Razmeni kameru" +#: ../src/empathy-call-window.ui.h:20 +msgid "Show dialpad" +msgstr "Prikaži brojčanik" -#: ../src/empathy-call-window.ui.h:19 -#: ../src/empathy-streamed-media-window.ui.h:17 -msgid "Toggle audio transmission" -msgstr "Uključi/isključi prenos zvuka" +#: ../src/empathy-call-window.ui.h:21 +msgid "Display the dialpad" +msgstr "Prikažite brojčanik" -#: ../src/empathy-call-window.ui.h:20 +#: ../src/empathy-call-window.ui.h:22 +msgid "Send Video" +msgstr "Pošalji video" + +#: ../src/empathy-call-window.ui.h:23 msgid "Toggle video transmission" msgstr "Uključi/isključi prenos videa" -#: ../src/empathy-call-window.ui.h:21 -#: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477 -#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479 +#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Send Audio" +msgstr "Pošalji zvuk" + +#: ../src/empathy-call-window.ui.h:25 +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Toggle audio transmission" +msgstr "Uključi/isključi prenos zvuka" + +#: ../src/empathy-call-window.ui.h:27 +#: ../src/empathy-streamed-media-window.ui.h:20 +msgid "Encoding Codec:" +msgstr "Kodek za kodiranje:" + +#: ../src/empathy-call-window.ui.h:28 +#: ../src/empathy-streamed-media-window.ui.h:21 +#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588 +#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590 msgid "Unknown" msgstr "Nepoznato" -#: ../src/empathy-call-window.ui.h:23 -msgid "Video call" -msgstr "Video poziv" +#: ../src/empathy-call-window.ui.h:29 +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Decoding Codec:" +msgstr "Kodek za dekodiranje:" -#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-call-window.ui.h:30 +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Remote Candidate:" +msgstr "Udaljeni kandidat:" + +#: ../src/empathy-call-window.ui.h:31 #: ../src/empathy-streamed-media-window.ui.h:24 -msgid "_Call" -msgstr "_Pozovi" +msgid "Local Candidate:" +msgstr "Lokalni kandidat:" -#: ../src/empathy-call-window.ui.h:25 -msgid "_Camera" -msgstr "_Kamerica" +#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:25 +msgid "Audio" +msgstr "Audio" -#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 -msgid "_Contents" -msgstr "_Sadržaj" +#: ../src/empathy-chat-window.c:285 +msgid "Close this window?" +msgstr "Da zatvorim ovaj prozor?" -#: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 -msgid "_Debug" -msgstr "Otklanjanje _grešaka" +#: ../src/empathy-chat-window.c:290 +#, c-format +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "" +"Zatvaranjem ovog prozora biće napušteno %s. Nećete primati nikakve buduće " +"poruke sve dok se ponovo ne pridružite." -#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 -msgid "_Help" -msgstr "Po_moć" +#: ../src/empathy-chat-window.c:301 +#, 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] "" +"Zatvaranjem ovog prozora biće napuštena %u soba za ćaskanje. Nećete primati " +"nikakve buduće poruke sve dok se ponovo ne pridružite." +msgstr[1] "" +"Zatvaranjem ovog prozora biće napuštene %u sobe za ćaskanje. Nećete primati " +"nikakve buduće poruke sve dok se ponovo ne pridružite." +msgstr[2] "" +"Zatvaranjem ovog prozora biće napušteno %u soba za ćaskanje. Nećete primati " +"nikakve buduće poruke sve dok se ponovo ne pridružite." +msgstr[3] "" +"Zatvaranjem ovog prozora biće napuštena jedna soba za ćaskanje. Nećete primati " +"nikakve buduće poruke sve dok se ponovo ne pridružite." + +#: ../src/empathy-chat-window.c:310 +#, c-format +msgid "Leave %s?" +msgstr "Da napustim %s?" -#: ../src/empathy-call-window.ui.h:30 -msgid "_Microphone" -msgstr "Mi_krofon" +#: ../src/empathy-chat-window.c:311 +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "" +"Nećete primati nikakve buduće poruke iz ove sobe za ćaskanje sve dok joj se " +"ponovo ne pridružite." -#: ../src/empathy-call-window.ui.h:31 -msgid "_Settings" -msgstr "Po_dešavanja" +#: ../src/empathy-chat-window.c:330 +msgid "Close window" +msgstr "Zatvori prozor" -#: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 -#: ../src/empathy-streamed-media-window.ui.h:25 -msgid "_View" -msgstr "Pre_gled" +#: ../src/empathy-chat-window.c:330 +msgid "Leave room" +msgstr "Napusti sobu" -#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 +#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -3679,7 +3705,7 @@ msgstr[1] "%s (%d nepročitane)" msgstr[2] "%s (%d nepročitanih)" msgstr[3] "%s (jedna nepročitana)" -#: ../src/empathy-chat-window.c:493 +#: ../src/empathy-chat-window.c:648 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -3688,7 +3714,7 @@ msgstr[1] "%s (i %u druge)" msgstr[2] "%s (i %u drugih)" msgstr[3] "%s (i jedna druga)" -#: ../src/empathy-chat-window.c:509 +#: ../src/empathy-chat-window.c:664 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -3697,7 +3723,7 @@ msgstr[1] "%s (%d nepročitane od ostalih)" msgstr[2] "%s (%d nepročitanih od ostalih)" msgstr[3] "%s (jedna nepročitana od ostalih)" -#: ../src/empathy-chat-window.c:518 +#: ../src/empathy-chat-window.c:673 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -3706,11 +3732,11 @@ msgstr[1] "%s (%d nepročitane od svih)" msgstr[2] "%s (%d nepročitanih od svih)" msgstr[3] "%s (jedna nepročitana od svih)" -#: ../src/empathy-chat-window.c:733 +#: ../src/empathy-chat-window.c:888 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:743 +#: ../src/empathy-chat-window.c:898 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3719,69 +3745,69 @@ msgstr[1] "Šaljem %d poruke." msgstr[2] "Šaljem %d poruka." msgstr[3] "Šaljem jednu poruku" -#: ../src/empathy-chat-window.c:765 +#: ../src/empathy-chat-window.c:920 msgid "Typing a message." msgstr "Piše poruku." #: ../src/empathy-chat-window.ui.h:1 -msgid "C_lear" -msgstr "_Očisti" +msgid "_Conversation" +msgstr "_Razgovor" #: ../src/empathy-chat-window.ui.h:2 -msgid "C_ontact" -msgstr "_Prijatelj" +msgid "C_lear" +msgstr "_Očisti" -#: ../src/empathy-chat-window.ui.h:4 +#: ../src/empathy-chat-window.ui.h:3 msgid "Insert _Smiley" msgstr "Ubaci _smešak" +#: ../src/empathy-chat-window.ui.h:4 +msgid "_Favorite Chat Room" +msgstr "Omiljena soba za _ćaskanje" + #: ../src/empathy-chat-window.ui.h:5 -msgid "Invite _Participant…" -msgstr "Pozovi _učesnike…" +msgid "Notify for All Messages" +msgstr "Obavesti za sve poruke" -#: ../src/empathy-chat-window.ui.h:6 -msgid "Move Tab _Left" -msgstr "Premesti jezičak _levo" +#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1 +msgid "_Show Contact List" +msgstr "Prikaži _spisak prijatelja" #: ../src/empathy-chat-window.ui.h:7 -msgid "Move Tab _Right" -msgstr "Premesti jezičak _desno" +msgid "Invite _Participant…" +msgstr "Pozovi _učesnike…" #: ../src/empathy-chat-window.ui.h:8 -msgid "Notify for All Messages" -msgstr "Obavesti za sve poruke" +msgid "C_ontact" +msgstr "_Prijatelj" #: ../src/empathy-chat-window.ui.h:10 -msgid "_Conversation" -msgstr "_Razgovor" +msgid "_Tabs" +msgstr "_Listovi" #: ../src/empathy-chat-window.ui.h:11 -msgid "_Detach Tab" -msgstr "_Otkači list" - -#: ../src/empathy-chat-window.ui.h:13 -msgid "_Favorite Chat Room" -msgstr "Omiljena soba za _ćaskanje" +msgid "_Previous Tab" +msgstr "_Prethodni list" -#: ../src/empathy-chat-window.ui.h:15 +#: ../src/empathy-chat-window.ui.h:12 msgid "_Next Tab" msgstr "_Sledeći list" -#: ../src/empathy-chat-window.ui.h:16 -msgid "_Previous Tab" -msgstr "_Prethodni list" +#: ../src/empathy-chat-window.ui.h:13 +msgid "_Undo Close Tab" +msgstr "_Opozovi zatvaranje jezička" -#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5 -msgid "_Show Contact List" -msgstr "Prikaži _spisak prijatelja" +#: ../src/empathy-chat-window.ui.h:14 +msgid "Move Tab _Left" +msgstr "Premesti jezičak _levo" -#: ../src/empathy-chat-window.ui.h:18 -msgid "_Tabs" -msgstr "_Listovi" +#: ../src/empathy-chat-window.ui.h:15 +msgid "Move Tab _Right" +msgstr "Premesti jezičak _desno" -#: ../src/empathy-chat-window.ui.h:19 -msgid "_Undo Close Tab" -msgstr "_Opozovi zatvaranje jezička" +#: ../src/empathy-chat-window.ui.h:16 +msgid "_Detach Tab" +msgstr "_Otkači list" #: ../src/empathy-chatrooms-window.c:251 msgid "Name" @@ -3795,100 +3821,100 @@ msgstr "Soba" msgid "Auto-Connect" msgstr "Automatsko povezivanje" -#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-chatrooms-window.ui.h:1 msgid "Manage Favorite Rooms" msgstr "Uredi omiljene sobe" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Dolazni video poziv" -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562 msgid "Incoming call" msgstr "Dolazni poziv" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s vas zove video pozivom. Želite li da se javite?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s vas zove. Želite li da se javite?" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568 #, c-format msgid "Incoming call from %s" msgstr "Dolazni poziv od %s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "_Odbaci" -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_Javi se" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "Odgovori sa _videom" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1455 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1568 #, c-format msgid "Incoming video call from %s" msgstr "Dolazni video poziv od %s" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Pozivnice za sobu" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Pozivnica da se pridružite u %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s vas poziva da se pridružite %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_Odbij" -#: ../src/empathy-event-manager.c:858 -#: ../src/empathy-new-chatroom-dialog.ui.h:7 +#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "_Join" msgstr "_Priključi se" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s vas poziva da se pridružite %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "Pozvani ste da se pridružite u %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Dolazni prenos datoteke od %s" -#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372 msgid "Password required" msgstr "Zahtevana je lozinka" -#: ../src/empathy-event-manager.c:1190 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s traži odobrenje da vidi kada ste na vezi" -#: ../src/empathy-event-manager.c:1194 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3898,105 +3924,105 @@ msgstr "" "Poruka: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Nepoznato" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s od %s pri %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, 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:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Primam „%s“ od %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Šaljem „%s“ za %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Greška pri primanju „%s“ od %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Greška pri primanju datoteke" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Greška pri slanju „%s“ za %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Greška pri slanju datoteke" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "„%s“ je primljen od %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr " „%s“ je poslat za %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Prenos datoteke je završen" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Čekam na odgovor druge strane" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Proveravam integritet datoteke „%s“" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Tražim heš datoteke „%s“" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Datoteka" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Preostalo" @@ -4021,166 +4047,193 @@ msgid "Import Accounts" msgstr "Uvezite naloge" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "Uvezi" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Protokol" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Izvor" -#: ../src/empathy-main-window.c:392 +#: ../src/empathy-roster-window.c:389 msgid "Provide Password" msgstr "Unesite lozinku" -#: ../src/empathy-main-window.c:398 +#: ../src/empathy-roster-window.c:395 msgid "Disconnect" msgstr "Veza je prekinuta" -#: ../src/empathy-main-window.c:622 +#: ../src/empathy-roster-window.c:644 +msgid "You need to setup an account to see contacts here." +msgstr "Morate da podesite nalog da biste ovde videli kontakte." + +#: ../src/empathy-roster-window.c:660 msgid "No match found" msgstr "Nema poklapanja" -#: ../src/empathy-main-window.c:777 +#: ../src/empathy-roster-window.c:765 +#, c-format +msgid "Sorry, %s accounts can’t be used until your %s software is updated." +msgstr "" +"Izvinite, %s nalozi ne mogu biti korišćeni sve dok ne ažurirate vaš %s " +"softver." + +#: ../src/empathy-roster-window.c:831 +msgid "Update software..." +msgstr "Ažuriraj softver..." + +#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954 +msgid "Close" +msgstr "Zatvori" + +#: ../src/empathy-roster-window.c:942 msgid "Reconnect" msgstr "Ponovo se poveži" -#: ../src/empathy-main-window.c:783 +#: ../src/empathy-roster-window.c:948 msgid "Edit Account" msgstr "Izmeni nalog" -#: ../src/empathy-main-window.c:789 -msgid "Close" -msgstr "Zatvori" - #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:928 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1092 #, c-format msgid "Top up %s (%s)..." msgstr "Dopuni %s (%s)..." -#: ../src/empathy-main-window.c:975 +#: ../src/empathy-roster-window.c:1138 msgid "Top up account credit" msgstr "Dopunite kredit naloga" #. top up button -#: ../src/empathy-main-window.c:1046 +#: ../src/empathy-roster-window.c:1210 msgid "Top Up..." msgstr "Dopuni..." -#: ../src/empathy-main-window.c:1789 +#: ../src/empathy-roster-window.c:1933 msgid "Contact" msgstr "Prijatelj" -#: ../src/empathy-main-window.c:2121 +#: ../src/empathy-roster-window.c:2131 +msgid "You need to enable one of your accounts to see contacts here." +msgstr "" +"Morate da uključite jedan od vaših naloga da biste ovde videli kontakte." + +#. translators: argument is an account name +#: ../src/empathy-roster-window.c:2139 +#, c-format +msgid "You need to enable %s to see contacts here." +msgstr "Morate da uključite %s da biste ovde videli kontakte." + +#: ../src/empathy-roster-window.c:2419 msgid "Contact List" msgstr "Spisak prijatelja" -#: ../src/empathy-main-window-menubar.ui.h:1 -msgid "Contacts on a _Map" -msgstr "Prijatelji na _mapi" +#: ../src/empathy-roster-window.ui.h:1 +msgid "Account settings" +msgstr "Podešavanja naloga" -#: ../src/empathy-main-window-menubar.ui.h:2 -msgid "Credit Balance" -msgstr "Iznos gotovine" +#: ../src/empathy-roster-window-menubar.ui.h:2 +#: ../src/empathy-status-icon.ui.h:2 +msgid "_New Conversation…" +msgstr "_Novi razgovor…" -#: ../src/empathy-main-window-menubar.ui.h:3 -msgid "Find in Contact _List" -msgstr "Pronađi u _spisku prijatelja" +#: ../src/empathy-roster-window-menubar.ui.h:3 +#: ../src/empathy-status-icon.ui.h:3 +msgid "New _Call…" +msgstr "Novi _poziv…" -#: ../src/empathy-main-window-menubar.ui.h:4 -msgid "Join _Favorites" -msgstr "Pridruži se _omiljenim" +#: ../src/empathy-roster-window-menubar.ui.h:6 +msgid "_Search for Contacts…" +msgstr "_Traži prijatelje…" -#: ../src/empathy-main-window-menubar.ui.h:5 -msgid "Manage Favorites" -msgstr "Uredi omiljene" +#: ../src/empathy-roster-window-menubar.ui.h:7 +msgid "_File Transfers" +msgstr "Prenosi _datoteka" -#: ../src/empathy-main-window-menubar.ui.h:6 -msgid "N_ormal Size" -msgstr "N_ormalna veličina" +#: ../src/empathy-roster-window-menubar.ui.h:8 +msgid "_Offline Contacts" +msgstr "Nep_ovezani prijatelji" -#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 -msgid "New _Call…" -msgstr "Novi _poziv…" +#: ../src/empathy-roster-window-menubar.ui.h:9 +msgid "Show P_rotocols" +msgstr "Prikaži _protokole" -#: ../src/empathy-main-window-menubar.ui.h:8 -msgid "Normal Size With _Avatars" -msgstr "Normalna veličina sa _avatarima" +#: ../src/empathy-roster-window-menubar.ui.h:10 +msgid "Credit Balance" +msgstr "Iznos gotovine" + +#: ../src/empathy-roster-window-menubar.ui.h:11 +msgid "Contacts on a _Map" +msgstr "Prijatelji na _mapi" + +#: ../src/empathy-roster-window-menubar.ui.h:13 +msgid "_Accounts" +msgstr "N_alozi" + +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Blocked Contacts" +msgstr "_Blokirani prijatelji" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "P_references" msgstr "_Postavke" -#: ../src/empathy-main-window-menubar.ui.h:10 -msgid "Show P_rotocols" -msgstr "Prikaži _protokole" +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "Find in Contact _List" +msgstr "Pronađi u _spisku prijatelja" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "Sort by _Name" msgstr "Poređaj prema _imenu" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "Sort by _Status" msgstr "Poređaj prema _stanju" -#: ../src/empathy-main-window-menubar.ui.h:13 -msgid "_Accounts" -msgstr "N_alozi" +#: ../src/empathy-roster-window-menubar.ui.h:20 +msgid "Normal Size With _Avatars" +msgstr "Normalna veličina sa _avatarima" -#: ../src/empathy-main-window-menubar.ui.h:15 -msgid "_Blocked Contacts" -msgstr "_Blokirani prijatelji" +#: ../src/empathy-roster-window-menubar.ui.h:21 +msgid "N_ormal Size" +msgstr "N_ormalna veličina" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Compact Size" msgstr "_Kompaktna veličina" -#: ../src/empathy-main-window-menubar.ui.h:21 -msgid "_File Transfers" -msgstr "Prenosi _datoteka" +#: ../src/empathy-roster-window-menubar.ui.h:23 +msgid "_Room" +msgstr "_Soba" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:24 msgid "_Join…" msgstr "_Priključi se…" -#: ../src/empathy-main-window-menubar.ui.h:24 -#: ../src/empathy-status-icon.ui.h:3 -msgid "_New Conversation…" -msgstr "_Novi razgovor…" - -#: ../src/empathy-main-window-menubar.ui.h:25 -msgid "_Offline Contacts" -msgstr "Nep_ovezani prijatelji" - -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "Lični _podaci" - -#: ../src/empathy-main-window-menubar.ui.h:28 -msgid "_Room" -msgstr "_Soba" +#: ../src/empathy-roster-window-menubar.ui.h:25 +msgid "Join _Favorites" +msgstr "Pridruži se _omiljenim" -#: ../src/empathy-main-window-menubar.ui.h:29 -msgid "_Search for Contacts…" -msgstr "_Traži prijatelje…" +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "Manage Favorites" +msgstr "Uredi omiljene" -#: ../src/empathy-new-chatroom-dialog.c:337 +#: ../src/empathy-new-chatroom-dialog.c:369 msgid "Chat Room" msgstr "Soba za ćaskanje" -#: ../src/empathy-new-chatroom-dialog.c:353 +#: ../src/empathy-new-chatroom-dialog.c:385 msgid "Members" msgstr "Članovi" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:553 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4193,22 +4246,22 @@ msgstr "" "Potrebna lozinka: %s\n" "Članovi: %s" -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "Ne" -#: ../src/empathy-new-chatroom-dialog.c:584 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "Ne mogu da pokrenem listanje spiska soba" -#: ../src/empathy-new-chatroom-dialog.c:594 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "Ne mogu da zaustavim listanje spiska soba" -#: ../src/empathy-new-chatroom-dialog.ui.h:2 -msgid "Couldn't load room list" -msgstr "Ne mogu da učitam spisak soba" +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Join Room" +msgstr "Pridruži se sobi" #: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "" @@ -4217,6 +4270,10 @@ msgstr "" "Ovde unesite ime sobe za pridruživanje ili kliknite na neku od soba na spisku." #: ../src/empathy-new-chatroom-dialog.ui.h:4 +msgid "_Room:" +msgstr "_Soba:" + +#: ../src/empathy-new-chatroom-dialog.ui.h:5 msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" @@ -4224,313 +4281,313 @@ msgstr "" "Unesite server koji ugošćava sobe, ili ostavite prazno ako su sobe na " "serveru na kojem vam je nalog" -#: ../src/empathy-new-chatroom-dialog.ui.h:5 -msgid "Join Room" -msgstr "Pridruži se sobi" +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "Couldn't load room list" +msgstr "Ne mogu da učitam spisak soba" -#: ../src/empathy-new-chatroom-dialog.ui.h:6 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 msgid "Room List" msgstr "Spisak soba" -#: ../src/empathy-new-chatroom-dialog.ui.h:8 -msgid "_Room:" -msgstr "_Soba:" - -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Poruka je primljena" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Poruka je poslata" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Novi razgovor" -#: ../src/empathy-preferences.c:172 -msgid "Contact goes online" +#: ../src/empathy-preferences.c:169 +msgid "Contact comes online" msgstr "Prijatelj se prijavio" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "Prijatelj se odjavio" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Nalog je na vezi" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Nalog nije na vezi" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Jezik" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:726 msgid "Juliet" msgstr "Paja" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:733 msgid "Romeo" msgstr "Jare" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:739 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Jao, kume, gotov sam!! Ja sam bivši čovek!!!" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:743 msgid "Deny thy father and refuse thy name;" msgstr "Pajo, šta je bilo, Pajooo??" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:746 msgid "Or if thou wilt not, be but sworn my love" msgstr "Kako šta je bilo?? Nema je više, ukrali su mi je!!" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:749 msgid "And I'll no longer be a Capulet." msgstr "Šta su ti ukrali, Pajo?? Štaaaa??" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:752 msgid "Shall I hear more, or shall I speak at this?" msgstr "Kako šta?? Ama lađu, ukrali su mi lađu!! Jao meni!!!" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" msgstr "Sav očajan, Paja je prekinuo vezu." -#: ../src/empathy-preferences.c:1166 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "Postavke" #: ../src/empathy-preferences.ui.h:1 +msgid "Show _smileys as images" +msgstr "Prikaži slike _smešaka" + +#: ../src/empathy-preferences.ui.h:2 +msgid "Show contact _list in rooms" +msgstr "Prikaži spisak _prijatelja u sobama" + +#: ../src/empathy-preferences.ui.h:3 msgid "Appearance" msgstr "Izgled" -#: ../src/empathy-preferences.ui.h:3 -msgid "Behavior" -msgstr "Ponašanje" +#: ../src/empathy-preferences.ui.h:4 +msgid "Start chats in:" +msgstr "Započni ćaskanja u:" #: ../src/empathy-preferences.ui.h:5 -msgid "Chat Th_eme:" -msgstr "_Tema ćaskanja:" +msgid "new ta_bs" +msgstr "novim _jezičcima" #: ../src/empathy-preferences.ui.h:6 -msgid "Disable notifications when _away or busy" -msgstr "Isključi obaveštenja kada sam _odsutan ili zauzet" +msgid "new _windows" +msgstr "novim _prozorima" #: ../src/empathy-preferences.ui.h:7 -msgid "Disable sounds when _away or busy" -msgstr "Isključi zvuke kada sam _odsutan ili zauzet" - -#: ../src/empathy-preferences.ui.h:8 msgid "Display incoming events in the notification area" msgstr "Prikaži dolazne događaje u obaveštajnoj zoni" +#: ../src/empathy-preferences.ui.h:8 +msgid "_Automatically connect on startup" +msgstr "_Sam se poveži nakon pokretanja" + #: ../src/empathy-preferences.ui.h:9 -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 "" -"Uklanjanje odjeka čini da vaš glas drugoj osobi zvuči jasnije, ali može da " -"izazove probleme na nekim računarima. Ako vi ili vaš sagovornik čujete čudne " -"šumove ili krčanje za vreme poziva, pokušajte da isključite uklanjanje odjeka i " -"ponovo pokrenite poziv." +msgid "Log conversations" +msgstr "Zabeleži razgovore" #: ../src/empathy-preferences.ui.h:10 -msgid "Enable notifications when a contact comes online" -msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu" +msgid "Behavior" +msgstr "Ponašanje" #: ../src/empathy-preferences.ui.h:11 -msgid "Enable notifications when a contact goes offline" -msgstr "Omogući obaveštenja kada prijatelj ode sa mreže" +msgid "General" +msgstr "Opšte" #: ../src/empathy-preferences.ui.h:12 -msgid "Enable notifications when the _chat is not focused" -msgstr "Omogući obaveštenja kada _ćaskanja nisu u fokusu" +msgid "_Enable bubble notifications" +msgstr "_Omogući obaveštenja u oblačićima" #: ../src/empathy-preferences.ui.h:13 -msgid "Enable spell checking for languages:" -msgstr "Omogući proveru pravopisa za sledeće jezike:" +msgid "Disable notifications when _away or busy" +msgstr "Isključi obaveštenja kada sam _odsutan ili zauzet" #: ../src/empathy-preferences.ui.h:14 -msgid "General" -msgstr "Opšte" +msgid "Enable notifications when the _chat is not focused" +msgstr "Omogući obaveštenja kada _ćaskanja nisu u fokusu" #: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "Ulazni nivo:" +msgid "Enable notifications when a contact comes online" +msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu" #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "Jačina ulaznog zvuka:" +msgid "Enable notifications when a contact goes offline" +msgstr "Omogući obaveštenja kada prijatelj ode sa mreže" + +#: ../src/empathy-preferences.ui.h:17 +msgid "Notifications" +msgstr "Obaveštenja" #: ../src/empathy-preferences.ui.h:18 -msgid "Location sources:" -msgstr "Izvori lokacija:" +msgid "_Enable sound notifications" +msgstr "Omogući _zvučna obaveštenja" #: ../src/empathy-preferences.ui.h:19 -msgid "Log conversations" -msgstr "Zabeleži razgovore" +msgid "Disable sounds when _away or busy" +msgstr "Isključi zvuke kada sam _odsutan ili zauzet" #: ../src/empathy-preferences.ui.h:20 -msgid "Notifications" -msgstr "Obaveštenja" - -#: ../src/empathy-preferences.ui.h:21 msgid "Play sound for events" msgstr "Pusti zvuk za događaje" +#: ../src/empathy-preferences.ui.h:21 +msgid "Sounds" +msgstr "Zvuci" + #: ../src/empathy-preferences.ui.h:22 -msgid "Privacy" -msgstr "Privatnost" +msgid "Use _echo cancellation to improve call quality" +msgstr "Koristi uklanjanje _odjeka da poboljšaš kvalitet poziva" #: ../src/empathy-preferences.ui.h:23 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." +"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 "" -"Umanjena tačnost lokacije znači da će najtačniji objavljeni podaci o vašoj " -"lokaciji biti grad i država. GPS koordinate će biti tačne do 1. decimale." - -#: ../src/empathy-preferences.ui.h:24 -msgid "Show _smileys as images" -msgstr "Prikaži slike _smešaka" - -#: ../src/empathy-preferences.ui.h:25 -msgid "Show contact _list in rooms" -msgstr "Prikaži spisak _prijatelja u sobama" +"Uklanjanje odjeka čini da vaš glas drugoj osobi zvuči jasnije, ali može da " +"izazove probleme na nekim računarima. Ako vi ili vaš sagovornik čujete čudne " +"šumove ili krčanje za vreme poziva, pokušajte da isključite uklanjanje odjeka i " +"ponovo pokrenite poziv." #: ../src/empathy-preferences.ui.h:26 -msgid "Sounds" -msgstr "Zvuci" +msgid "_Publish location to my contacts" +msgstr "Objavi lokaciju mojim _prijateljima" #: ../src/empathy-preferences.ui.h:27 -msgid "Spell Checking" -msgstr "Provera pisanja" - -#: ../src/empathy-preferences.ui.h:28 msgid "" -"The list of languages reflects only the languages for which you have a " -"dictionary installed." +"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 "" -"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane " -"rečnike." +"Umanjena tačnost lokacije znači da će najtačniji objavljeni podaci o vašoj " +"lokaciji biti grad i država. GPS koordinate će biti tačne do 1. decimale." +#. 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:29 -msgid "Themes" -msgstr "Teme" +msgid "_Reduce location accuracy" +msgstr "Umanji _tačnost lokacije" #: ../src/empathy-preferences.ui.h:30 -msgid "Variant:" -msgstr "Varijanta:" +msgid "Privacy" +msgstr "Privatnost" #: ../src/empathy-preferences.ui.h:31 -msgid "_Automatically connect on startup" -msgstr "_Sam se poveži nakon pokretanja" +msgid "_GPS" +msgstr "_GPS" #: ../src/empathy-preferences.ui.h:32 msgid "_Cellphone" msgstr "_Mobilni telefon" #: ../src/empathy-preferences.ui.h:33 -msgid "_Enable bubble notifications" -msgstr "_Omogući obaveštenja u oblačićima" +msgid "_Network (IP, Wi-Fi)" +msgstr "_Mreža (IP, bežična)" #: ../src/empathy-preferences.ui.h:34 -msgid "_Enable sound notifications" -msgstr "Omogući _zvučna obaveštenja" - -#: ../src/empathy-preferences.ui.h:35 -msgid "_GPS" -msgstr "_GPS" +msgid "Location sources:" +msgstr "Izvori lokacija:" #: ../src/empathy-preferences.ui.h:36 -msgid "_Network (IP, Wi-Fi)" -msgstr "_Mreža (IP, bežična)" +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "" +"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane " +"rečnike." #: ../src/empathy-preferences.ui.h:37 -msgid "_Open new chats in separate windows" -msgstr "_Otvaraj ćaskanja u novim prozorima" +msgid "Enable spell checking for languages:" +msgstr "Omogući proveru pravopisa za sledeće jezike:" #: ../src/empathy-preferences.ui.h:38 -msgid "_Publish location to my contacts" -msgstr "Objavi lokaciju mojim _prijateljima" +msgid "Spell Checking" +msgstr "Provera pisanja" + +#: ../src/empathy-preferences.ui.h:39 +msgid "Chat Th_eme:" +msgstr "_Tema ćaskanja:" -#. 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:40 -msgid "_Reduce location accuracy" -msgstr "Umanji _tačnost lokacije" +msgid "Variant:" +msgstr "Varijanta:" -#: ../src/empathy-status-icon.ui.h:2 +#: ../src/empathy-preferences.ui.h:41 +msgid "Themes" +msgstr "Teme" + +#: ../src/empathy-status-icon.ui.h:4 msgid "Status" msgstr "Stanje" -#: ../src/empathy-status-icon.ui.h:4 +#: ../src/empathy-status-icon.ui.h:5 msgid "_Quit" msgstr "_Izađi" -#: ../src/empathy-streamed-media-window.ui.h:2 -msgid "Call the contact again" -msgstr "Pozovi prijatelja ponovo" - #: ../src/empathy-streamed-media-window.ui.h:3 -msgid "Camera Off" -msgstr "Isklj. kameru" +msgid "Redial" +msgstr "Ponovo zovi" #: ../src/empathy-streamed-media-window.ui.h:4 -msgid "Camera On" -msgstr "Uklj. kameru" +msgid "V_ideo" +msgstr "V_ideo" + +#: ../src/empathy-streamed-media-window.ui.h:5 +msgid "Video Off" +msgstr "Isklj. video" #: ../src/empathy-streamed-media-window.ui.h:6 -msgid "Disable camera and stop sending video" -msgstr "Onemogući kameru i prestani da šalješ video" +msgid "Video Preview" +msgstr "Pregled videa" #: ../src/empathy-streamed-media-window.ui.h:7 -msgid "Enable camera and send video" -msgstr "Omogući kameru i šalji video" +msgid "Video On" +msgstr "Uklj. video" -#: ../src/empathy-streamed-media-window.ui.h:8 -msgid "Enable camera but don't send video" -msgstr "Omogući kameru, ali ne šalji video" +#: ../src/empathy-streamed-media-window.ui.h:10 +msgid "Call the contact again" +msgstr "Pozovi prijatelja ponovo" #: ../src/empathy-streamed-media-window.ui.h:13 -msgid "Preview" -msgstr "Pregled" +msgid "Camera Off" +msgstr "Isklj. kameru" #: ../src/empathy-streamed-media-window.ui.h:14 -msgid "Redial" -msgstr "Ponovo zovi" +msgid "Disable camera and stop sending video" +msgstr "Onemogući kameru i prestani da šalješ video" -#: ../src/empathy-streamed-media-window.ui.h:19 -msgid "V_ideo" -msgstr "V_ideo" +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Preview" +msgstr "Pregled" -#: ../src/empathy-streamed-media-window.ui.h:21 -msgid "Video Off" -msgstr "Isklj. video" +#: ../src/empathy-streamed-media-window.ui.h:16 +msgid "Enable camera but don't send video" +msgstr "Omogući kameru, ali ne šalji video" -#: ../src/empathy-streamed-media-window.ui.h:22 -msgid "Video On" -msgstr "Uklj. video" +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Camera On" +msgstr "Uklj. kameru" -#: ../src/empathy-streamed-media-window.ui.h:23 -msgid "Video Preview" -msgstr "Pregled videa" +#: ../src/empathy-streamed-media-window.ui.h:18 +msgid "Enable camera and send video" +msgstr "Omogući kameru i šalji video" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Mapa prijatelja" @@ -4597,16 +4654,16 @@ msgid "" msgstr "" "Izabrani upravnik veze ne podržava proširenje za udaljeno otklanjanje grešaka." -#: ../src/empathy-invite-participant-dialog.c:179 -#: ../src/empathy-invite-participant-dialog.c:205 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Pozovi učesnike" -#: ../src/empathy-invite-participant-dialog.c:180 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Izaberite prijatelja za pozivanje u ovaj razgovor:" -#: ../src/empathy-invite-participant-dialog.c:201 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Pozovi" @@ -4630,23 +4687,27 @@ msgstr "" msgid "" msgstr "" -#: ../src/empathy-accounts.c:198 +#: ../src/empathy-accounts.c:196 +msgid "Show account assistant" +msgstr "Prikazuje pomoćnika naloga" + +#: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" msgstr "— Nalozi Pismonoše" -#: ../src/empathy-accounts.c:237 +#: ../src/empathy-accounts.c:238 msgid "Empathy Accounts" msgstr "Nalozi Pismonoše" -#: ../src/empathy-debugger.c:70 +#: ../src/empathy-debugger.c:69 msgid "Show a particular service" msgstr "Prikaži posebnu uslugu" -#: ../src/empathy-debugger.c:75 +#: ../src/empathy-debugger.c:74 msgid "- Empathy Debugger" msgstr "— Otklanjanje grešaka Pismonoše" -#: ../src/empathy-debugger.c:114 +#: ../src/empathy-debugger.c:113 msgid "Empathy Debugger" msgstr "Otklanjanje grešaka Pismonoše" @@ -4654,39 +4715,39 @@ msgstr "Otklanjanje grešaka Pismonoše" msgid "- Empathy Chat Client" msgstr "— Pismonoša program za ćaskanje" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Odgovori" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1459 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1572 msgid "Reject" msgstr "Odbaci" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1460 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1573 msgid "Answer" msgstr "Javi se" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Odgovori sa videom" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Odbij" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Prihvati" #. 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:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Obezbedi" @@ -4697,32 +4758,198 @@ msgstr "%s je pokušao da vas zove, ali ste vi bili na drugoj vezi." #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111 +#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202 msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2775 +#: ../src/empathy-call-window.c:2936 msgid "On hold" msgstr "Na čekanju" -#: ../src/empathy-call-window.c:2778 +#: ../src/empathy-call-window.c:2939 msgid "Mute" msgstr "Utišaj" -#: ../src/empathy-call-window.c:2780 +#: ../src/empathy-call-window.c:2941 msgid "Duration" msgstr "Trajanje" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2783 +#: ../src/empathy-call-window.c:2944 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" +#: ../src/empathy-call-window.c:3214 +#, c-format +msgid "Your current balance is %s." +msgstr "Vaše trenutno stanje je %s." + +#: ../src/empathy-call-window.c:3218 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "Izvinite, ali nemate dovoljno kredita za ovaj poziv." + +#: ../src/empathy-call-window.c:3220 +msgid "Top Up" +msgstr "Dopuni" + #: ../libempathy-gtk/empathy-search-bar.c:243 msgid "_Match case" msgstr "_Uporedi veličinu slova" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Dodajem novi nalog" + +#~ msgid "Call volume" +#~ msgstr "Jačina zvuka poziva" + +#~ msgid "Call volume, as a percentage." +#~ msgstr "Jačina zvuka poziva, u procentima." + +#~ msgid "Empathy has migrated butterfly logs" +#~ msgstr "Pismonoša je prebacio dnevnike iz leptira" + +#~ msgid "Whether Empathy has migrated butterfly logs." +#~ msgstr "Da li je Pismonoša prebacio dnevnike iz leptira." + +#~ msgid "Socket type not supported" +#~ msgstr "Vrsta priključka nije podržana" + +#~ msgid "My Web Accounts" +#~ msgstr "Moji veb nalozi" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "Nalog %s je izmenjen putem %s." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "Nalog %s ne može biti uređivan iz Pismonoše." + +#~ msgid "Launch My Web Accounts" +#~ msgstr "Pokreni Moje veb naloge" + +#~ msgid "Edit %s" +#~ msgstr "Izmeni %s" + +#~ msgid "Ca_ncel" +#~ msgstr "Po_ništi" + +#~ msgid "Personal Information" +#~ msgstr "Podaci o profilu" + +#~ msgid "Ungrouped" +#~ msgstr "Negrupisano" + +#~ msgid "Favorite People" +#~ msgstr "Omiljeni ljudi" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "Izm_eni" + +#~ msgid "Select a contact" +#~ msgstr "Izaberite prijatelja" + +#~ msgid "Linked Contacts" +#~ msgstr "Povezani prijatelji" + +#~ msgid "Select contacts to link" +#~ msgstr "Izaberite prijatelja za povezivanje" + +#~ msgid "New contact preview" +#~ msgstr "Pregled novog prijatelja" + +#~ msgid "Contacts selected in the list on the left will be linked together." +#~ msgstr "Označeni prijatelji na spisku levo će biti uvezani zajedno." + +#~ msgctxt "Link individual (contextual menu)" +#~ msgid "_Link Contacts…" +#~ msgstr "_Poveži kontakte…" + +#~ msgid "Link Contacts" +#~ msgstr "Poveži prijatelje" + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink…" +#~ msgstr "_Razveži…" + +#~ msgid "" +#~ "Completely split the displayed linked contacts into the separate contacts." +#~ msgstr "Razdvaja uvezane kontakte u posebne prijatelje." + +#~ msgid "_Link" +#~ msgstr "_Uveži" + +#~ msgid "Unlink linked contacts '%s'?" +#~ msgstr "Da razvežem uvezanog prijatelja „%s“?" + +#~ msgid "" +#~ "Are you sure you want to unlink these linked contacts? This will " +#~ "completely split the linked contacts into separate contacts." +#~ msgstr "" +#~ "Da li ste sigurni da želite da razvežete uvezanog prijatelja? Ovim ćete " +#~ "razdvojiti uvezane kontakte u posebne prijatelje." + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink" +#~ msgstr "_Razveži" + +#~ msgid "Contact ID:" +#~ msgstr "IB prijatelja:" + +#~ msgid "C_hat" +#~ msgstr "Ć_askaj" + +#~ msgid "Send _Video" +#~ msgstr "Pošalji _video" + +#~ msgid "C_all" +#~ msgstr "_Pozovi" + +#~ msgid "Set your presence and current status" +#~ msgstr "Postavite vaše prisustvo i trenutno stanje" + +#~ msgid "The selected contact cannot receive files." +#~ msgstr "Izabrani prijatelj ne može da primi datoteke." + +#~ msgid "The selected contact is offline." +#~ msgstr "Izabrani prijatelj nije na vezi." + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "Ovim ćete napraviti novi nalog, zanemarivši unete izmene.\n" +#~ "Da li sigurno želite da nastavite?" + +#~ msgctxt "encoding video codec" +#~ msgid "Unknown" +#~ msgstr "Nepoznato" + +#~ msgctxt "encoding audio codec" +#~ msgid "Unknown" +#~ msgstr "Nepoznato" + +#~ msgctxt "decoding video codec" +#~ msgid "Unknown" +#~ msgstr "Nepoznato" + +#~ msgctxt "decoding audio codec" +#~ msgid "Unknown" +#~ msgstr "Nepoznato" + +#~ msgid "_Personal Information" +#~ msgstr "Lični _podaci" + +#~ msgid "Input level:" +#~ msgstr "Ulazni nivo:" + +#~ msgid "Input volume:" +#~ msgstr "Jačina ulaznog zvuka:" + +#~ msgid "_Open new chats in separate windows" +#~ msgstr "_Otvaraj ćaskanja u novim prozorima" + #~ msgid "All" #~ msgstr "Sve" diff --git a/po/sv.po b/po/sv.po index 6848369d..c3dc9f9e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,8 +1,8 @@ # Swedish messages for Empathy. -# Copyright (C) 2002-2011 Free Software Foundation, Inc. +# Copyright (C) 2002-2012 Free Software Foundation, Inc. # Richard Hult , 2002, 2003. # Christian Rose , 2003, 2004. -# Daniel Nylander , 2006, 2007, 2008, 2009, 2010, 2011. +# Daniel Nylander , 2006, 2007, 2008, 2009, 2010, 2011, 2012. # # Snälla, ta *INTE* bort de extra #~-meddelandena på slutet. # @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-17 06:33+0200\n" -"PO-Revision-Date: 2011-10-17 06:35+0100\n" +"POT-Creation-Date: 2012-01-18 12:37+0100\n" +"PO-Revision-Date: 2012-01-18 12:42+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -41,410 +41,402 @@ msgid "Always open a separate chat window for new chats." msgstr "Öppna alltid ett separat fönster för nya chattar." #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Samtalsvolym" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Samtalsvolym, som en procentandel." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "Camera device" msgstr "Kameraenhet" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 msgid "Camera position" msgstr "Kameraposition" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "Character to add after nickname when using nick completion (tab) in group chat." msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 msgid "Chat window theme" msgstr "Chattfönstertema" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "Chat window theme variant" msgstr "Temavariant för chattfönster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "Kommaseparerad lista av språk att använda för stavningskontroll (t.ex. \"sv, en, fr\")." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Compact contact list" msgstr "Kompakt kontaktlista" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 msgid "Connection managers should be used" msgstr "Anslutningshanterare ska användas" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Contact list sort criterion" msgstr "Sorteringskriteria för kontaktlista" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 msgid "D-Bus object path of the last account selected to join a room." msgstr "Sökväg för D-Bus-objektet för senaste kontot valt för att gå in i ett rum." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "Standardenhet för kamera att använda i videosamtal, t.ex. /dev/video0." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Default directory to select an avatar image from" msgstr "Standardkatalog att välja en profilbild från" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Disable popup notifications when away" msgstr "Inaktivera popupnotifieringar under frånvaro" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Disable sounds when away" msgstr "Inaktivera ljud under frånvaro" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Display incoming events in the status area" msgstr "Visa inkommande händelser i statusytan" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "Display incoming events in the status area. If false, present them to the user immediately." msgstr "Visa inkommande händelser i statusytan. Om false, visa dem direkt för användaren." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Echo cancellation support" msgstr "Stöd för ekosläckning" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy can publish the user's location" msgstr "Empathy kan publicera användarens plats" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy kan använda GPS:en för att gissa platsen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy can use the cellular network to guess the location" msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy can use the network to guess the location" msgstr "Empathy kan använda nätverket för att gissa platsen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Empathy default download folder" msgstr "Standardhämtningsmapp för Empathy" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Empathy should auto-away when idle" msgstr "Empathy ska ställa in automatiskt frånvaro vid inaktivitet" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Empathy should auto-connect on startup" msgstr "Empathy ska ansluta automatiskt vid uppstart" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Empathy should reduce the location's accuracy" msgstr "Empathy bör minska precisionen för platsen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "Empathy ska använda profilbilden för kontakten som ikon i chattfönstret" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Enable WebKit Developer Tools" msgstr "Aktivera utvecklingsverktyg för WebKit" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Enable popup notifications for new messages" msgstr "Aktivera popupnotifieringar för nya meddelanden" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Enable spell checker" msgstr "Aktivera stavningskontroll" # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det # inte ska hittas, döljer gör man för att det inte ska synas. -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Hide main window" msgstr "Dölj huvudfönstret" # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det # inte ska hittas, döljer gör man för att det inte ska synas. -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Hide the main window." msgstr "Dölj huvudfönstret." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Last account selected in Join Room dialog" msgstr "Senast kontot valt i Gå in i rum-dialogen" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Nick completed character" msgstr "Tecken för smeknamnskomplettering" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Open new chats in separate windows" msgstr "Öppna nya chattar i separata fönster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Path of the Adium theme to use" msgstr "Sökväg för Adium-temat att använda" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "Sökväg för Adium-temat som ska användas om temat som används för chatt är Adium." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound for incoming messages" msgstr "Spela upp ljud för inkommande meddelanden" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for new conversations" msgstr "Spela upp ett ljud för nya samtal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for outgoing messages" msgstr "Spela upp ljud för utgående meddelanden" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Play a sound when a contact logs in" msgstr "Spela upp ljud när en kontakt loggar in" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound when a contact logs out" msgstr "Spela upp ett ljud när en kontakt loggar ut" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when we log in" msgstr "Spela upp ljud när vi loggar in" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound when we log out" msgstr "Spela upp ljud när vi loggar ut" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Pop up notifications if the chat isn't focused" msgstr "Visa popupnotifieringar om chatten inte är fokuserad" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Pop up notifications when a contact logs in" msgstr "Visa popupnotifieringar när en kontakt loggar in" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Pop up notifications when a contact logs out" msgstr "Visa popupnotifieringar när en kontakt loggar ut" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Position the camera preview should be during a call." msgstr "Positionera kameravisningen som den ska vara under ett samtal." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "Show Balance in contact list" msgstr "Visa saldo i kontaktlista" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Show avatars" msgstr "Visa profilbilder" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Show contact list in rooms" msgstr "Visa kontaktlista i rum" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Show hint about closing the main window" msgstr "Visa tips om att stänga huvudfönstret" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Show offline contacts" msgstr "Visa frånkopplade kontakter" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Show protocols" msgstr "Visa protokoll" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Spell checking languages" msgstr "Rättstavningsspråk" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "The default folder to save file transfers in." msgstr "Standardmappen att spara filöverföringar i." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "The last directory that an avatar image was chosen from." msgstr "Den senaste katalogen som en profilbild valdes från." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "The position for the chat window side pane" msgstr "Positionen för chattfönstrets sidopanel" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "The stored position (in pixels) of the chat window side pane." msgstr "Den lagrade positionen (i bildpunkter) för chattfönstrets sidopanel." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "The theme that is used to display the conversation in chat windows." msgstr "Det tema som används för att visa samtal i chattfönster." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "The theme variant that is used to display the conversation in chat windows." msgstr "Den temavariant som används för att visa samtalet i chattfönster." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "Använd grafiska smilisar" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Use notification sounds" msgstr "Använd notifieringsljud" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use theme for chat rooms" msgstr "Använd tema för chattrum" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "Huruvida Empathy kan publicera användarens plats till sina kontakter." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Huruvida Empathy kan använda GPS för att gissa platsen." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether Empathy can use the network to guess the location." msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "Whether Empathy should go into away mode automatically if the user is idle." msgstr "Huruvida Empathy automatiskt ska gå in i frånvaroläge om användaren är inaktiv." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "Huruvida Empathy ska använda profilbilden för kontakten som ikon i chattfönstret." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "Huruvida utvecklingsverktyg för WebKit, såsom Webbinspekteraren, ska aktiveras." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "Whether connectivity managers should be used to automatically disconnect/reconnect." msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "Whether to check words typed against the languages you want to check with." msgstr "Huruvida ord som matas in ska kontrolleras mot de språk som du vill kontrollera med." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Whether to convert smileys into graphical images in conversations." msgstr "Huruvida smilisar ska omvandlas till grafiska bilder i samtal." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "Huruvida Pulseaudios filter för ekosläckning ska aktiveras." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar in i nätverket." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "Whether to play a sound to notify of contacts logging out of the network." msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar ut från nätverket." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Whether to play a sound to notify of events." msgstr "Huruvida ett ljud ska spelas upp för att notifiera om händelser." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to play a sound to notify of incoming messages." msgstr "Huruvida ett ljud ska spelas upp för inkommande meddelanden." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Whether to play a sound to notify of new conversations." msgstr "Huruvida ett ljud ska spelas upp för nya samtal." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to play a sound to notify of outgoing messages." msgstr "Huruvida ett ljud ska spelas upp för utgående meddelanden." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Whether to play a sound when logging into a network." msgstr "Huruvida ett ljud ska spelas upp vid inloggning i ett nätverk." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to play a sound when logging out of a network." msgstr "Huruvida ett ljud ska spelas upp vid utloggning från ett nätverk." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to play sound notifications when away or busy." msgstr "Huruvida ljudnotifieringar ska spelas upp vid frånvaro eller upptagen." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to show a popup notification when a contact goes offline." msgstr "Huruvida popupnotifieringar ska visas när en kontakt kopplar från." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Whether to show a popup notification when a contact goes online." msgstr "Huruvida popupnotifieringar ska visas när en kontakt ansluter." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused." msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Whether to show a popup notification when receiving a new message." msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Whether to show account balances in the contact list." msgstr "Huruvida kontosaldon ska visas i kontaktlistan." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "Whether to show avatars for contacts in the contact list and chat windows." msgstr "Huruvida profilbilder ska visas för kontakter i kontaktlistan och chattfönster." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Whether to show contacts that are offline in the contact list." msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Whether to show popup notifications when away or busy." msgstr "Huruvida popupnotifieringar ska visas vid frånvaro eller upptagen." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to show protocols for contacts in the contact list." msgstr "Huruvida protokoll för kontakter ska visas i kontaktlistan." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Whether to show the contact list in chat rooms." msgstr "Huruvida kontaktlistan ska visas i chattrum." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "Whether to show the contact list in compact mode." msgstr "Huruvida kontaktlistan ska visas i kompakt läge." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar." msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas när man klickar på \"x\"-knappen i titelraden." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether to use the theme for chat rooms." msgstr "Huruvida temat för chattrum ska användas." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state." msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd." @@ -454,23 +446,52 @@ msgstr "Hantera konton för meddelanden och VoIP" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2324 +#: ../src/empathy-accounts-dialog.c:2406 msgid "Messaging and VoIP Accounts" msgstr "Meddelande och VoIP-konton" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Ingen anledning angavs" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Ändring i tillstånd begärdes" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Du avbröt filöverföringen" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Den andra deltagaren avbröt filöverföringen" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Fel vid försök att överföra filen" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Den andra deltagaren kunde inte överföra filen" + +#: ../libempathy/empathy-ft-handler.c:754 +#: ../libempathy/empathy-utils.c:311 +msgid "Unknown reason" +msgstr "Okänd anledning" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Filöverföringen är färdig men filen blev skadad" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Filöverföringar stöds inte fjärrkontakten" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Den valda filen är inte en vanlig fil" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Den valda filen är tom" @@ -491,199 +512,166 @@ msgstr "Ringde %s" msgid "Call from %s" msgstr "Samtal från %s" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "Uttagstypen stöds inte" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "Ingen anledning angavs" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "Ändring i tillstånd begärdes" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "Du avbröt filöverföringen" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "Den andra deltagaren avbröt filöverföringen" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "Fel vid försök att överföra filen" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "Den andra deltagaren kunde inte överföra filen" - -#: ../libempathy/empathy-tp-file.c:395 -#: ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Okänd anledning" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:231 msgid "Available" msgstr "Tillgänglig" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:233 msgid "Busy" msgstr "Upptagen" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:236 msgid "Away" msgstr "Frånvarande" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:238 msgid "Invisible" msgstr "Osynlig" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:240 msgid "Offline" msgstr "Frånkopplad" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:243 msgctxt "presence" msgid "Unknown" msgstr "Okänt" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:283 msgid "No reason specified" msgstr "Ingen anledning angavs" -#: ../libempathy/empathy-utils.c:286 -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:285 +#: ../libempathy/empathy-utils.c:341 msgid "Status is set to offline" msgstr "Status är inställd till frånkopplad" -#: ../libempathy/empathy-utils.c:288 -#: ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:287 +#: ../libempathy/empathy-utils.c:321 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:75 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Nätverksfel" -#: ../libempathy/empathy-utils.c:290 -#: ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:289 +#: ../libempathy/empathy-utils.c:323 msgid "Authentication failed" msgstr "Autentisering misslyckades" -#: ../libempathy/empathy-utils.c:292 -#: ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:291 +#: ../libempathy/empathy-utils.c:325 msgid "Encryption error" msgstr "Krypteringsfel" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:293 msgid "Name in use" msgstr "Namnet används" -#: ../libempathy/empathy-utils.c:296 -#: ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:295 +#: ../libempathy/empathy-utils.c:327 msgid "Certificate not provided" msgstr "Certifikat inte tillhandahållet" -#: ../libempathy/empathy-utils.c:298 -#: ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:297 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate untrusted" msgstr "Certifikatet är inte betrott" -#: ../libempathy/empathy-utils.c:300 -#: ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:299 +#: ../libempathy/empathy-utils.c:331 msgid "Certificate expired" msgstr "Certifikatet har gått ut" -#: ../libempathy/empathy-utils.c:302 -#: ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:301 +#: ../libempathy/empathy-utils.c:333 msgid "Certificate not activated" msgstr "Certifikatet är inte aktiverat" -#: ../libempathy/empathy-utils.c:304 -#: ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:303 +#: ../libempathy/empathy-utils.c:335 msgid "Certificate hostname mismatch" msgstr "Värdnamnet i certifikatet stämmer inte" -#: ../libempathy/empathy-utils.c:306 -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:305 +#: ../libempathy/empathy-utils.c:337 msgid "Certificate fingerprint mismatch" msgstr "Certifikatets fingeravtryck stämmer inte" -#: ../libempathy/empathy-utils.c:308 -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:307 +#: ../libempathy/empathy-utils.c:339 msgid "Certificate self-signed" msgstr "Självsignerat certifikat" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:309 msgid "Certificate error" msgstr "Certifikatfel" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:343 msgid "Encryption is not available" msgstr "Kryptering är inte tillgängligt" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:345 msgid "Certificate is invalid" msgstr "Certifikatet är ogiltigt" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:347 msgid "Connection has been refused" msgstr "Anslutningen vägrades" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:349 msgid "Connection can't be established" msgstr "Anslutningen kunde inte etableras" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:351 msgid "Connection has been lost" msgstr "Anslutningen förlorades" -#: ../libempathy/empathy-utils.c:354 +#: ../libempathy/empathy-utils.c:353 msgid "This resource is already connected to the server" msgstr "Denna resurs är redan ansluten till servern" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:355 msgid "Connection has been replaced by a new connection using the same resource" msgstr "Anslutningen har ersatts av en ny anslutning med samma resurs" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:358 msgid "The account already exists on the server" msgstr "Kontot finns redan på servern" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:360 msgid "Server is currently too busy to handle the connection" msgstr "Servern är för tillfället för upptagen för att hantera anslutningen" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:362 msgid "Certificate has been revoked" msgstr "Certifikatet har spärrats" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "Certifikatet använder en osäker skifferalgoritm eller är kryptografiskt svag" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:367 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library" msgstr "Längd på servercertifikatet, eller djup för servercertifikatkedjan, överstiger begränsningen för krypteringsbiblioteket" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:371 msgid "Your software is too old" msgstr "Din programvara är för gammal" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:530 msgid "People Nearby" msgstr "Personer i närheten" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:535 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:564 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:565 msgid "Facebook Chat" msgstr "Facebook-chatt" @@ -733,102 +721,74 @@ msgstr[1] "%d månader sedan" msgid "in the future" msgstr "i framtiden" -#: ../libempathy-gtk/empathy-account-chooser.c:540 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "Alla konton" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Konto" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Lösenord" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Server" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Port" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:763 +#: ../libempathy-gtk/empathy-account-widget.c:815 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -msgid "My Web Accounts" -msgstr "Mina webbkonton" - -#: ../libempathy-gtk/empathy-account-widget.c:1209 -#, c-format -msgid "The account %s is edited via %s." -msgstr "Kontot %s redigeras via %s." - -#: ../libempathy-gtk/empathy-account-widget.c:1215 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "Kontot %s kan inte redigeras i Empathy." - -#: ../libempathy-gtk/empathy-account-widget.c:1234 -msgid "Launch My Web Accounts" -msgstr "Starta Mina webbkonton" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1242 -#, c-format -msgid "Edit %s" -msgstr "Redigera %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1592 +#: ../libempathy-gtk/empathy-account-widget.c:1396 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "Användarnamn:" -#: ../libempathy-gtk/empathy-account-widget.c:1910 +#: ../libempathy-gtk/empathy-account-widget.c:1708 msgid "A_pply" msgstr "V_erkställ" -#: ../libempathy-gtk/empathy-account-widget.c:1940 +#: ../libempathy-gtk/empathy-account-widget.c:1737 msgid "L_og in" msgstr "L_ogga in" -#: ../libempathy-gtk/empathy-account-widget.c:2014 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "Detta konto finns redan på servern" -#: ../libempathy-gtk/empathy-account-widget.c:2017 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "Skapa ett nytt konto på servern" -#: ../libempathy-gtk/empathy-account-widget.c:2209 -msgid "Ca_ncel" -msgstr "Av_bryt" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2487 +#: ../libempathy-gtk/empathy-account-widget.c:2239 #, c-format msgid "%1$s on %2$s" msgstr "%1$s på %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:2513 +#: ../libempathy-gtk/empathy-account-widget.c:2265 #, c-format msgid "%s Account" msgstr "%s-konto" -#: ../libempathy-gtk/empathy-account-widget.c:2517 +#: ../libempathy-gtk/empathy-account-widget.c:2269 msgid "New account" msgstr "Nytt konto" @@ -876,7 +836,7 @@ msgstr "Kom ihåg lösenordet" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 msgid "Remember password" msgstr "Kom ihåg lösenordet" @@ -1195,7 +1155,7 @@ msgid "STUN Server:" msgstr "STUN-server:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contact-widget.c:347 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 msgid "Server:" msgstr "Server:" @@ -1301,188 +1261,188 @@ msgstr "Nödsamtal stöds inte med detta protokollet" msgid "You don't have enough credit in order to place this call" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:706 +#: ../libempathy-gtk/empathy-chat.c:705 msgid "Failed to open private chat" msgstr "Misslyckades med att öppna privat chatt" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:763 msgid "Topic not supported on this conversation" msgstr "Ämne stöds inte för detta samtal" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:769 msgid "You are not allowed to change the topic" msgstr "Du tillåts inte att ändra ämnet" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:970 #, c-format msgid "“%s” is not a valid contact ID" msgstr "\"%s\" är inte ett giltigt kontakt-id" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1065 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: töm alla meddelanden från det aktuella samtalet" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1068 msgid "/topic : set the topic of the current conversation" msgstr "/topic <ämne>: ställ in ämnet för det aktuella samtalet" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/join : join a new chat room" msgstr "/join : gå in i ett nytt chattrum" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1074 msgid "/j : join a new chat room" msgstr "/j : gå in i ett nytt chattrum" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "/part [] []: leave the chat room, by default the current one" msgstr "/part [] []: lämna chattrummet, det aktuella som standard" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1082 msgid "/query []: open a private chat" msgstr "/query []: öppna en privat chatt" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/msg : open a private chat" msgstr "/msg : öppna en privat chatt" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/nick : change your nickname on the current server" msgstr "/nick : ändra ditt smeknamn på aktuell server" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/me : send an ACTION message to the current conversation" msgstr "/me : skicka ett ACTION-meddelande till aktuellt samtal" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/say : send 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 : skicka till det aktuella samtalet. Detta används för att skicka ett meddelande som börjar med ett \"/\". Till exempel: \"/say /join används för att gå in i ett nytt chattrum\"" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "/whois : display information about a contact" msgstr "/whois : visa information om en kontakt" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "/help []: show all supported commands. If is defined, show its usage." msgstr "/help []: visa alla kommandon som stöds. Om har definierats, visa dess användning." -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1121 #, c-format msgid "Usage: %s" msgstr "Användning: %s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1166 msgid "Unknown command" msgstr "Okänt kommando" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1292 msgid "Unknown command; see /help for the available commands" msgstr "Okänt kommando; se /help för tillgängliga kommandon" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1456 msgid "insufficient balance to send message" msgstr "otillräckliga medel på kontot för att skicka meddelande" -#: ../libempathy-gtk/empathy-chat.c:1461 -#: ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1460 +#: ../libempathy-gtk/empathy-chat.c:1474 +#: ../libempathy-gtk/empathy-chat.c:1537 #, c-format msgid "Error sending message '%s': %s" msgstr "Fel vid sändning av meddelandet \"%s\": %s" -#: ../libempathy-gtk/empathy-chat.c:1463 -#: ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1462 +#: ../libempathy-gtk/empathy-chat.c:1479 +#: ../libempathy-gtk/empathy-chat.c:1541 #, c-format msgid "Error sending message: %s" msgstr "Fel vid sändning av meddelande: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1469 +#: ../libempathy-gtk/empathy-chat.c:1468 #, fuzzy, c-format msgid "insufficient balance to send message. Top up." msgstr "otillräckliga medel på kontot för att skicka meddelande" -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1508 msgid "not capable" msgstr "inte kapabel" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1515 msgid "offline" msgstr "frånkopplad" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1518 msgid "invalid contact" msgstr "ogiltig kontakt" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1521 msgid "permission denied" msgstr "åtkomst nekad" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1524 msgid "too long message" msgstr "för långt meddelande" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1527 msgid "not implemented" msgstr "inte implementerat" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1531 msgid "unknown" msgstr "okänt" -#: ../libempathy-gtk/empathy-chat.c:1599 +#: ../libempathy-gtk/empathy-chat.c:1598 #: ../src/empathy-chat-window.c:761 msgid "Topic:" msgstr "Ämne:" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1610 #, c-format msgid "Topic set to: %s" msgstr "Ämnet inställt till: %s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "No topic defined" msgstr "Inget ämne definierat" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2125 msgid "(No Suggestions)" msgstr "(Inga förslag)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2193 #, c-format msgid "Add '%s' to Dictionary" msgstr "Lägg till \"%s\" till ordbok" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2230 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Lägg till \"%s\" till %s-ordboken" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2300 msgid "Insert Smiley" msgstr "Infoga smilis" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 -#: ../libempathy-gtk/empathy-ui-utils.c:1843 +#: ../libempathy-gtk/empathy-chat.c:2318 +#: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "_Skicka" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2373 +#: ../libempathy-gtk/empathy-chat.c:2375 msgid "_Spelling Suggestions" msgstr "Sta_vningsförslag" -#: ../libempathy-gtk/empathy-chat.c:2462 +#: ../libempathy-gtk/empathy-chat.c:2464 msgid "Failed to retrieve recent logs" msgstr "Misslyckades med att hämta senaste loggar" -#: ../libempathy-gtk/empathy-chat.c:2599 +#: ../libempathy-gtk/empathy-chat.c:2601 #, c-format msgid "%s has disconnected" msgstr "%s har kopplat från" @@ -1490,12 +1450,12 @@ msgstr "%s har kopplat från" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2606 +#: ../libempathy-gtk/empathy-chat.c:2608 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s sparkades ut av %2$s" -#: ../libempathy-gtk/empathy-chat.c:2609 +#: ../libempathy-gtk/empathy-chat.c:2611 #, c-format msgid "%s was kicked" msgstr "%s sparkades ut" @@ -1503,17 +1463,17 @@ msgstr "%s sparkades ut" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2617 +#: ../libempathy-gtk/empathy-chat.c:2619 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s blev bannlyst av %2$s" -#: ../libempathy-gtk/empathy-chat.c:2620 +#: ../libempathy-gtk/empathy-chat.c:2622 #, c-format msgid "%s was banned" msgstr "%s blev bannlyst" -#: ../libempathy-gtk/empathy-chat.c:2624 +#: ../libempathy-gtk/empathy-chat.c:2626 #, c-format msgid "%s has left the room" msgstr "%s har lämnat rummet" @@ -1523,17 +1483,17 @@ msgstr "%s har lämnat rummet" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2633 +#: ../libempathy-gtk/empathy-chat.c:2635 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2658 +#: ../libempathy-gtk/empathy-chat.c:2660 #, c-format msgid "%s has joined the room" msgstr "%s har gått in i rummet" -#: ../libempathy-gtk/empathy-chat.c:2683 +#: ../libempathy-gtk/empathy-chat.c:2685 #, c-format msgid "%s is now known as %s" msgstr "%s är nu känd som %s" @@ -1541,91 +1501,91 @@ msgstr "%s är nu känd som %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2836 -#: ../src/empathy-streamed-media-window.c:1894 -#: ../src/empathy-event-manager.c:1260 -#: ../src/empathy-call-window.c:1546 -#: ../src/empathy-call-window.c:1596 -#: ../src/empathy-call-window.c:2642 +#: ../libempathy-gtk/empathy-chat.c:2846 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 +#: ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 +#: ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "Frånkopplad" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3482 +#: ../libempathy-gtk/empathy-chat.c:3492 msgid "Would you like to store this password?" msgstr "Vill du lagra detta lösenord?" -#: ../libempathy-gtk/empathy-chat.c:3488 +#: ../libempathy-gtk/empathy-chat.c:3498 msgid "Remember" msgstr "Kom ihåg" -#: ../libempathy-gtk/empathy-chat.c:3498 +#: ../libempathy-gtk/empathy-chat.c:3508 msgid "Not now" msgstr "Inte nu" -#: ../libempathy-gtk/empathy-chat.c:3542 +#: ../libempathy-gtk/empathy-chat.c:3552 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Försök igen" -#: ../libempathy-gtk/empathy-chat.c:3546 +#: ../libempathy-gtk/empathy-chat.c:3556 msgid "Wrong password; please try again:" msgstr "Felaktigt lösenord. Försök igen:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3676 +#: ../libempathy-gtk/empathy-chat.c:3686 msgid "This room is protected by a password:" msgstr "Detta rum är skyddat med ett lösenord:" -#: ../libempathy-gtk/empathy-chat.c:3703 +#: ../libempathy-gtk/empathy-chat.c:3713 msgid "Join" msgstr "Gå in" -#: ../libempathy-gtk/empathy-chat.c:3891 -#: ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:3901 +#: ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Ansluten" -#: ../libempathy-gtk/empathy-chat.c:3946 +#: ../libempathy-gtk/empathy-chat.c:3956 msgid "Conversation" msgstr "Samtal" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3951 +#: ../libempathy-gtk/empathy-chat.c:3961 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Okänd eller ogiltig identifierare" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Blockering av kontakter är för närvarande inte möjligt" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Kontaktblockering är inte möjlig" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Åtkomst nekad" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Kunde inte blockera kontakten" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Redigera blockerade kontakter" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1489 -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" @@ -1643,56 +1603,51 @@ msgid "Remove" msgstr "Ta bort" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "_Kopiera länkadress" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 +#: ../libempathy-gtk/empathy-chat-text-view.c:329 #: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "_Öppna länk" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:417 msgid "%A %B %d %Y" msgstr "%A %e %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Redigera kontaktinformation" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 +#: ../libempathy-gtk/empathy-contact-dialogs.c:278 msgid "Personal Information" msgstr "Personlig information" -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:379 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "Ny kontakt" -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 +#: ../libempathy-gtk/empathy-contact-dialogs.c:448 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "Blockera %s?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 +#: ../libempathy-gtk/empathy-contact-dialogs.c:453 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "Är du säker på att du vill blockera \"%s\" från att kontakta dig igen?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 +#: ../libempathy-gtk/empathy-contact-dialogs.c:458 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 msgid "_Block" msgstr "_Blockera" -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 +#: ../libempathy-gtk/empathy-contact-dialogs.c:476 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Rapportera denna kontakt som stötande" @@ -1710,329 +1665,251 @@ msgstr "Prenumerationsbegäran" msgid "_Block User" msgstr "_Blockera användare" -#: ../libempathy-gtk/empathy-contact-list-view.c:1935 -#: ../libempathy-gtk/empathy-individual-view.c:2375 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Vill du verkligen ta bort gruppen \"%s\"?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1937 -#: ../libempathy-gtk/empathy-individual-view.c:2378 -msgid "Removing group" -msgstr "Tar bort grupp" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-contact-list-view.c:2063 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 -msgid "_Remove" -msgstr "_Ta bort" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2016 -#: ../libempathy-gtk/empathy-individual-view.c:2500 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Vill du verkligen ta bort kontakten \"%s\"?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2018 -#: ../libempathy-gtk/empathy-individual-view.c:2521 -msgid "Removing contact" -msgstr "Tar bort kontakt" - -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "_Lägg till kontakt..." - -#: ../libempathy-gtk/empathy-contact-menu.c:292 -msgid "_Block Contact" -msgstr "_Blockera kontakt" - -#: ../libempathy-gtk/empathy-contact-menu.c:321 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "_Chatt" - -#: ../libempathy-gtk/empathy-contact-menu.c:353 -#: ../libempathy-gtk/empathy-individual-menu.c:850 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Ljudsamtal" - -#: ../libempathy-gtk/empathy-contact-menu.c:386 -#: ../libempathy-gtk/empathy-individual-menu.c:895 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Videosamtal" - -#: ../libempathy-gtk/empathy-contact-menu.c:432 -#: ../libempathy-gtk/empathy-individual-menu.c:948 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "Ti_digare samtal" - -#: ../libempathy-gtk/empathy-contact-menu.c:454 -#: ../libempathy-gtk/empathy-individual-menu.c:989 -msgid "Send File" -msgstr "Skicka fil" - -#: ../libempathy-gtk/empathy-contact-menu.c:477 -#: ../libempathy-gtk/empathy-individual-menu.c:1031 -msgid "Share My Desktop" -msgstr "Dela ut mitt skrivbord" - -#: ../libempathy-gtk/empathy-contact-menu.c:506 -#: ../libempathy-gtk/empathy-individual-menu.c:1094 -msgid "Infor_mation" -msgstr "Infor_mation" - -#: ../libempathy-gtk/empathy-contact-menu.c:552 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "R_edigera" - -#: ../libempathy-gtk/empathy-contact-menu.c:606 -#: ../libempathy-gtk/empathy-individual-menu.c:1285 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Bjuder in dig till detta rum" - -#: ../libempathy-gtk/empathy-contact-menu.c:637 -#: ../libempathy-gtk/empathy-individual-menu.c:1331 -msgid "_Invite to Chat Room" -msgstr "_Bjud in till chattrum" - #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Sök efter kontakter" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Sök: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "_Lägg till kontakt" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Inga kontakter hittades" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "Introducera dig själv:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "Jag skulle vilja kunna se när du är ansluten. Tack!" -#: ../libempathy-gtk/empathy-contact-widget.c:336 -#: ../libempathy-gtk/empathy-individual-widget.c:153 -msgid "Full name:" -msgstr "Fullständigt namn:" - -#: ../libempathy-gtk/empathy-contact-widget.c:337 -#: ../libempathy-gtk/empathy-individual-widget.c:154 -msgid "Phone number:" -msgstr "Telefonnummer:" - -#: ../libempathy-gtk/empathy-contact-widget.c:338 -#: ../libempathy-gtk/empathy-individual-widget.c:155 -msgid "E-mail address:" -msgstr "E-postadress:" - -# "Web site" är "webbplats". "Web page" är "webbsida". -#: ../libempathy-gtk/empathy-contact-widget.c:339 -#: ../libempathy-gtk/empathy-individual-widget.c:156 -msgid "Website:" -msgstr "Webbplats:" - -#: ../libempathy-gtk/empathy-contact-widget.c:340 -#: ../libempathy-gtk/empathy-individual-widget.c:157 -msgid "Birthday:" -msgstr "Födelsedag:" - -#. 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-contact-widget.c:346 -msgid "Last seen:" -msgstr "Sågs senast:" - -#: ../libempathy-gtk/empathy-contact-widget.c:348 -msgid "Connected from:" -msgstr "Ansluten från:" - -#. FIXME: once Idle implements SimplePresence using this information, we can -#. * and should bin this. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:353 -msgid "Away message:" -msgstr "Frånvaromeddelande:" - -#: ../libempathy-gtk/empathy-contact-widget.c:606 +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Kanaler:" -#: ../libempathy-gtk/empathy-contact-widget.c:897 -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "Landets ISO-kod:" -#: ../libempathy-gtk/empathy-contact-widget.c:899 -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Land:" -#: ../libempathy-gtk/empathy-contact-widget.c:901 -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Län:" -#: ../libempathy-gtk/empathy-contact-widget.c:903 -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Stad:" -#: ../libempathy-gtk/empathy-contact-widget.c:905 -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Område:" -#: ../libempathy-gtk/empathy-contact-widget.c:907 -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Postnummer:" -#: ../libempathy-gtk/empathy-contact-widget.c:909 -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Gata:" -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Byggnad:" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Våning:" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Rum:" -#: ../libempathy-gtk/empathy-contact-widget.c:917 -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Text:" -#: ../libempathy-gtk/empathy-contact-widget.c:919 -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Beskrivning:" -#: ../libempathy-gtk/empathy-contact-widget.c:921 -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:923 -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Precisionsnivå:" -#: ../libempathy-gtk/empathy-contact-widget.c:925 -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Fel:" -#: ../libempathy-gtk/empathy-contact-widget.c:927 -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Vertikalt fel (meter):" -#: ../libempathy-gtk/empathy-contact-widget.c:929 -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Horisontellt fel (meter):" -#: ../libempathy-gtk/empathy-contact-widget.c:931 -#: ../libempathy-gtk/empathy-individual-widget.c:503 +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Hastighet:" -#: ../libempathy-gtk/empathy-contact-widget.c:933 -#: ../libempathy-gtk/empathy-individual-widget.c:505 +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Riktning:" -#: ../libempathy-gtk/empathy-contact-widget.c:935 -#: ../libempathy-gtk/empathy-individual-widget.c:507 +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Höjdökning:" -#: ../libempathy-gtk/empathy-contact-widget.c:937 -#: ../libempathy-gtk/empathy-individual-widget.c:509 +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Senast uppdaterad:" -#: ../libempathy-gtk/empathy-contact-widget.c:939 -#: ../libempathy-gtk/empathy-individual-widget.c:511 +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Longitud:" -#: ../libempathy-gtk/empathy-contact-widget.c:941 -#: ../libempathy-gtk/empathy-individual-widget.c:513 +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Latitud:" -#: ../libempathy-gtk/empathy-contact-widget.c:943 -#: ../libempathy-gtk/empathy-individual-widget.c:515 +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Höjd:" -#: ../libempathy-gtk/empathy-contact-widget.c:996 -#: ../libempathy-gtk/empathy-contact-widget.c:1011 -#: ../libempathy-gtk/empathy-individual-widget.c:607 -#: ../libempathy-gtk/empathy-individual-widget.c:622 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:15 msgid "Location" msgstr "Plats" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:1013 -#: ../libempathy-gtk/empathy-individual-widget.c:624 +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:1065 -#: ../libempathy-gtk/empathy-individual-widget.c:673 +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%e %B, %Y klockan %H.%M UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1147 -#: ../libempathy-gtk/empathy-individual-widget.c:915 +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Spara profilbild" -#: ../libempathy-gtk/empathy-contact-widget.c:1203 -#: ../libempathy-gtk/empathy-individual-widget.c:973 +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Kunde inte spara profilbild" -#: ../libempathy-gtk/empathy-contact-widget.c:1887 -#: ../libempathy-gtk/empathy-individual-menu.c:1066 -#: ../libempathy-gtk/empathy-individual-widget.c:1372 -msgid "Favorite" -msgstr "Favorit" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +msgid "Full name" +msgstr "Fullständigt namn" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "Telefonnummer" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "E-postadress" + +# "Web site" är "webbplats". "Web page" är "webbsida". +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +msgid "Website" +msgstr "Webbplats" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +msgid "Birthday" +msgstr "Födelsedag" + +#. 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:113 +msgid "Last seen:" +msgstr "Sågs senast:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +msgid "Connected from:" +msgstr "Ansluten från:" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +msgid "Away message:" +msgstr "Frånvaromeddelande:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +msgid "work" +msgstr "arbete" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +msgid "home" +msgstr "hem" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +msgid "mobile" +msgstr "mobil" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +msgid "voice" +msgstr "röst" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +msgid "preferred" +msgstr "föredragen" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "postadress" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +msgid "parcel" +msgstr "leveransadress" #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 msgid "Location at (date)\t" @@ -2040,7 +1917,7 @@ msgstr "Plats den (datum)\t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1308 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "Alias:" @@ -2060,7 +1937,7 @@ msgstr "Kontaktuppgifter" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1517 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "Identifierare:" @@ -2077,118 +1954,203 @@ msgstr "OS:" msgid "Version:" msgstr "Version:" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "Grupper" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups." msgstr "Välj de grupper som du vill att denna kontakt ska finnas i. Observera att du kan välja fler än en grupp eller inga grupper alls." -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "_Lägg till grupp" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Välj" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1967 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1919 msgid "Group" msgstr "Grupp" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Följande identitet kommer att blockeras:" msgstr[1] "Följande identiteter kommer att blockeras:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Följande identitet kan inte blockeras:" msgstr[1] "Följande identiteter kan inte blockeras:" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Redigera kontaktinformation" + #. Translators: the heading at the top of the Information dialogue #: ../libempathy-gtk/empathy-individual-information-dialog.c:288 msgid "Linked Contacts" msgstr "Länkade kontakter" -#: ../libempathy-gtk/empathy-individual-linker.c:370 +#: ../libempathy-gtk/empathy-individual-linker.c:372 msgid "Select contacts to link" msgstr "Välj kontakter att länka" -#: ../libempathy-gtk/empathy-individual-linker.c:444 +#: ../libempathy-gtk/empathy-individual-linker.c:447 msgid "New contact preview" msgstr "Förhandsvisa ny kontakt" -#: ../libempathy-gtk/empathy-individual-linker.c:488 +#: ../libempathy-gtk/empathy-individual-linker.c:491 msgid "Contacts selected in the list on the left will be linked together." msgstr "Kontakter markerade i listan till vänster kommer att länkas ihop." #. 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:145 +#: ../libempathy-gtk/empathy-individual-menu.c:181 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:363 msgid "Select account to use to place the call" msgstr "Välj konto att använda för att ringa samtalet" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 +#: ../libempathy-gtk/empathy-individual-menu.c:367 #: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1299 +#: ../src/empathy-streamed-media-window.c:1288 #: ../src/empathy-call-window.ui.h:2 msgid "Call" msgstr "Ring" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:432 msgid "Mobile" msgstr "Mobil" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:434 msgid "Work" msgstr "Arbete" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:436 msgid "HOME" msgstr "HEM" -#. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:805 -#: ../libempathy-gtk/empathy-new-message-dialog.c:295 +#: ../libempathy-gtk/empathy-individual-menu.c:677 +msgid "_Block Contact" +msgstr "_Blockera kontakt" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "_Chat" +msgstr "_Chatt" + +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1143 +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Ljudsamtal" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Videosamtal" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-roster-window-menubar.ui.h:27 +msgid "_Previous Conversations" +msgstr "Ti_digare samtal" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +msgid "Send File" +msgstr "Skicka fil" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "Dela ut mitt skrivbord" + +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Favorit" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "Infor_mation" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "R_edigera" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1169 +#: ../libempathy-gtk/empathy-individual-menu.c:1385 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "_Länka kontakter..." -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1011 +msgid "Inviting you to this room" +msgstr "Bjuder in dig till detta rum" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +msgid "_Invite to Chat Room" +msgstr "_Bjud in till chattrum" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Add Contact…" +msgstr "_Lägg till kontakt..." + +#: ../libempathy-gtk/empathy-individual-view.c:2301 msgid "Delete and _Block" msgstr "Ta bort och _blockera" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +#: ../libempathy-gtk/empathy-individual-view.c:2336 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Vill du verkligen ta bort gruppen \"%s\"?" + +#: ../libempathy-gtk/empathy-individual-view.c:2339 +msgid "Removing group" +msgstr "Tar bort grupp" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2394 +#: ../libempathy-gtk/empathy-individual-view.c:2611 +msgid "_Remove" +msgstr "_Ta bort" + +#: ../libempathy-gtk/empathy-individual-view.c:2471 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Vill du verkligen ta bort kontakten \"%s\"?" + +#: ../libempathy-gtk/empathy-individual-view.c:2480 #, 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 "Vill du verkligen ta bort den länkade kontakten \"%s\"? Observera att detta kommer att ta bort alla kontakter som denna länkade kontakt innehåller." -#: ../libempathy-gtk/empathy-individual-widget.c:1656 +#: ../libempathy-gtk/empathy-individual-view.c:2492 +msgid "Removing contact" +msgstr "Tar bort kontakt" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2203,19 +2165,19 @@ msgstr "Plats den (datum)" msgid "Online from a phone or mobile device" msgstr "Ansluten från en telefon eller mobil enhet" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "Nytt nätverk" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "Välj ett IRC-nätverk" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "Återställ _nätverkslistan" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Välj" @@ -2266,136 +2228,136 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "Av_länka" -#: ../libempathy-gtk/empathy-log-window.c:634 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Historik" -#: ../libempathy-gtk/empathy-log-window.c:689 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Visa" -#: ../libempathy-gtk/empathy-log-window.c:711 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Sök" -#: ../libempathy-gtk/empathy-log-window.c:1159 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Chatt i %s" -#: ../libempathy-gtk/empathy-log-window.c:1161 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Chatt med %s" -#: ../libempathy-gtk/empathy-log-window.c:1211 -#: ../libempathy-gtk/empathy-log-window.c:1358 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e %B %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1300 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1306 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s sekund" msgstr[1] "%s sekunder" -#: ../libempathy-gtk/empathy-log-window.c:1389 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s minut" msgstr[1] "%s minuter" -#: ../libempathy-gtk/empathy-log-window.c:1397 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Samtalet tog %s, avslutades %s" -#: ../libempathy-gtk/empathy-log-window.c:1729 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Idag" # "Web site" är "webbplats". "Web page" är "webbsida". -#: ../libempathy-gtk/empathy-log-window.c:1733 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Igår" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1748 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%B %e %Y" #: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3444 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "När som helst" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2372 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Vem som helst" -#: ../libempathy-gtk/empathy-log-window.c:2685 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Vem" -#: ../libempathy-gtk/empathy-log-window.c:2889 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "När" -#: ../libempathy-gtk/empathy-log-window.c:3005 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Allting" -#: ../libempathy-gtk/empathy-log-window.c:3007 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Textchattar" -#: ../libempathy-gtk/empathy-log-window.c:3009 +#: ../libempathy-gtk/empathy-log-window.c:3044 #: ../src/empathy-preferences.ui.h:4 msgid "Calls" msgstr "Samtal" -#: ../libempathy-gtk/empathy-log-window.c:3014 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Inkommande samtal" -#: ../libempathy-gtk/empathy-log-window.c:3015 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Utgående samtal" -#: ../libempathy-gtk/empathy-log-window.c:3016 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Missade samtal" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Vad" -#: ../libempathy-gtk/empathy-log-window.c:3747 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Är du säker på att du vill ta bort alla loggar för tidigare samtal?" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Töm allt" -#: ../libempathy-gtk/empathy-log-window.c:3758 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Ta bort från:" @@ -2425,7 +2387,7 @@ msgstr "Video" #: ../libempathy-gtk/empathy-log-window.ui.h:7 #: ../src/empathy-call-window.ui.h:28 #: ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 +#: ../src/empathy-roster-window-menubar.ui.h:20 msgid "_Edit" msgstr "R_edigera" @@ -2437,84 +2399,82 @@ msgstr "_Arkiv" msgid "page 2" msgstr "sida 2" -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 -msgid "Contact ID:" -msgstr "Kontakt-id:" - -#: ../libempathy-gtk/empathy-new-message-dialog.c:77 +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "Kontakten är frånkopplad" -#: ../libempathy-gtk/empathy-new-message-dialog.c:79 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 msgid "The specified contact is either invalid or unknown" msgstr "Den angivna kontakten är antingen ogiltig eller okänd" -#: ../libempathy-gtk/empathy-new-message-dialog.c:81 -#, fuzzy +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" -msgstr "Ämne stöds inte för detta samtal" +msgstr "Kontakten saknar stöd för denna typ av samtal" -#: ../libempathy-gtk/empathy-new-message-dialog.c:83 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 msgid "The requested functionality is not implemented for this protocol" -msgstr "" +msgstr "Begärd funktionalitet är inte implementerad för detta protokoll" -#: ../libempathy-gtk/empathy-new-message-dialog.c:89 -#, fuzzy +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 msgid "Could not start a conversation with the given contact" -msgstr "Starta röst- eller videosamtal med denna kontakt" +msgstr "Kunde inte starta ett samtal med denna kontakt" -#: ../libempathy-gtk/empathy-new-message-dialog.c:91 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "Du är bannlyst från denna kanal" -#: ../libempathy-gtk/empathy-new-message-dialog.c:93 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "Denna kanal är full" -#: ../libempathy-gtk/empathy-new-message-dialog.c:95 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 msgid "You must be invited to join this channel" msgstr "Du måste bli inbjuden för att gå in i denna kanal" -#: ../libempathy-gtk/empathy-new-message-dialog.c:97 -#, fuzzy +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" -msgstr "Kontakten frånkopplad" +msgstr "Kan inte fortsätta när frånkopplad" -#: ../libempathy-gtk/empathy-new-message-dialog.c:99 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "Åtkomst nekad" -#: ../libempathy-gtk/empathy-new-message-dialog.c:105 -#, fuzzy +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "Det inträffade ett fel när samtalet startades" -#. add chat button -#: ../libempathy-gtk/empathy-new-message-dialog.c:305 -msgid "C_hat" -msgstr "C_hatta" +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 +msgid "Enter a contact identifier or phone number:" +msgstr "Ange en kontaktidentifierare eller telefonnummer:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:324 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Nytt samtal" -#. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:204 -msgid "Send _Video" -msgstr "Skicka _video" +#. add video button +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +msgid "_Video Call" +msgstr "_Videosamtal" -#. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:215 -msgid "C_all" -msgstr "Rin_g" +#. add audio button +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 +msgid "_Audio Call" +msgstr "_Röstsamtal" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Nytt samtal" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Autentisering misslyckades för kontot %s" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2551,12 +2511,8 @@ msgstr "Klicka för att göra denna status till favorit" msgid "Set status" msgstr "Ange status" -#: ../libempathy-gtk/empathy-presence-chooser.c:943 -msgid "Set your presence and current status" -msgstr "Ange din närvaro och aktuell status" - #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1131 +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 msgid "Custom messages…" msgstr "Anpassade meddelanden..." @@ -2633,12 +2589,12 @@ msgstr "Röstsamtal avslutat" msgid "Edit Custom Messages" msgstr "Redigera anpassade meddelanden" -#: ../libempathy-gtk/empathy-theme-adium.c:1044 +#: ../libempathy-gtk/empathy-theme-adium.c:1047 #, c-format msgid "Message edited at %s" msgstr "Meddelandet redigerat %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1749 +#: ../libempathy-gtk/empathy-theme-adium.c:1752 msgid "Normal" msgstr "Normal" @@ -2729,24 +2685,24 @@ msgstr "Kom ihåg detta val för framtida anslutningar" msgid "Certificate Details" msgstr "Certifikatinformation" -#: ../libempathy-gtk/empathy-ui-utils.c:1738 +#: ../libempathy-gtk/empathy-ui-utils.c:1741 msgid "Unable to open URI" msgstr "Kunde inte öppna uri" -#: ../libempathy-gtk/empathy-ui-utils.c:1835 +#: ../libempathy-gtk/empathy-ui-utils.c:1859 msgid "Select a file" msgstr "Välj en fil" -#: ../libempathy-gtk/empathy-ui-utils.c:1907 +#: ../libempathy-gtk/empathy-ui-utils.c:1934 msgid "Insufficient free space to save file" msgstr "Otillräckligt med ledigt utrymme för att spara filen" -#: ../libempathy-gtk/empathy-ui-utils.c:1915 +#: ../libempathy-gtk/empathy-ui-utils.c:1942 #, c-format msgid "%s of free space are required to save this file, but only %s is available. Please choose another location." msgstr "%s ledigt utrymme krävs för att spara denna fil men endast %s finns tillgängligt. Välj en annan plats." -#: ../libempathy-gtk/empathy-ui-utils.c:1959 +#: ../libempathy-gtk/empathy-ui-utils.c:1986 #, c-format msgid "Incoming file from %s" msgstr "Inkommande fil från %s" @@ -2919,31 +2875,31 @@ msgstr "Västlig" msgid "Vietnamese" msgstr "Vietnamesisk" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Inget felmeddelande" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Snabbmeddelanden (Empathy)" -#: ../src/empathy.c:434 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Anslut inte vid uppstart" -#: ../src/empathy.c:438 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Visa inte kontaktlistan eller några andra dialogrutor vid uppstart" -#: ../src/empathy.c:453 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "- Empathy snabbmeddelandeklient" -#: ../src/empathy.c:640 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Fel vid anslutning till kontohanteraren" -#: ../src/empathy.c:642 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n" @@ -2966,11 +2922,11 @@ msgstr "Empathy distribueras i hopp om att det ska vara användbart, men UTAN N 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 "Du bör ha fått en kopia av GNU General Public License tillsammans med Empathy. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "En snabbmeddelandeklient för GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Daniel Nylander \n" @@ -3006,168 +2962,177 @@ msgid "You can either go back and try to enter your accounts' details again or q msgstr "Du kan antingen gå tillbaka och försöka att ange dina kontouppgifter igen eller avsluta denna guide och lägga till konton senare från Redigera-menyn." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1274 msgid "An error occurred" msgstr "Ett fel inträffade" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Vilken typ av chattkonto har du?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "Har du ytterligare chattkonton som du vill konfigurera?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Ange dina kontouppgifter" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Vilken typ av chattkonto vill du skapa?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Vill du skapa andra chattkonton?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Ange uppgifterna för det nya kontot" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls." msgstr "Med Empathy kan du chatta med anslutna personer i närheten och med vänner och kollegor som använder Google Talk, AIM, Windows Live och många andra chattprogram. Du kan även använda ljud- och videosamtal om du har en mikrofon eller webbkamera." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "Har du ett konto som du har använt med andra chattprogram?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Ja, importera mina kontouppgifter från " -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Ja, jag vill ange mina kontouppgifter nu" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Nej, jag vill ha ett nytt konto" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Nej, jag vill bara se anslutna personer i närheten just nu" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "Välj de konton som du vill importera:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Ja" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Nej, det är allt för stunden" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog" msgstr "Empathy kan automatiskt upptäcka och chatta med personer som är anslutna på samma nätverk som du är. Om du vill använda denna funktion så kontrollera att uppgifterna nedan är korrekta. Du kan enkelt ändra dessa uppgifter senare eller inaktivera denna funktion genom att använda \"Konton\"-dialogrutan" -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1150 msgid "Edit->Accounts" msgstr "Redigera->Konton" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "Jag vill _inte aktivera denna funktion just nu" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1146 msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog" msgstr "Du kommer inte att kunna chatta med personer som är anslutna till ditt lokala nätverk eftersom telepathy-salut inte är installerat. Om du vill aktivera denna funktion så installera paketet telepathy-salut och skapa ett Personer i närheten-konto från Konto-dialogrutan" -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1152 msgid "telepathy-salut not installed" msgstr "telepathy-salut är inte installerat" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1198 msgid "Messaging and VoIP Accounts Assistant" msgstr "Guide för meddelanden och VoIP-konton" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1232 msgid "Welcome to Empathy" msgstr "Välkommen till Empathy" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1241 msgid "Import your existing accounts" msgstr "Importera dina befintliga konton" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1259 msgid "Please enter personal details" msgstr "Ange personlig information" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Det finns osparade ändringar för ditt %s-konto." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Ditt nya konto har inte sparats än." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:754 -#: ../src/empathy-call-window.c:1330 +#: ../src/empathy-accounts-dialog.c:352 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "Ansluter..." -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:393 #, c-format msgid "Offline — %s" msgstr "Frånkopplad — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:405 #, c-format msgid "Disconnected — %s" msgstr "Frånkopplad — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:416 msgid "Offline — No Network Connection" msgstr "Frånkopplad — Ingen nätverksanslutning" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:423 msgid "Unknown Status" msgstr "Okänd status" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:435 msgid "Offline — Account Disabled" msgstr "Frånkopplad — Kontot är inaktiverat" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Du är på väg att skapa ett nytt konto vilket kommer att\n" -"förkasta dina ändringar. Är du säker att du vill fortsätta?" +#: ../src/empathy-accounts-dialog.c:538 +msgid "Edit Connection Parameters" +msgstr "Redigera anslutningsdetaljer" -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:701 +msgid "Failed to retrieve your personal information from the server." +msgstr "Misslyckades med att hämta din personliga information från servern." + +#: ../src/empathy-accounts-dialog.c:707 +msgid "Go online to edit your personal information." +msgstr "Anslut dig för att redigera din personliga information." + +#: ../src/empathy-accounts-dialog.c:792 +msgid "_Edit Connection Parameters..." +msgstr "_Redigera anslutningsdetaljer..." + +#: ../src/empathy-accounts-dialog.c:1293 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Vill du ta bort %s från din dator?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1297 msgid "This will not remove your account on the server." msgstr "Detta kommer inte att ta bort ditt konto på servern." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1533 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3176,15 +3141,15 @@ msgstr "" "förkasta dina ändringar. Är du säker att du vill fortsätta?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1744 msgid "_Enable" msgstr "_Aktivera" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1745 msgid "_Disable" msgstr "_Inaktivera" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2255 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3216,11 +3181,11 @@ msgstr "För att lägga till ett nytt konto måste du först installera en bakä msgid "_Import…" msgstr "_Importera…" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr "- Autentiseringsklienten Empathy" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Autentiseringsklienten Empathy" @@ -3238,150 +3203,150 @@ msgstr "- Ljud/Videoklienten Empathy" msgid "Empathy Audio/Video Client" msgstr "Ljud/Videoklienten Empathy" -#: ../src/empathy-streamed-media-window.c:431 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Kontrast" -#: ../src/empathy-streamed-media-window.c:434 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Ljusstyrka" -#: ../src/empathy-streamed-media-window.c:437 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-streamed-media-window.c:542 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Volym" -#: ../src/empathy-streamed-media-window.c:1110 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "_Sidopanel" -#: ../src/empathy-streamed-media-window.c:1130 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Ljudingång" -#: ../src/empathy-streamed-media-window.c:1134 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Videoingång" -#: ../src/empathy-streamed-media-window.c:1140 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Knappsats" -#: ../src/empathy-streamed-media-window.c:1151 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Detaljer" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1220 -#: ../src/empathy-call-window.c:1939 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format msgid "Call with %s" msgstr "Ring med %s" -#: ../src/empathy-streamed-media-window.c:1453 -#: ../src/empathy-call-window.c:2183 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 msgid "The IP address as seen by the machine" msgstr "IP-adressen som den ses av datorn" -#: ../src/empathy-streamed-media-window.c:1455 -#: ../src/empathy-call-window.c:2185 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 msgid "The IP address as seen by a server on the Internet" msgstr "IP-adressen som den ses av en server på Internet" -#: ../src/empathy-streamed-media-window.c:1457 -#: ../src/empathy-call-window.c:2187 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 msgid "The IP address of the peer as seen by the other side" msgstr "IP-adressen för klienten som den ses av andra sidan" -#: ../src/empathy-streamed-media-window.c:1459 -#: ../src/empathy-call-window.c:2189 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 msgid "The IP address of a relay server" msgstr "IP-adressen för en reläserver" -#: ../src/empathy-streamed-media-window.c:1461 -#: ../src/empathy-call-window.c:2191 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 msgid "The IP address of the multicast group" msgstr "IP-adressen för multicast-gruppen" -#: ../src/empathy-streamed-media-window.c:1843 -#: ../src/empathy-streamed-media-window.c:1846 -#: ../src/empathy-streamed-media-window.c:1849 -#: ../src/empathy-streamed-media-window.c:1852 +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 msgctxt "codec" msgid "Unknown" msgstr "Okänt" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2144 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "Ansluten — %d:%02dm" -#: ../src/empathy-streamed-media-window.c:2205 -#: ../src/empathy-call-window.c:2961 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 msgid "Technical Details" msgstr "Tekniska detaljer" -#: ../src/empathy-streamed-media-window.c:2243 -#: ../src/empathy-call-window.c:2999 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 #, c-format msgid "%s's software does not understand any of the audio formats supported by your computer" msgstr "Programvaran hos %s förstår inte något av de ljudformat som stöds av din dator" -#: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:3004 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format msgid "%s's software does not understand any of the video formats supported by your computer" msgstr "Programvaran hos %s förstår inte något av de videoformat som stöds av din dator" -#: ../src/empathy-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:3010 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 #, 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 "Kan inte etablera en anslutning till %s. Någon av er kanske befinner er på ett nätverk som inte tillåter direktanslutningar." -#: ../src/empathy-streamed-media-window.c:2260 -#: ../src/empathy-call-window.c:3016 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 msgid "There was a failure on the network" msgstr "Det inträffade ett fel på nätverket" -#: ../src/empathy-streamed-media-window.c:2264 -#: ../src/empathy-call-window.c:3020 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 msgid "The audio formats necessary for this call are not installed on your computer" msgstr "Ljudformaten som krävs för detta samtal är inte installerade på din dator" -#: ../src/empathy-streamed-media-window.c:2267 -#: ../src/empathy-call-window.c:3023 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 msgid "The video formats necessary for this call are not installed on your computer" msgstr "Videoformaten som krävs för detta samtal är inte installerade på din dator" -#: ../src/empathy-streamed-media-window.c:2277 -#: ../src/empathy-call-window.c:3035 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 #, c-format msgid "Something unexpected happened in a Telepathy component. Please report this bug and attach logs gathered from the 'Debug' window in the Help menu." msgstr "Någonting oväntat hände i en Telepathy-komponent. Rapportera detta fel och bifoga loggarna som samlats in från \"Felsök\"-fönstret i Hjälp-menyn." -#: ../src/empathy-streamed-media-window.c:2285 -#: ../src/empathy-call-window.c:3044 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 msgid "There was a failure in the call engine" msgstr "Det uppstod ett fel i samtalsmotorn" -#: ../src/empathy-streamed-media-window.c:2288 -#: ../src/empathy-call-window.c:3047 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 msgid "The end of the stream was reached" msgstr "Slutet på strömmen nåddes" -#: ../src/empathy-streamed-media-window.c:2328 -#: ../src/empathy-call-window.c:3087 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 msgid "Can't establish audio stream" msgstr "Kan inte etablera ljudström" -#: ../src/empathy-streamed-media-window.c:2338 -#: ../src/empathy-call-window.c:3097 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 msgid "Can't establish video stream" msgstr "Kan inte etablera videoström" @@ -3473,10 +3438,10 @@ msgstr "Växla videoöverföring" #: ../src/empathy-call-window.ui.h:21 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2591 -#: ../src/empathy-call-window.c:2592 -#: ../src/empathy-call-window.c:2593 -#: ../src/empathy-call-window.c:2594 +#: ../src/empathy-call-window.c:2580 +#: ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 +#: ../src/empathy-call-window.c:2583 msgid "Unknown" msgstr "Okänt" @@ -3495,18 +3460,18 @@ msgstr "_Kamera" #: ../src/empathy-call-window.ui.h:26 #: ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "_Contents" msgstr "I_nnehåll" #: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "_Debug" msgstr "_Felsökning" #: ../src/empathy-call-window.ui.h:29 #: ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Help" msgstr "_Hjälp" @@ -3519,7 +3484,7 @@ msgid "_Settings" msgstr "_Inställningar" #: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 +#: ../src/empathy-roster-window-menubar.ui.h:30 #: ../src/empathy-streamed-media-window.ui.h:25 msgid "_View" msgstr "_Visa" @@ -3645,102 +3610,102 @@ msgstr "Anslut automatiskt" msgid "Manage Favorite Rooms" msgstr "Hantera favoritrum" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Inkommande videosamtal" -#: ../src/empathy-event-manager.c:521 -#: ../src/empathy-call-window.c:1563 +#: ../src/empathy-event-manager.c:523 +#: ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "Inkommande samtal" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s ringer ett videosamtal till dig. Vill du svara?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s ringer dig. Vill du svara?" -#: ../src/empathy-event-manager.c:529 -#: ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1569 +#: ../src/empathy-event-manager.c:531 +#: ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "Inkommande samtal från %s" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "Avv_isa" -#: ../src/empathy-event-manager.c:562 -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 +#: ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_Svara" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "S_vara med video" -#: ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1569 +#: ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" msgstr "Inkommande videosamtal från %s" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Rumsinbjudan" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Inbjudan till att gå in i %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s bjuder in dig till %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_Neka" -#: ../src/empathy-event-manager.c:858 +#: ../src/empathy-event-manager.c:860 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Gå in" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s har bjudit in dig till %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "Du har blivit inbjuden att gå med i %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Inkommande filöverföring från %s" -#: ../src/empathy-event-manager.c:1145 -#: ../src/empathy-main-window.c:378 +#: ../src/empathy-event-manager.c:1147 +#: ../src/empathy-roster-window.c:371 msgid "Password required" msgstr "Lösenord krävs" -#: ../src/empathy-event-manager.c:1210 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s vill ha behörighet att se när du är ansluten" -#: ../src/empathy-event-manager.c:1214 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3750,108 +3715,108 @@ msgstr "" "Meddelande: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Okänt" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s av %s i %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s av %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Tar emot \"%s\" från %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Skickar \"%s\" till %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Fel vid mottagning av \"%s\" från %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Fel vid mottagning av en fil" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Fel vid sändning av \"%s\" till %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Fel vid sändning av en fil" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "\"%s\" togs emot från %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "\"%s\" skickades till %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Filöverföringen är färdig" -#: ../src/empathy-ft-manager.c:616 -#: ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 +#: ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Väntar på svar från den andra deltagaren" -#: ../src/empathy-ft-manager.c:642 -#: ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 +#: ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Kontrollerar integritet för \"%s\"" -#: ../src/empathy-ft-manager.c:645 -#: ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 +#: ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Hashar \"%s\"" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Fil" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Återstår" @@ -3872,165 +3837,165 @@ msgid "Import Accounts" msgstr "Importera konton" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "Importera" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Protokoll" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Källa" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-roster-window.c:388 msgid "Provide Password" msgstr "Ange lösenord" -#: ../src/empathy-main-window.c:401 +#: ../src/empathy-roster-window.c:394 msgid "Disconnect" msgstr "Koppla ifrån" -#: ../src/empathy-main-window.c:642 +#: ../src/empathy-roster-window.c:626 msgid "No match found" msgstr "Ingen träff hittades" -#: ../src/empathy-main-window.c:750 +#: ../src/empathy-roster-window.c:733 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" -#: ../src/empathy-main-window.c:818 +#: ../src/empathy-roster-window.c:799 msgid "Update software..." msgstr "Uppdatera programvara..." -#: ../src/empathy-main-window.c:824 -#: ../src/empathy-main-window.c:949 +#: ../src/empathy-roster-window.c:805 +#: ../src/empathy-roster-window.c:922 msgid "Close" msgstr "Stäng" -#: ../src/empathy-main-window.c:937 +#: ../src/empathy-roster-window.c:910 msgid "Reconnect" msgstr "Anslut igen" -#: ../src/empathy-main-window.c:943 +#: ../src/empathy-roster-window.c:916 msgid "Edit Account" msgstr "Redigera konto" #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:1088 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1060 #, c-format msgid "Top up %s (%s)..." msgstr "Fyll på %s (%s)..." -#: ../src/empathy-main-window.c:1135 +#: ../src/empathy-roster-window.c:1106 msgid "Top up account credit" msgstr "Fyll på kontot" #. top up button -#: ../src/empathy-main-window.c:1206 +#: ../src/empathy-roster-window.c:1178 msgid "Top Up..." msgstr "Fyll på..." -#: ../src/empathy-main-window.c:1949 +#: ../src/empathy-roster-window.c:1901 msgid "Contact" msgstr "Kontakt" -#: ../src/empathy-main-window.c:2324 +#: ../src/empathy-roster-window.c:2296 msgid "Contact List" msgstr "Kontaktlista" -#: ../src/empathy-main-window-menubar.ui.h:1 +#: ../src/empathy-roster-window-menubar.ui.h:1 msgid "Contacts on a _Map" msgstr "Kontakter på en ka_rta" -#: ../src/empathy-main-window-menubar.ui.h:2 +#: ../src/empathy-roster-window-menubar.ui.h:2 msgid "Credit Balance" msgstr "Saldo" # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det # inte ska hittas, döljer gör man för att det inte ska synas. -#: ../src/empathy-main-window-menubar.ui.h:3 +#: ../src/empathy-roster-window-menubar.ui.h:3 msgid "Find in Contact _List" msgstr "Sök i kontakt_lista" -#: ../src/empathy-main-window-menubar.ui.h:4 +#: ../src/empathy-roster-window-menubar.ui.h:4 msgid "Join _Favorites" msgstr "Gå in i _favoriter" -#: ../src/empathy-main-window-menubar.ui.h:5 +#: ../src/empathy-roster-window-menubar.ui.h:5 msgid "Manage Favorites" msgstr "Hantera favoriter" -#: ../src/empathy-main-window-menubar.ui.h:6 +#: ../src/empathy-roster-window-menubar.ui.h:6 msgid "N_ormal Size" msgstr "N_ormal storlek" -#: ../src/empathy-main-window-menubar.ui.h:7 +#: ../src/empathy-roster-window-menubar.ui.h:7 #: ../src/empathy-status-icon.ui.h:1 msgid "New _Call…" msgstr "Nytt sa_mtal…" -#: ../src/empathy-main-window-menubar.ui.h:8 +#: ../src/empathy-roster-window-menubar.ui.h:8 msgid "Normal Size With _Avatars" msgstr "Normal storlek med _profilbilder" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:9 msgid "P_references" msgstr "I_nställningar" -#: ../src/empathy-main-window-menubar.ui.h:10 +#: ../src/empathy-roster-window-menubar.ui.h:10 msgid "Show P_rotocols" msgstr "Visa protoko_ll" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:11 msgid "Sort by _Name" msgstr "Sortera efter _namn" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:12 msgid "Sort by _Status" msgstr "Sortera efter _status" -#: ../src/empathy-main-window-menubar.ui.h:13 +#: ../src/empathy-roster-window-menubar.ui.h:13 msgid "_Accounts" msgstr "_Konton" -#: ../src/empathy-main-window-menubar.ui.h:15 +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "_Blocked Contacts" msgstr "_Blockerade kontakter" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:17 msgid "_Compact Size" msgstr "_Kompakt storlek" -#: ../src/empathy-main-window-menubar.ui.h:21 +#: ../src/empathy-roster-window-menubar.ui.h:21 msgid "_File Transfers" msgstr "Fi_löverföringar" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:23 msgid "_Join…" msgstr "_Gå in..." -#: ../src/empathy-main-window-menubar.ui.h:24 +#: ../src/empathy-roster-window-menubar.ui.h:24 #: ../src/empathy-status-icon.ui.h:3 msgid "_New Conversation…" msgstr "_Nytt samtal..." -#: ../src/empathy-main-window-menubar.ui.h:25 +#: ../src/empathy-roster-window-menubar.ui.h:25 msgid "_Offline Contacts" msgstr "_Frånkopplade kontakter" -#: ../src/empathy-main-window-menubar.ui.h:26 +#: ../src/empathy-roster-window-menubar.ui.h:26 msgid "_Personal Information" msgstr "_Personlig information" -#: ../src/empathy-main-window-menubar.ui.h:28 +#: ../src/empathy-roster-window-menubar.ui.h:28 msgid "_Room" msgstr "_Rum" -#: ../src/empathy-main-window-menubar.ui.h:29 +#: ../src/empathy-roster-window-menubar.ui.h:29 msgid "_Search for Contacts…" msgstr "_Sök efter kontakter..." @@ -4044,7 +4009,7 @@ msgstr "Medlemmar" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:623 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4057,16 +4022,16 @@ msgstr "" "Lösenord krävs: %s\n" "Medlemmar: %s" -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "Nej" -#: ../src/empathy-new-chatroom-dialog.c:654 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "Kunde inte starta rumslistningen" -#: ../src/empathy-new-chatroom-dialog.c:664 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "Kunde inte stoppa rumslistningen" @@ -4094,79 +4059,79 @@ msgstr "Rumslista" msgid "_Room:" msgstr "_Rum:" -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Meddelande togs emot" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Meddelandet skickat" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Nytt samtal" -#: ../src/empathy-preferences.c:172 +#: ../src/empathy-preferences.c:169 msgid "Contact goes online" msgstr "Kontakt ansluter" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "Kontakt kopplar från" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Kontot anslutet" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Kontot frånkopplat" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Språk" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:725 msgid "Juliet" msgstr "Julia" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:732 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:738 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Romeo, min Romeo, var är du Romeo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "Förneka din fader och vägra ditt namn;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "Eller om du icke, men var svurit min kärlek" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "Och jag kommer inte längre att vara en Capulet." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "Skall jag höra mer, eller ska jag tala?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "Julia har kopplat från" -#: ../src/empathy-preferences.c:1175 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "Inställningar" @@ -4218,104 +4183,96 @@ msgstr "Aktivera rättstavning för språk:" msgid "General" msgstr "Allmänt" -#: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "Ingångsnivå:" - #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "Ingångsvolym:" - -#: ../src/empathy-preferences.ui.h:18 msgid "Location sources:" msgstr "Platskällor:" -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:17 msgid "Log conversations" msgstr "Logga samtal" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:18 msgid "Notifications" msgstr "Notifieringar" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:19 msgid "Play sound for events" msgstr "Spela upp ljud för händelser" -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:20 msgid "Privacy" msgstr "Integritet" -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:21 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 "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer endast att använda en decimal." -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:22 msgid "Show _smileys as images" msgstr "Visa _smilisar som bilder" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:23 msgid "Show contact _list in rooms" msgstr "Visa kontakt_lista i rum" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:24 msgid "Sounds" msgstr "Ljud" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:25 msgid "Spell Checking" msgstr "Stavningskontroll" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:26 msgid "The list of languages reflects only the languages for which you have a dictionary installed." msgstr "Listan visar endast språk som du har en ordlista installerad för." -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:27 msgid "Themes" msgstr "Teman" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:28 msgid "Use _echo cancellation to improve call quality" msgstr "" -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:29 msgid "Variant:" msgstr "Variant:" -#: ../src/empathy-preferences.ui.h:32 +#: ../src/empathy-preferences.ui.h:30 msgid "_Automatically connect on startup" msgstr "Anslut _automatiskt vid uppstart" -#: ../src/empathy-preferences.ui.h:33 +#: ../src/empathy-preferences.ui.h:31 msgid "_Cellphone" msgstr "_Mobiltelefon" -#: ../src/empathy-preferences.ui.h:34 +#: ../src/empathy-preferences.ui.h:32 msgid "_Enable bubble notifications" msgstr "_Aktivera bubbelnotifieringar" -#: ../src/empathy-preferences.ui.h:35 +#: ../src/empathy-preferences.ui.h:33 msgid "_Enable sound notifications" msgstr "_Aktivera ljudnotifieringar" -#: ../src/empathy-preferences.ui.h:36 +#: ../src/empathy-preferences.ui.h:34 msgid "_GPS" msgstr "_GPS" -#: ../src/empathy-preferences.ui.h:37 +#: ../src/empathy-preferences.ui.h:35 msgid "_Network (IP, Wi-Fi)" msgstr "_Nätverk (IP, Wi-Fi)" -#: ../src/empathy-preferences.ui.h:38 +#: ../src/empathy-preferences.ui.h:36 msgid "_Open new chats in separate windows" msgstr "_Öppna nya chattar i separata fönster" -#: ../src/empathy-preferences.ui.h:39 +#: ../src/empathy-preferences.ui.h:37 msgid "_Publish location to my contacts" msgstr "_Publicera platsen till mina kontakter" #. 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:41 +#: ../src/empathy-preferences.ui.h:39 msgid "_Reduce location accuracy" msgstr "_Minska precision för plats" @@ -4375,7 +4332,7 @@ msgstr "Video på" msgid "Video Preview" msgstr "Videoförhandsvisning" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Kartvy för kontakter" @@ -4440,56 +4397,56 @@ msgstr "Nivå" msgid "The selected connection manager does not support the remote debugging extension." msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfelsökning." -#: ../src/empathy-invite-participant-dialog.c:179 -#: ../src/empathy-invite-participant-dialog.c:205 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Bjud in deltagare" -#: ../src/empathy-invite-participant-dialog.c:180 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Välj en kontakt att bjuda in till samtalet:" -#: ../src/empathy-invite-participant-dialog.c:201 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Bjud in" -#: ../src/empathy-accounts.c:184 +#: ../src/empathy-accounts.c:183 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "Visa inte några dialogrutor; gör valfri åtgärd (t.ex, importera) och avsluta" -#: ../src/empathy-accounts.c:188 +#: ../src/empathy-accounts.c:187 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "Visa inte några dialogrutor såvida inte det endast finns \"Personer i närheten\"-konton" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:191 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "Välj initiallt angivet konto (t.ex., gabble/jabber/foo_40example_2eorg0)" -#: ../src/empathy-accounts.c:194 +#: ../src/empathy-accounts.c:193 msgid "" msgstr "" -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:196 msgid "Show account assistant" msgstr "Visa kontoguiden" -#: ../src/empathy-accounts.c:203 +#: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" msgstr "- Empathy-konton" -#: ../src/empathy-accounts.c:242 +#: ../src/empathy-accounts.c:238 msgid "Empathy Accounts" msgstr "Empathy-konton" -#: ../src/empathy-debugger.c:70 +#: ../src/empathy-debugger.c:69 msgid "Show a particular service" msgstr "Visa en specifik tjänst" -#: ../src/empathy-debugger.c:75 +#: ../src/empathy-debugger.c:74 msgid "- Empathy Debugger" msgstr "- Empathy-felsökare" -#: ../src/empathy-debugger.c:114 +#: ../src/empathy-debugger.c:113 msgid "Empathy Debugger" msgstr "Empathy-felsökare" @@ -4497,39 +4454,39 @@ msgstr "Empathy-felsökare" msgid "- Empathy Chat Client" msgstr "- Empathy chattklient" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Svara" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1573 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 msgid "Reject" msgstr "Avvisa" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1574 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 msgid "Answer" msgstr "Svara" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Svara med video" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Neka" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Acceptera" #. 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:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Tillhandahåll" @@ -4540,33 +4497,109 @@ msgstr "%s försökte just ringa dig men du var upptagen i ett annat samtal." #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1183 -#: ../src/empathy-call-window.c:1206 +#: ../src/empathy-call-window.c:1172 +#: ../src/empathy-call-window.c:1195 msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2890 +#: ../src/empathy-call-window.c:2929 msgid "On hold" msgstr "Väntar" -#: ../src/empathy-call-window.c:2893 +#: ../src/empathy-call-window.c:2932 msgid "Mute" msgstr "Tyst" -#: ../src/empathy-call-window.c:2895 +#: ../src/empathy-call-window.c:2934 msgid "Duration" msgstr "Längd" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2898 +#: ../src/empathy-call-window.c:2937 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" +#: ../src/empathy-call-window.c:3207 +#, c-format +msgid "Your current balance is %s." +msgstr "Ditt aktuella saldo är %s." + +#: ../src/empathy-call-window.c:3211 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "" + +#: ../src/empathy-call-window.c:3213 +msgid "Top Up" +msgstr "Fyll på" + #: ../libempathy-gtk/empathy-search-bar.c:243 msgid "_Match case" msgstr "_Matcha skiftläge" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Lägger till nytt konto" + +#~ msgid "Call volume" +#~ msgstr "Samtalsvolym" + +#~ msgid "Call volume, as a percentage." +#~ msgstr "Samtalsvolym, som en procentandel." + +#~ msgid "Socket type not supported" +#~ msgstr "Uttagstypen stöds inte" + +#~ msgid "My Web Accounts" +#~ msgstr "Mina webbkonton" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "Kontot %s redigeras via %s." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "Kontot %s kan inte redigeras i Empathy." + +#~ msgid "Launch My Web Accounts" +#~ msgstr "Starta Mina webbkonton" + +#~ msgid "Edit %s" +#~ msgstr "Redigera %s" + +#~ msgid "Ca_ncel" +#~ msgstr "Av_bryt" +#~ msgctxt "Edit contact (contextual menu)" + +#~ msgid "_Edit" +#~ msgstr "R_edigera" + +#~ msgid "Contact ID:" +#~ msgstr "Kontakt-id:" + +#~ msgid "C_hat" +#~ msgstr "C_hatta" + +#~ msgid "Send _Video" +#~ msgstr "Skicka _video" + +#~ msgid "C_all" +#~ msgstr "Rin_g" + +#~ msgid "Set your presence and current status" +#~ msgstr "Ange din närvaro och aktuell status" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "Du är på väg att skapa ett nytt konto vilket kommer att\n" +#~ "förkasta dina ändringar. Är du säker att du vill fortsätta?" + +#~ msgid "Input level:" +#~ msgstr "Ingångsnivå:" + +#~ msgid "Input volume:" +#~ msgstr "Ingångsvolym:" + #~ msgid "Ungrouped" #~ msgstr "Ogrupperade" @@ -5735,8 +5768,6 @@ msgstr "_Matcha skiftläge" #~ "information." #~ msgid "Account Name" #~ msgstr "Kontonamn" -#~ msgid "Connection Details" -#~ msgstr "Anslutningsdetaljer" #~ msgid "Enter the port used in the connection for this account" #~ msgstr "Ange porten att ansluta till för detta konto" #~ msgid "Enter the server used in the connection for this account" @@ -6070,9 +6101,6 @@ msgstr "_Matcha skiftläge" #~ "Söker efter den bästa servern...\n" #~ "Detta kommer att ta en stund, var god vänta." -#~ msgid "Add Another Account" -#~ msgstr "Lägg till ytterligare konto" - #~ msgid "Configuring Service" #~ msgstr "Konfigurerar tjänst" diff --git a/po/te.po b/po/te.po index 9516ee0b..19464cb4 100644 --- a/po/te.po +++ b/po/te.po @@ -1,29 +1,29 @@ # translation of empathy.master.te.po to Telugu -# Copyright (C) 2011 Gnome Contributors +# Copyright (C) 2012 Swecha localisation Team # This file is distributed under the same license as the empathy package. # # # Krishna Babu K , 2009. # Praveen Illa , 2011. # Krishnababu Krothapalli , 2011. +# Sasi Bhushan Boddepalli ,2011 +# GVS.Giri ,2012. +# Sasi Bhushan Boddepalli ,2012. +# msgid "" msgstr "" "Project-Id-Version: empathy.master.te\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." -"cgi?product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2011-06-15 10:09+0000\n" -"PO-Revision-Date: 2011-06-15 20:28+0530\n" -"Last-Translator: Krishnababu Krothapalli \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=empathy&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2011-10-09 06:09+0000\n" +"PO-Revision-Date: 2012-01-31 19:11+0530\n" +"Last-Translator:Praveen Illa \n" "Language-Team: Telugu \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"\n" -"\n" -"\n" -"\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" "Language: te\n" #: ../data/empathy.desktop.in.in.h:1 @@ -47,429 +47,438 @@ msgid "Always open a separate chat window for new chats." msgstr "కొత్త చాట్‌లకు ఎల్లప్పుడు ఒక వేరే కొత్త చాట్ విండోను తెరువు." #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 +msgid "Call volume" +msgstr "కాల్ ఘణపరిమాణము" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 +msgid "Call volume, as a percentage." +msgstr "కాల్ ఘణపరిమాణము, ఒక శాతముగా" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 +msgid "Camera device" +msgstr "కెమెరా పరికరం" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +msgid "Camera position" +msgstr "కెమెరా స్థానము" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." msgstr "" -"గుంపు చాట్ నందు నిక్ కంప్లీషన్ (ట్యాబ్) ఉపయోగిస్తున్నప్పుడు మారుపేరు తరువాత " -"జతచేయవలసిన అక్షరము." +"గుంపు చాట్ నందు నిక్ కంప్లీషన్ (ట్యాబ్) ఉపయోగిస్తున్నప్పుడు మారుపేరు తరువాత జతచేయవలసిన అక్షరము." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 msgid "Chat window theme" msgstr "చాట్ విండో థీము" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -#, fuzzy -#| msgid "Chat window theme" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Chat window theme variant" -msgstr "చాట్ విండో థీము" +msgstr "మాట్లాడుకొను కిటికీ (చాట్ విండో) థీం మార్పులు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" -"ఉపయోగించుటకు కామాతో వేరుచేయబడివున్న అక్షరక్రమం తనిఖీచేయు భాషల యొక్క జాబితా (ఉ." -"దా. en, fr, nl)." +"ఉపయోగించుటకు కామాతో వేరుచేయబడివున్న అక్షరక్రమం తనిఖీచేయు భాషల యొక్క జాబితా (ఉ.దా. en, fr, nl)." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Compact contact list" msgstr "కాంపాక్టు పరిచయ జాబితా" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 msgid "Connection managers should be used" msgstr "అనుసంధాన నిర్వాహకాలను తప్పక ఉపయోగించాలి" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Contact list sort criterion" msgstr "పరిచయ జాబితా క్రమబద్దీకరణ విధానము" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "వీడియో కాల్స్ లో ఉపయోగించడానికి అప్రమేయ కెమెరా పరికరం" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Default directory to select an avatar image from" msgstr "అవతార బొమ్మను ఎంచుకొనుటకు అప్రమేయ డైరెక్టరీ" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Disable popup notifications when away" msgstr "దూరంగా ఉన్నప్పుడు పాప్అప్ ప్రకటనలను అచేతనముచేయి" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Disable sounds when away" msgstr "దూరంగా ఉన్నప్పుడు శబ్దములను అచేతనము చేయి" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "Display incoming events in the status area" msgstr "లోనికివచ్చు ఘటనలను స్థితి ప్రాంతములో చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "" "Display incoming events in the status area. If false, present them to the " "user immediately." msgstr "" -"లోనికివచ్చు ఘటనలను స్థితి ప్రదేశములో చూపించు. ఒకవేళ తప్పయినట్లయితే, వాడుకరికి " -"సత్వరమే చూపించు." +"లోనికివచ్చు ఘటనలను స్థితి ప్రదేశములో చూపించు. ఒకవేళ తప్పయినట్లయితే, వాడుకరికి సత్వరమే చూపించు." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +msgid "Echo cancellation support" +msgstr "అతి ధ్వనులను నిర్మూలించడానికి సహకారం" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Empathy can publish the user's location" msgstr "ఎంపతి వాడుకరి యొక్క స్థానమును ప్రచురించగలదు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy can use the GPS to guess the location" msgstr "స్థానమును అంచనావేయుటకు ఎంపతి GPSను ఉపయోగించగలదు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy can use the cellular network to guess the location" msgstr "స్థానమును అంచనా వేయుటకు ఎంపతి సెల్యులర్ నెట్‌వర్కును ఉపయోగించగలదు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Empathy can use the network to guess the location" msgstr "స్థానమును అంచానావేయుటకు ఎంపతి నెట్‌వర్కును ఉపయోగించగలదు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Empathy default download folder" msgstr "ఎంపతి అప్రమేయ డౌన్‌లోడు సంచయం" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Empathy has migrated butterfly logs" -msgstr "" +msgstr "అభివృధ్ధి చెందిన సీతాకోక చిలుక లాగ్ లు ఎంపతి కలిగి వున్నది" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Empathy should auto-away when idle" msgstr "ఎంపతి వాడుకలో లేనపుడు దూరంగా ఉన్నట్టు చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Empathy should auto-connect on startup" msgstr "ప్రారంభములో ఎంపతి స్వయంగా-అనుసంధానించబడాలి" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Empathy should reduce the location's accuracy" msgstr "స్థానము యొక్క ఖచ్చితత్వమును ఎంపతి తప్పక తగ్గించవలెను" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "ఎంపతి పరిచయం యొక్క అవతారమును చాట్ విండో ప్రతీక వలె ఉపయోగించాలి" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Enable WebKit Developer Tools" msgstr "వెబ్‌కిట్ అభివృద్ధికారుని సాధనములను చేతనపరుచు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Enable popup notifications for new messages" msgstr "కొత్త సందేశములు కొరకు పాప్అప్ ప్రకటనలను చేతనపరుచు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Enable spell checker" msgstr "అక్షరక్రమం తనిఖీచేయుదానిని చేతనపరుచు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Hide main window" msgstr "ప్రధాన విండోను దాయి" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Hide the main window." msgstr "ప్రధాన విండోను దాయి." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Nick completed character" msgstr "మారుపేరును పూర్తిచేయు అక్షరము" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Open new chats in separate windows" msgstr "కొత్త చాట్‌లను వేరువేరు విండోలలో తెరువు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Path of the Adium theme to use" msgstr "ఉపయోగించుటకు అడియమ్ థీము యొక్క పాత్." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "" -"ఒకవేళ చాట్‌నకు ఉపయోగించిన థీమ్ అడియమ్ అయితే అడియమ్ థీము వాడటానికి అవసరమగు " -"పాత్." +msgstr "ఒకవేళ చాట్‌నకు ఉపయోగించిన థీమ్ అడియమ్ అయితే అడియమ్ థీము వాడటానికి అవసరమగు పాత్." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for incoming messages" msgstr "లోనికివచ్చు సందేశములకు శబ్దమును వినిపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for new conversations" msgstr "కొత్త సంభాషణలకు శబ్దమును వినిపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Play a sound for outgoing messages" msgstr "బయటకుపోవు సందేశములకు శబ్దమును వినిపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound when a contact logs in" msgstr "పరిచయం ప్రవేశించినపుడు శబ్దమును వినిపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when a contact logs out" msgstr "పరిచయం నిష్క్రమించినపుడు శబ్దమును వినిపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound when we log in" msgstr "మనము ప్రవేశించినపుడు శబ్దమును వినిపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Play a sound when we log out" msgstr "మనము నిష్క్రమించినపుడు శబ్దమును వినిపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Pop up notifications if the chat isn't focused" msgstr "చాట్ పై దృష్టి సారించకపోతే ప్రకటనలను పైన చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Pop up notifications when a contact logs in" msgstr "పరిచయం లాగిన్ అయినప్పుడు ప్రకటనలు పైన చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Pop up notifications when a contact logs out" msgstr "పరిచయం నిష్క్రమించినపుడు ప్రకటనలను చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +msgid "Position the camera preview should be during a call." +msgstr "కెమెరా ఉపదర్శన స్థానము ఖచ్చితంగా కాల్ మధ్యలో ఉండవలెను" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Show Balance in contact list" msgstr "పరిచయ జాబితాలో సమతుల్యతను చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Show avatars" msgstr "అవతారములను చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Show contact list in rooms" msgstr "గదులలో పరిచయ జాబితాను చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Show hint about closing the main window" msgstr "ప్రధాన విండోను మూసివేయుటకు సూచనను చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Show offline contacts" msgstr "ఆఫ్‌లైన్ పరిచయాలను చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Show protocols" msgstr "ప్రోటోకాల్సును చూపించు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "Spell checking languages" msgstr "అక్షరక్రమ తనిఖీచేయు భాషలు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "The default folder to save file transfers in." msgstr "ఫైళ్ళ బదిలీకరణలను వ్యవస్థలో భద్రపరుచుటకు అప్రమేయ సంచయం." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "The last directory that an avatar image was chosen from." msgstr "అవతారము బొమ్మను ఎంచుకోబడినటువంటి ఆఖరి డైరెక్టరి." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "The position for the chat window side pane" msgstr "చాట్ విండో స్థానము పక్కపట్టీ" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "The stored position (in pixels) of the chat window side pane." -msgstr "" +msgstr "మటామంతీ(చాట్) కిటికీ ప్రక్కన పలక నిలువ స్థానము(పిక్సెల్ లలో)" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "The theme that is used to display the conversation in chat windows." msgstr "చాట్ విండోలలోసంభాషణను ప్రదర్శించుటకు ఉపయోగించబడిన థీము." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -#, fuzzy -#| msgid "The theme that is used to display the conversation in chat windows." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "" "The theme variant that is used to display the conversation in chat windows." -msgstr "చాట్ విండోలలోసంభాషణను ప్రదర్శించుటకు ఉపయోగించబడిన థీము." +msgstr "చాట్ విండోలలోసంభాషణను ప్రదర్శించుటకు మార్పులు చేయగలిగిన థీము." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Use graphical smileys" msgstr "గ్రాఫికల్ చిరునవ్వులను వాడు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use notification sounds" msgstr "ప్రకటిత శబ్దములను వాడు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Use theme for chat rooms" msgstr "చాట్ గదుల కొరకు థీమును వాడు" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "వాడుకరి ఉన్న స్థానమును వారి పరిచయములకు ఎంపతి ప్రచురించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether Empathy can use the GPS to guess the location." msgstr "స్థానమును అంచనావేయుటకు ఎంపతి GPSను ఉపయోగించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "స్థానమును అంచనావేయుటకు ఎంపతి సెల్యులర్ నెట్‌వర్కును ఉపయోగించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether Empathy can use the network to guess the location." msgstr "స్థానమును అంచనావేయుటకు ఎంపతి నెట్‌వర్కును ఉపయోగించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "Whether Empathy has migrated butterfly logs." -msgstr "" +msgstr "అభివృధ్ధి చెందిన సీతాకోక చిలుక లాగ్ లు ఎంపతి కలిగి వున్నది" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "" -"ఎంపతి వ్యవస్థ ప్రారంభములో మీ ఖాతాలలోనికి స్వయంచాలకంగా ప్రవేశించాలా వద్దా." +msgstr "ఎంపతి వ్యవస్థ ప్రారంభములో మీ ఖాతాలలోనికి స్వయంచాలకంగా ప్రవేశించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" "Whether Empathy should go into away mode automatically if the user is idle." -msgstr "" -"ఒకవేళ వాడుకరి వాడకుండా ఉంటే ఎంపతిని స్వయంచాలకంగా దూరంగా ఉన్న విధములోనికి " -"మార్చాలా వద్దా." +msgstr "ఒకవేళ వాడుకరి వాడకుండా ఉంటే ఎంపతిని స్వయంచాలకంగా దూరంగా ఉన్న విధములోనికి మార్చాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "" -"గోప్యతా కారణాల దృష్ట్యా స్థానము యొక్క ఖచ్చితత్వాన్ని ఎంపతి తగ్గించాలా వద్దా." +msgstr "గోప్యతా కారణాల దృష్ట్యా స్థానము యొక్క ఖచ్చితత్వాన్ని ఎంపతి తగ్గించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "ఎంపతి పరిచయము యొక్క అవతారమును చాట్ విండో ప్రతీక వలె ఉపయోగించాలా లేదా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "వెబ్ ఇన్‌స్పెక్టర్ వంటి వెబ్‌కిట్ డెవలపర్ సాధనములు చేతనము చేయవలెనా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." msgstr "" -"స్వయంచాలకంగా అననుసంధానించుటకు/మళ్ళీ అనుసంధానించుటకు అనుసంధాన నిర్వాహకాలను " -"ఉపయోగించాలా వద్దా." +"స్వయంచాలకంగా అననుసంధానించుటకు/మళ్ళీ అనుసంధానించుటకు అనుసంధాన నిర్వాహకాలను ఉపయోగించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "" "Whether to check words typed against the languages you want to check with." -msgstr "" -"మీరు పరిశీలించాలనుకున్న భాషలకు ప్రవేశపెట్టిన పదములను పరిశీలించాలా వద్దా." +msgstr "మీరు పరిశీలించాలనుకున్న భాషలకు ప్రవేశపెట్టిన పదములను పరిశీలించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to convert smileys into graphical images in conversations." msgstr "సంభాషణలలో చిరునవ్వులను గ్రాఫికల్ బొమ్మలలోనికి మార్చాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "నాడీధ్వనులను క్రియాశీల పరుచుటకు, అతి ధ్వనుల నిరుపయోగ పరుచు ఫిల్టరు" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Whether to play a sound to notify of contacts logging into the network." -msgstr "" -"నెట్‌వర్కులో ప్రవేశించినపుడు పరిచయములకు సూచించుటకు శబ్దము వినిపించాలా వద్దా." +msgstr "నెట్‌వర్కులో ప్రవేశించినపుడు పరిచయములకు సూచించుటకు శబ్దము వినిపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "" "Whether to play a sound to notify of contacts logging out of the network." -msgstr "" -"నెట్‌వర్కు నుండి నిష్క్రమించినపుడు పరిచయములకు శబ్ధమును వినిపించాలా వద్దా." +msgstr "నెట్‌వర్కు నుండి నిష్క్రమించినపుడు పరిచయములకు శబ్ధమును వినిపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Whether to play a sound to notify of events." msgstr "ఘటనలను తెలియజేయుటకు శబ్దమును వినిపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to play a sound to notify of incoming messages." msgstr "లోనికివచ్చు సందేశములను తెలియజేయుటకు శబ్దమును వినిపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Whether to play a sound to notify of new conversations." msgstr "కొత్త సంభాషణలను తెలియచేయుటకు శబ్ధమును వినిపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to play a sound to notify of outgoing messages." msgstr "బయటకువెళ్ళు సందేశములను తెలియచేయుటకు శబ్దమును వినిపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to play a sound when logging into a network." msgstr "నెట్‌వర్కునందు ప్రవేశించినపుడు శబ్దమును వినిపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to play a sound when logging out of a network." msgstr "నెట్‌వర్కు నుండి నిష్క్రమించునపుడు శబ్దమును వినిపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Whether to play sound notifications when away or busy." msgstr "దూరంగావున్నప్పుడు లేదా తీరికలేనపుడు శబ్ద ప్రకటనలను వినిపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "Whether to show a popup notification when a contact goes offline." msgstr "ఒక పరిచయం ఆఫ్‌లైన్‌కు వెళ్ళినప్పుడు పైకివచ్చు ప్రకటనను చూపాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Whether to show a popup notification when a contact goes online." msgstr "ఒక పరిచయం ఆన్‌లైన్‌కు వచ్చినప్పుడు పైకివచ్చు ప్రకటన చూపాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." msgstr "" -"ఒకవేళ చాట్ ఇదివరకే తెరిచివుండి, దృష్టి సారించకపోతే, ఒక కొత్త సందేశము " -"వచ్చినప్పుడు పైకివచ్చు ప్రకటనను " +"ఒకవేళ చాట్ ఇదివరకే తెరిచివుండి, దృష్టి సారించకపోతే, ఒక కొత్త సందేశము వచ్చినప్పుడు పైకివచ్చు ప్రకటనను " "చూపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "Whether to show a popup notification when receiving a new message." msgstr "ఒక కొత్త సందేశము వచ్చినప్పుడు పైకివచ్చు ప్రకటనని చూపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Whether to show account balances in the contact list." msgstr "పరిచయ జాబితానందు ఖాతా సమతుల్యతను చూపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." -msgstr "" -"చాట్ విండోలు మరియు పరిచయ జాబితాలలో పరిచయముల కోసం అవతారములను చూపించాలా వద్దా." +msgstr "చాట్ విండోలు మరియు పరిచయ జాబితాలలో పరిచయముల కోసం అవతారములను చూపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to show contacts that are offline in the contact list." msgstr "పరిచయ జాబితా నందు ఆఫ్‌లైనులో ఉన్న పరిచయాలను చూపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Whether to show popup notifications when away or busy." msgstr "దూరంగా లేదా తీరికలేనపుడు పైకివచ్చు ప్రకటనలను చూపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "Whether to show protocols for contacts in the contact list." msgstr "పరిచయ జాబితాలో పరిచయముల కొరకు ప్రోటోకాల్సును చూపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "Whether to show the contact list in chat rooms." msgstr "చాట్ గదులలో పరిచయ జాబితాను చూపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether to show the contact list in compact mode." msgstr "పరిచయ జాబితాను కాంపాక్టు విధములో చూపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." -msgstr "" -"ప్రధాన విండోను శీర్షిక పట్టీనందు 'x' బటన్‌తో మూసివేయునపుడు సందేశపు డైలాగ్ " -"చూపించాలా వద్దా." +msgstr "ప్రధాన విండోను శీర్షిక పట్టీనందు 'x' బటన్‌తో మూసివేయునపుడు సందేశపు డైలాగ్ చూపించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 msgid "Whether to use the theme for chat rooms." msgstr "చాట్ గదుల కొరకు థీమును ఉపయోగించాలా వద్దా." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's name with the value \"name\". A value of \"state\" will sort " "the contact list by state." msgstr "" -"పరిచయ జాబితాను క్రమబద్దీకరిస్తున్నప్పుడు ఏ విధానాన్ని ఉపయోగించాలి. పరిచయాల " -"పేరును \"name\" విలువతో " -"ఉపయోగించి క్రమబద్దీకరించుట అప్రమేయం. విలువ \"state\" అనునది పరిచయ జాబితాను " -"స్థితిని బట్టి " +"పరిచయ జాబితాను క్రమబద్దీకరిస్తున్నప్పుడు ఏ విధానాన్ని ఉపయోగించాలి. పరిచయాల పేరును \"name\" విలువతో " +"ఉపయోగించి క్రమబద్దీకరించుట అప్రమేయం. విలువ \"state\" అనునది పరిచయ జాబితాను స్థితిని బట్టి " "క్రమబద్దీకరిస్తుంది." #: ../data/empathy-accounts.desktop.in.in.h:1 @@ -486,35 +495,31 @@ msgstr "సందేశకము మరియు VoIP ఖాతాలు" msgid "File transfer completed, but the file was corrupted" msgstr "ఫైల్ బదిలీ పూర్తయినది, కాని ఫైల్ పాడైనది" -#: ../libempathy/empathy-ft-handler.c:1113 +#: ../libempathy/empathy-ft-handler.c:1111 msgid "File transfer not supported by remote contact" msgstr "ఫైల్ బదిలీ దూరస్థ పరిచయం ద్వారా సహకరించబడుటలేదు" -#: ../libempathy/empathy-ft-handler.c:1169 +#: ../libempathy/empathy-ft-handler.c:1167 msgid "The selected file is not a regular file" msgstr "ఎంచుకున్న ఫైల్ సాధారణ ఫైల్ కాదు" -#: ../libempathy/empathy-ft-handler.c:1178 +#: ../libempathy/empathy-ft-handler.c:1176 msgid "The selected file is empty" msgstr "ఎంచుకున్న ఫైల్ ఖాళీది" -#: ../libempathy/empathy-message.c:342 ../src/empathy-call-observer.c:130 +#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131 #, c-format msgid "Missed call from %s" msgstr "%s నుండి మిస్సుడ్ కాల్ వచ్చింది" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:346 -#, fuzzy, c-format -#| msgid "Call with %s" +#: ../libempathy/empathy-message.c:419 msgid "Called %s" -msgstr "%sతో కాల్ చేయి" +msgstr "%s పిలవబడినది" -#: ../libempathy/empathy-message.c:349 -#, fuzzy, c-format -#| msgid "Missed call from %s" +#: ../libempathy/empathy-message.c:422 msgid "Call from %s" -msgstr "%s నుండి మిస్సుడ్ కాల్ వచ్చింది" +msgstr "%s నుపిలువుము" #: ../libempathy/empathy-tp-file.c:268 msgid "Socket type not supported" @@ -544,162 +549,161 @@ msgstr "ఫైలును బదిలీచేయుటకు ప్రయత msgid "The other participant is unable to transfer the file" msgstr "పాల్గొన్న ఇతరులు ఫైల్ బదిలీచేయలేకపోతున్నారు" -#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:325 +#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312 msgid "Unknown reason" msgstr "తెలియని కారణం" -#: ../libempathy/empathy-utils.c:246 +#: ../libempathy/empathy-utils.c:232 msgid "Available" msgstr "అందుబాటులోవున్నాను" -#: ../libempathy/empathy-utils.c:248 +#: ../libempathy/empathy-utils.c:234 msgid "Busy" msgstr "తీరికలేదు" -#: ../libempathy/empathy-utils.c:251 +#: ../libempathy/empathy-utils.c:237 msgid "Away" msgstr "దూరంగా ఉన్నాను" -#: ../libempathy/empathy-utils.c:253 +#: ../libempathy/empathy-utils.c:239 msgid "Invisible" msgstr "అదృశ్యముగా ఉన్నాను" -#: ../libempathy/empathy-utils.c:255 +#: ../libempathy/empathy-utils.c:241 msgid "Offline" msgstr "ఆఫ్‌లైనులో ఉన్నాను" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:258 +#: ../libempathy/empathy-utils.c:244 msgctxt "presence" msgid "Unknown" msgstr "తెలియదు" -#: ../libempathy/empathy-utils.c:297 +#: ../libempathy/empathy-utils.c:284 msgid "No reason specified" msgstr "ఏ కారణము తెలుపలేదు" -#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 msgid "Status is set to offline" msgstr "స్థితి ఆఫ్‌లైన్‌కు అమర్చబడింది." -#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:335 -#: ../libempathy-gtk/empathy-call-utils.c:47 +#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy-gtk/empathy-call-utils.c:49 msgid "Network error" msgstr "నెట్‌వర్కు దోషము" -#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:337 +#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 msgid "Authentication failed" msgstr "ప్రామాణీకరణ విఫలమైంది" -#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:339 +#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 msgid "Encryption error" msgstr "ఎన్‌క్రిప్షన్ దోషము" -#: ../libempathy/empathy-utils.c:307 +#: ../libempathy/empathy-utils.c:294 msgid "Name in use" msgstr "పేరు వాడుకలో ఉంది" -#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 +#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 msgid "Certificate not provided" msgstr "ధృవీకరణపత్రం సమకూర్చబడలేదు" -#: ../libempathy/empathy-utils.c:311 ../libempathy/empathy-utils.c:343 +#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 msgid "Certificate untrusted" msgstr "ధృవీకరణపత్రం నమ్మలేనిది" -#: ../libempathy/empathy-utils.c:313 ../libempathy/empathy-utils.c:345 +#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 msgid "Certificate expired" msgstr "ధృవీకరణపత్రం గడువు ముగిసినది" -#: ../libempathy/empathy-utils.c:315 ../libempathy/empathy-utils.c:347 +#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 msgid "Certificate not activated" msgstr "ధృవీకరణపత్రాన్ని ఉత్తేజపరచలేదు" -#: ../libempathy/empathy-utils.c:317 ../libempathy/empathy-utils.c:349 +#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 msgid "Certificate hostname mismatch" msgstr "ధృవీకరణపత్ర అతిథ్యపేరుతో సరిపోలడంలేదు" -#: ../libempathy/empathy-utils.c:319 ../libempathy/empathy-utils.c:351 +#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 msgid "Certificate fingerprint mismatch" msgstr "ధృవీకరణపత్రం వేలిముద్ర సరిపోలడంలేదు" -#: ../libempathy/empathy-utils.c:321 ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 msgid "Certificate self-signed" msgstr "ధృవీకరణపత్రం స్వంతగా-సంతకం చేసినది" -#: ../libempathy/empathy-utils.c:323 +#: ../libempathy/empathy-utils.c:310 msgid "Certificate error" msgstr "ధృవీకరణపత్ర దోషము" -#: ../libempathy/empathy-utils.c:357 +#: ../libempathy/empathy-utils.c:344 msgid "Encryption is not available" msgstr "ఎన్‌క్రిప్షన్ అందుబాటులో లేదు" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:346 msgid "Certificate is invalid" msgstr "ధృవీకరణపత్రం చెల్లనిది" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:348 msgid "Connection has been refused" msgstr "అనుసంధానము తిరస్కరించబడింది" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:350 msgid "Connection can't be established" msgstr "అనుసంధానమును స్థాపించలేకపోయింది" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:352 msgid "Connection has been lost" msgstr "అనుసంధానమును కోల్పోయింది" -#: ../libempathy/empathy-utils.c:367 +#: ../libempathy/empathy-utils.c:354 msgid "This resource is already connected to the server" msgstr "ఈ వనరు ఇంతకుముందే సేవకానికి అనుసంధానించబడింది" -#: ../libempathy/empathy-utils.c:369 +#: ../libempathy/empathy-utils.c:356 msgid "" "Connection has been replaced by a new connection using the same resource" -msgstr "" -"అనుసంధానము అదే వనరుని ఉపయోగించుకుని ఒక కొత్త అనుసంధానముచే పునఃస్థాపించబడింది" +msgstr "అనుసంధానము అదే వనరుని ఉపయోగించుకుని ఒక కొత్త అనుసంధానముచే పునఃస్థాపించబడింది" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:359 msgid "The account already exists on the server" msgstr "సేవకములో ఈ ఖాతా ఇదివరకే ఉన్నది" -#: ../libempathy/empathy-utils.c:374 +#: ../libempathy/empathy-utils.c:361 msgid "Server is currently too busy to handle the connection" msgstr "అనుసంధానమును నిర్వహించుటకు సేవకానికి ప్రస్తుతము తీరికలేదు" -#: ../libempathy/empathy-utils.c:376 +#: ../libempathy/empathy-utils.c:363 msgid "Certificate has been revoked" msgstr "దృవీకరణపత్రం తొలగించబడింది" -#: ../libempathy/empathy-utils.c:378 +#: ../libempathy/empathy-utils.c:365 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" -msgstr "" -"సురక్షితముకాని సైఫర్ అల్గారిథమ్ లేదా క్రిప్టోగ్రాఫికల్లీ బలహీనమైన " -"ధృవీకరణపత్రాన్ని వాడుతుంది" +msgstr "సురక్షితముకాని సైఫర్ అల్గారిథమ్ లేదా క్రిప్టోగ్రాఫికల్లీ బలహీనమైన ధృవీకరణపత్రాన్ని వాడుతుంది" -#: ../libempathy/empathy-utils.c:381 +#: ../libempathy/empathy-utils.c:368 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" msgstr "" +"సర్వర్ సర్టిఫికెట్, లేదా సర్వర్ సర్టిఫికేట్ శ్రేణి లోతైన యొక్క పొడవు, గూఢ లైబ్రరీ ద్వారా విధించబడిన పరిమితులను " +"దాటకుండా" -#: ../libempathy/empathy-utils.c:544 +#: ../libempathy/empathy-utils.c:529 #: ../libempathy-gtk/empathy-contact-list-store.h:73 msgid "People Nearby" msgstr "దగ్గరలోని వ్యక్తులు" -#: ../libempathy/empathy-utils.c:549 +#: ../libempathy/empathy-utils.c:534 msgid "Yahoo! Japan" msgstr "యాహూ! జపాన్" -#: ../libempathy/empathy-utils.c:578 +#: ../libempathy/empathy-utils.c:563 msgid "Google Talk" msgstr "గూగుల్ టాక్" -#: ../libempathy/empathy-utils.c:579 +#: ../libempathy/empathy-utils.c:564 msgid "Facebook Chat" msgstr "ఫేస్‌బుక్ చాట్" @@ -749,72 +753,79 @@ msgstr[1] "%d నెలల క్రితం" msgid "in the future" msgstr "భవిష్యత్తులో" -#: ../libempathy-gtk/empathy-account-chooser.c:539 -#, fuzzy -#| msgid "Accounts" +#: ../libempathy-gtk/empathy-account-chooser.c:540 msgid "All accounts" -msgstr "ఖాతాలు" +msgstr "ఖాతాలు అన్నియు" -#: ../libempathy-gtk/empathy-account-widget.c:681 +#: ../libempathy-gtk/empathy-account-widget.c:694 #: ../src/empathy-import-widget.c:321 msgid "Account" msgstr "ఖాతా" -#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../libempathy-gtk/empathy-account-widget.c:695 msgid "Password" msgstr "సంకేతపదం" -#: ../libempathy-gtk/empathy-account-widget.c:683 +#: ../libempathy-gtk/empathy-account-widget.c:696 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "సేవకము" -#: ../libempathy-gtk/empathy-account-widget.c:684 +#: ../libempathy-gtk/empathy-account-widget.c:697 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "పోర్టు" -#: ../libempathy-gtk/empathy-account-widget.c:756 -#: ../libempathy-gtk/empathy-account-widget.c:813 +#: ../libempathy-gtk/empathy-account-widget.c:769 +#: ../libempathy-gtk/empathy-account-widget.c:826 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1154 -#, c-format -msgid "The account %s is edited via My Web Accounts." -msgstr "%s అనే ఖాతా నా వెబ్ ఖాతాల ద్వారా సవరించబడింది." +#: ../libempathy-gtk/empathy-account-widget.c:1192 +msgid "My Web Accounts" +msgstr "నా వెబ్ ఖాతాలు" + +#: ../libempathy-gtk/empathy-account-widget.c:1209 +msgid "The account %s is edited via %s." +msgstr "%s అనే ఖాతా,%s ద్వారా సవరించబడింది." -#: ../libempathy-gtk/empathy-account-widget.c:1160 +#: ../libempathy-gtk/empathy-account-widget.c:1215 #, c-format msgid "The account %s cannot be edited in Empathy." msgstr "%s ఖాతాను ఎంపతిలో సవరించుట వీలుకాదు." -#: ../libempathy-gtk/empathy-account-widget.c:1180 +#: ../libempathy-gtk/empathy-account-widget.c:1234 msgid "Launch My Web Accounts" msgstr "నా వెబ్ ఖాతాలను ప్రారంభించు" -#: ../libempathy-gtk/empathy-account-widget.c:1518 +#. general handler +#: ../libempathy-gtk/empathy-account-widget.c:1242 +msgid "Edit %s" +msgstr "సవరణ " + +#: ../libempathy-gtk/empathy-account-widget.c:1592 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "వాడుకరి పేరు:" -#: ../libempathy-gtk/empathy-account-widget.c:1836 +#: ../libempathy-gtk/empathy-account-widget.c:1910 msgid "A_pply" msgstr "అనువర్తించు (_p)" -#: ../libempathy-gtk/empathy-account-widget.c:1866 +#: ../libempathy-gtk/empathy-account-widget.c:1940 msgid "L_og in" msgstr "ప్రవేశించు (_J)" -#: ../libempathy-gtk/empathy-account-widget.c:1940 +#: ../libempathy-gtk/empathy-account-widget.c:2014 msgid "This account already exists on the server" msgstr "సేవకములో ఈ ఖాతా ఇంతకుముందే ఉన్నది" -#: ../libempathy-gtk/empathy-account-widget.c:1943 +#: ../libempathy-gtk/empathy-account-widget.c:2017 msgid "Create a new account on the server" msgstr "ఈ సేవకము పై ఒక కొత్త ఖాతాను సృష్టించు" -#: ../libempathy-gtk/empathy-account-widget.c:2135 +#: ../libempathy-gtk/empathy-account-widget.c:2209 msgid "Ca_ncel" msgstr "రద్దుచేయి (_n)" @@ -823,19 +834,19 @@ msgstr "రద్దుచేయి (_n)" #. * 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:2413 +#: ../libempathy-gtk/empathy-account-widget.c:2487 #, c-format msgid "%1$s on %2$s" msgstr "%2$s పై %1$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2439 +#: ../libempathy-gtk/empathy-account-widget.c:2513 #, c-format msgid "%s Account" msgstr "%s ఖాతా" -#: ../libempathy-gtk/empathy-account-widget.c:2443 +#: ../libempathy-gtk/empathy-account-widget.c:2517 msgid "New account" msgstr "కొత్త ఖాతా" @@ -847,6 +858,7 @@ msgstr "ఉదాహరణ: నా తెరపేరు" #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 @@ -956,76 +968,84 @@ msgstr "మీ ICQ UIN ఏమిటి?" msgid "What is your ICQ password?" msgstr "మీ ICQ సంకేతపదము ఏమిటి?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:184 -#: ../libempathy-gtk/empathy-account-widget-sip.c:217 +#: ../libempathy-gtk/empathy-account-widget-sip.c:206 +#: ../libempathy-gtk/empathy-account-widget-sip.c:239 msgid "Auto" msgstr "స్వయం" -#: ../libempathy-gtk/empathy-account-widget-sip.c:187 +#: ../libempathy-gtk/empathy-account-widget-sip.c:209 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:190 +#: ../libempathy-gtk/empathy-account-widget-sip.c:212 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:193 +#: ../libempathy-gtk/empathy-account-widget-sip.c:215 msgid "TLS" msgstr "TLS" #. translators: this string is very specific to SIP's internal; maybe #. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:222 +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 msgid "Register" msgstr "నమోదుచేసుకొను" #. translators: this string is very specific to SIP's internal; maybe #. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:227 +#: ../libempathy-gtk/empathy-account-widget-sip.c:249 msgid "Options" msgstr "ఐచ్ఛికాలు" -#: ../libempathy-gtk/empathy-account-widget-sip.c:230 +#: ../libempathy-gtk/empathy-account-widget-sip.c:252 msgid "None" msgstr "ఏదీకాదు" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 msgid "Character set:" msgstr "అక్షర సమితి:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +msgid "" +"Most IRC servers don't need a password, so if you're not sure, don't enter a " +"password." +msgstr "" +"చాలా IRC సర్వర్లు మీరు భావిస్తున్నారా కాదు మీరు కనుక, ఒక పాస్వర్డ్ను ఎంటర్ చేయకండి, పాస్వర్డ్ అవసరం " +"లేదు." + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 msgid "Network" msgstr "నెట్ వర్క్" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "Network:" msgstr "నెట్‌వర్కు:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "మారుపేరు:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Password:" msgstr "సంకేతపదం:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 msgid "Quit message:" msgstr "నిష్క్రమణ సందేశం:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 msgid "Real name:" msgstr "అసలు పేరు:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Servers" msgstr "సేవకాలు" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "What is your IRC nickname?" msgstr "మీ IRC మారుపేరు ఏమిటి?" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Which IRC network?" msgstr "ఏ IRC నెట్‌వర్క్?" @@ -1067,8 +1087,7 @@ msgid "" msgstr "" "ఇది మీ వాడుకరిపేరు, మీ సాధారణ ఫేస్‌బుక్ ప్రవేశం కాదు.\n" "ఒకవేళ మీరు facebook.com/badger, enter badger.\n" -"మీకు ఒకవేళ ఒక ఫేస్‌బుక్ వాడుకరిపేరు లేకుంటే ఈ పేజీని వాడి ఒకటి సృష్టించండి." #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 @@ -1133,7 +1152,7 @@ msgstr "మొదటి పేరు (_F):" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Jabber ID:" -msgstr "జబ్బర్ ఐడి (_J):" +msgstr "జాబ్బర్ ఐడి (_J):" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 msgid "_Last Name:" @@ -1169,23 +1188,23 @@ msgstr "విరామం (సెకన్లలో)" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 msgid "Keep-Alive Options" -msgstr "" +msgstr "ఇచ్ఛాపూర్వకాలను అలాగే వుంచండి" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 msgid "Loose Routing" -msgstr "" +msgstr "దారిమళ్ళింపును వదిలివేయండి" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 msgid "Mechanism:" -msgstr "" +msgstr "యాంత్రిక తత్వం:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 msgid "Miscellaneous Options" -msgstr "" +msgstr "బహువిధాలైన ఇచ్ఛాపూర్వకాలు" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 msgid "NAT Traversal Options" -msgstr "" +msgstr "NAT ట్రావెర్సల్ ఐచ్ఛికాలు" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 msgid "Port:" @@ -1209,14 +1228,18 @@ msgid "Transport:" msgstr "ట్రాన్స్‍పోర్ట్:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +msgid "Use this account to call _landlines and mobile phones" +msgstr "లండులింస్ మరియు మొబైల్ ఫోన్లు కాల్ ఈ ఖాతాను ఉపయోగించండి" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 msgid "What is your SIP account password?" msgstr "మీ SIP ఖాతా సంకేతపదం ఏమిటి?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "మీ SIP ప్రవేశ ఐడి ఏమిటి?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "_Username:" msgstr "వాడుకరిపేరు (_U):" @@ -1240,36 +1263,37 @@ msgstr "యాహూ! ఐడి (_D):" msgid "_Room List locale:" msgstr "గది జాబితా స్థానికం (_R):" -#: ../libempathy-gtk/empathy-avatar-chooser.c:474 -#: ../libempathy-gtk/empathy-avatar-chooser.c:559 +#: ../libempathy-gtk/empathy-avatar-chooser.c:471 +#: ../libempathy-gtk/empathy-avatar-chooser.c:556 msgid "Couldn't convert image" msgstr "బొమ్మను మార్చలేకపోయింది" -#: ../libempathy-gtk/empathy-avatar-chooser.c:475 +#: ../libempathy-gtk/empathy-avatar-chooser.c:472 msgid "None of the accepted image formats are supported on your system" msgstr "మీ వ్యవస్థ నందు ఆమోదించిన ఏ బొమ్మ ఫార్మేట్లు సహకరించుటలేదు" -#: ../libempathy-gtk/empathy-avatar-chooser.c:822 -msgid "Couldn't save pixbuf to png" -msgstr "pixbuf నుండి png కి భద్రపరుచవద్దు" +#: ../libempathy-gtk/empathy-avatar-chooser.c:819 +#| msgid "Couldn't save pixbuf to png" +msgid "Couldn't save picture to file" +msgstr "దస్రం లొని చిత్రాన్ని భద్రపరుచ వద్దు " -#: ../libempathy-gtk/empathy-avatar-chooser.c:938 +#: ../libempathy-gtk/empathy-avatar-chooser.c:939 msgid "Select Your Avatar Image" msgstr "మీ అవతారము బొమ్మను ఎంచుకోండి" -#: ../libempathy-gtk/empathy-avatar-chooser.c:942 +#: ../libempathy-gtk/empathy-avatar-chooser.c:947 msgid "Take a picture..." msgstr "ఒక చిత్రాన్ని తీయండి..." -#: ../libempathy-gtk/empathy-avatar-chooser.c:945 +#: ../libempathy-gtk/empathy-avatar-chooser.c:960 msgid "No Image" msgstr "బొమ్మ లేదు" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1005 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1017 msgid "Images" msgstr "బొమ్మలు" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1009 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1021 msgid "All Files" msgstr "అన్ని ఫైళ్ళు" @@ -1277,104 +1301,101 @@ msgstr "అన్ని ఫైళ్ళు" msgid "Click to enlarge" msgstr "పెద్దదిచేయుటకు నొక్కండి" -#: ../libempathy-gtk/empathy-call-utils.c:42 -#: ../libempathy-gtk/empathy-call-utils.c:58 -#, fuzzy +#: ../libempathy-gtk/empathy-call-utils.c:44 +#: ../libempathy-gtk/empathy-call-utils.c:60 #| msgid "There was an error while creating the account." msgid "There was an error starting the call" -msgstr "ఖాతాను సృష్టించునప్పుడు అక్కడ ఒక దోషము వుంది." +msgstr "కాల్ ప్రారంభములో ఒక దోషం ఉంది" -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "The specified contact doesn't support calls" -msgstr "" +msgstr "పేర్కొన్న సంప్రదించండి కాల్స్ మద్దతు ఇవ్వదు" -#: ../libempathy-gtk/empathy-call-utils.c:51 -#, fuzzy +#: ../libempathy-gtk/empathy-call-utils.c:53 #| msgid "The selected contact is offline." msgid "The specified contact is offline" -msgstr "ఎంచుకున్న పరిచయము ఆఫ్‌లైనులో ఉంది." +msgstr "పేర్కొన్న పరిచయము ఆఫ్‌లైనులో ఉంది." -#: ../libempathy-gtk/empathy-call-utils.c:53 -#, fuzzy +#: ../libempathy-gtk/empathy-call-utils.c:55 #| msgid "The selected contact is offline." msgid "The specified contact is not valid" -msgstr "ఎంచుకున్న పరిచయము ఆఫ్‌లైనులో ఉంది." +msgstr "పేర్కొన్న సంప్రదించండి చెల్లుబాటులో లేదు" -#: ../libempathy-gtk/empathy-call-utils.c:55 -#, fuzzy +#: ../libempathy-gtk/empathy-call-utils.c:57 #| msgid "Topic not supported on this conversation" msgid "Emergency calls are not supported on this protocol" -msgstr "ఈ సంభాషణ పై విషయము సహకరించుట లేదు" +msgstr " అత్యవసర కాల్స్ ఈ నియమావళి మద్దతు లేదు" -#: ../libempathy-gtk/empathy-chat.c:695 +#: ../libempathy-gtk/empathy-chat.c:704 msgid "Failed to open private chat" msgstr "రహస్య చాట్‌ని తెరుచుటలో విఫలమైంది" -#: ../libempathy-gtk/empathy-chat.c:756 +#: ../libempathy-gtk/empathy-chat.c:765 msgid "Topic not supported on this conversation" msgstr "ఈ సంభాషణ పై విషయము సహకరించుట లేదు" -#: ../libempathy-gtk/empathy-chat.c:762 +#: ../libempathy-gtk/empathy-chat.c:771 msgid "You are not allowed to change the topic" msgstr "విషయమును మార్చుటకు మీరు అనుమతించబడరు" -#: ../libempathy-gtk/empathy-chat.c:966 +#: ../libempathy-gtk/empathy-chat.c:975 #, c-format msgid "“%s” is not a valid contact ID" msgstr "“%s” అనేది చెల్లని పరిచయపు ఐడి" -#: ../libempathy-gtk/empathy-chat.c:1023 +#: ../libempathy-gtk/empathy-chat.c:1060 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: ప్రస్తుత సంభాషణలోని అన్ని సందేశాలను తుడిచివేయి" -#: ../libempathy-gtk/empathy-chat.c:1026 +#: ../libempathy-gtk/empathy-chat.c:1063 msgid "/topic : set the topic of the current conversation" msgstr "/topic : ప్రస్తుత సంభాషణ యొక్క విషయమును అమర్చు" -#: ../libempathy-gtk/empathy-chat.c:1029 +#: ../libempathy-gtk/empathy-chat.c:1066 msgid "/join : join a new chat room" msgstr "/join : ఒక కొత్త చాట్ గదిలో చేరు" -#: ../libempathy-gtk/empathy-chat.c:1032 +#: ../libempathy-gtk/empathy-chat.c:1069 msgid "/j : join a new chat room" msgstr "/j : ఒక కొత్త చాట్ గదిలో చేరు" -#: ../libempathy-gtk/empathy-chat.c:1036 +#: ../libempathy-gtk/empathy-chat.c:1073 msgid "" "/part [] []: leave the chat room, by default the " "current one" msgstr "" -"/part [] []: ప్రస్తుతపు దానితో అప్రమేయముగా చాట్ గదిని " -"వదిలివెళ్ళు" +"/part [] []: ప్రస్తుతపు దానితో అప్రమేయముగా చాట్ గదిని వదిలివెళ్ళు" -#: ../libempathy-gtk/empathy-chat.c:1040 +#: ../libempathy-gtk/empathy-chat.c:1077 msgid "/query []: open a private chat" msgstr "/query []: ఒక గోప్య చాట్‌ని తెరువు" -#: ../libempathy-gtk/empathy-chat.c:1043 +#: ../libempathy-gtk/empathy-chat.c:1080 msgid "/msg : open a private chat" msgstr "/msg : ఒక గోప్య చాట్‌ని తెరువు" -#: ../libempathy-gtk/empathy-chat.c:1046 +#: ../libempathy-gtk/empathy-chat.c:1083 msgid "/nick : change your nickname on the current server" msgstr "/nick : ప్రస్తుత సేవకములో మీ మారుపేరుని మార్చు" -#: ../libempathy-gtk/empathy-chat.c:1049 +#: ../libempathy-gtk/empathy-chat.c:1086 msgid "/me : send an ACTION message to the current conversation" -msgstr "" +msgstr "/me :ప్రస్తుత సంభాషణకు ఒక ACTION సందేశాన్ని పంపేందుకు" -#: ../libempathy-gtk/empathy-chat.c:1052 +#: ../libempathy-gtk/empathy-chat.c:1089 msgid "" "/say : send 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 : ప్రస్తుత సంభాషణకు పంపండి. ఈ ఒక '/' తో మొదలయ్యే ఒక సందేశాన్ని " +"పంపడానికి ఉపయోగిస్తారు. ఉదాహరణకు: \"/ చేరడానికి / చెప్పే ఒక కొత్త చాట్ రూమ్ చేరడానికి ఉపయోగిస్తారు\"" -#: ../libempathy-gtk/empathy-chat.c:1057 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/whois : display information about a contact" -msgstr "" +msgstr "/ WHOIS : ఒక పరిచయాన్ని గురించి ప్రదర్శన సమాచారం" -#: ../libempathy-gtk/empathy-chat.c:1060 +#: ../libempathy-gtk/empathy-chat.c:1097 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1382,113 +1403,113 @@ msgstr "" "/help []: సహకారము ఉన్న అన్ని ఆదేశాలను చూపిస్తుంది. ఒకవేళ " "నిర్వచించబడినట్టయితే, దాని వాడుకని చూపించు." -#: ../libempathy-gtk/empathy-chat.c:1070 +#: ../libempathy-gtk/empathy-chat.c:1114 #, c-format msgid "Usage: %s" msgstr "వాడుక: %s" -#: ../libempathy-gtk/empathy-chat.c:1109 +#: ../libempathy-gtk/empathy-chat.c:1159 msgid "Unknown command" msgstr "తెలియని ఆదేశము" -#: ../libempathy-gtk/empathy-chat.c:1235 +#: ../libempathy-gtk/empathy-chat.c:1285 msgid "Unknown command; see /help for the available commands" msgstr "తెలియని ఆదేశము; అందుబాటులోవున్న ఆదేశముల కోసం /help చూడండి" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1393 +#: ../libempathy-gtk/empathy-chat.c:1455 msgid "insufficient balance to send message" msgstr "సందేశం పంపుటకు కావలసిన బ్యాలెన్స్ లేదు" -#: ../libempathy-gtk/empathy-chat.c:1395 +#: ../libempathy-gtk/empathy-chat.c:1457 msgid "not capable" -msgstr "" +msgstr "సామర్ధ్యాన్ని కలిగి లేదు" -#: ../libempathy-gtk/empathy-chat.c:1402 +#: ../libempathy-gtk/empathy-chat.c:1464 msgid "offline" msgstr "ఆఫ్‌లైన్" -#: ../libempathy-gtk/empathy-chat.c:1405 +#: ../libempathy-gtk/empathy-chat.c:1467 msgid "invalid contact" msgstr "చెల్లని పరిచయం" -#: ../libempathy-gtk/empathy-chat.c:1408 +#: ../libempathy-gtk/empathy-chat.c:1470 msgid "permission denied" msgstr "అనుమతి నిరాకరించబడింది" -#: ../libempathy-gtk/empathy-chat.c:1411 +#: ../libempathy-gtk/empathy-chat.c:1473 msgid "too long message" msgstr "మరీ పొడవైన సందేశము" -#: ../libempathy-gtk/empathy-chat.c:1414 +#: ../libempathy-gtk/empathy-chat.c:1476 msgid "not implemented" msgstr "అమలుపరుచబడలేదు" -#: ../libempathy-gtk/empathy-chat.c:1418 +#: ../libempathy-gtk/empathy-chat.c:1480 msgid "unknown" msgstr "తెలియదు" -#: ../libempathy-gtk/empathy-chat.c:1424 +#: ../libempathy-gtk/empathy-chat.c:1486 #, c-format msgid "Error sending message '%s': %s" msgstr "'%s' సందేశం పంపుటలో దోషము: %s" -#: ../libempathy-gtk/empathy-chat.c:1428 +#: ../libempathy-gtk/empathy-chat.c:1490 #, c-format msgid "Error sending message: %s" msgstr "సందేశం పంపడంలో దోషము: %s" -#: ../libempathy-gtk/empathy-chat.c:1489 ../src/empathy-chat-window.c:760 +#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761 msgid "Topic:" msgstr "విషయం:" -#: ../libempathy-gtk/empathy-chat.c:1501 +#: ../libempathy-gtk/empathy-chat.c:1563 #, c-format msgid "Topic set to: %s" msgstr "విషయం దీనికి అమర్చబడింది: %s" -#: ../libempathy-gtk/empathy-chat.c:1503 +#: ../libempathy-gtk/empathy-chat.c:1565 msgid "No topic defined" msgstr "ఏ విషయం నిర్వచించిలేదు" -#: ../libempathy-gtk/empathy-chat.c:2010 +#: ../libempathy-gtk/empathy-chat.c:2074 msgid "(No Suggestions)" msgstr "(ఏ సూచనలు లేవు)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2078 +#: ../libempathy-gtk/empathy-chat.c:2142 #, c-format msgid "Add '%s' to Dictionary" msgstr "'%s'ని నిఘంటువుకి చేర్చు" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2115 +#: ../libempathy-gtk/empathy-chat.c:2179 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "'%s'ని %s నిఘంటువుకి చేర్చు" -#: ../libempathy-gtk/empathy-chat.c:2172 +#: ../libempathy-gtk/empathy-chat.c:2249 msgid "Insert Smiley" msgstr "చిరునవ్వును చేర్చు" #. send button -#: ../libempathy-gtk/empathy-chat.c:2190 -#: ../libempathy-gtk/empathy-ui-utils.c:1756 +#: ../libempathy-gtk/empathy-chat.c:2267 +#: ../libempathy-gtk/empathy-ui-utils.c:1839 msgid "_Send" msgstr "పంపు (_S)" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2225 +#: ../libempathy-gtk/empathy-chat.c:2321 msgid "_Spelling Suggestions" msgstr "అక్షరక్రమం సూచనలు (_S)" -#: ../libempathy-gtk/empathy-chat.c:2314 +#: ../libempathy-gtk/empathy-chat.c:2410 msgid "Failed to retrieve recent logs" msgstr "ఇటీవలి చిట్టాలను పొందుటలో విఫలమైంది" -#: ../libempathy-gtk/empathy-chat.c:2425 +#: ../libempathy-gtk/empathy-chat.c:2547 #, c-format msgid "%s has disconnected" msgstr "%s అననుసంధానించారు" @@ -1496,12 +1517,12 @@ msgstr "%s అననుసంధానించారు" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2432 +#: ../libempathy-gtk/empathy-chat.c:2554 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s అనునది %2$s చేత బయటకు తోసివేయబడ్డారు" -#: ../libempathy-gtk/empathy-chat.c:2435 +#: ../libempathy-gtk/empathy-chat.c:2557 #, c-format msgid "%s was kicked" msgstr "%s తోసివేయబడ్డారు" @@ -1509,17 +1530,17 @@ msgstr "%s తోసివేయబడ్డారు" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2443 +#: ../libempathy-gtk/empathy-chat.c:2565 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s అనువారు %2$s చేత నిషేధించబడ్డారు" -#: ../libempathy-gtk/empathy-chat.c:2446 +#: ../libempathy-gtk/empathy-chat.c:2568 #, c-format msgid "%s was banned" msgstr "%s నిషేధించబడ్డారు" -#: ../libempathy-gtk/empathy-chat.c:2450 +#: ../libempathy-gtk/empathy-chat.c:2572 #, c-format msgid "%s has left the room" msgstr "%s గదిని వదిలివెళ్ళారు" @@ -1529,117 +1550,133 @@ msgstr "%s గదిని వదిలివెళ్ళారు" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2459 +#: ../libempathy-gtk/empathy-chat.c:2581 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2484 +#: ../libempathy-gtk/empathy-chat.c:2606 #, c-format msgid "%s has joined the room" msgstr "%s గదిలో చేరారు" -#: ../libempathy-gtk/empathy-chat.c:2509 +#: ../libempathy-gtk/empathy-chat.c:2631 #, c-format msgid "%s is now known as %s" msgstr "%s ఇప్పుడు %s వలె అయినారు" -#: ../libempathy-gtk/empathy-chat.c:2648 -#: ../src/empathy-streamed-media-window.c:1935 -#: ../src/empathy-event-manager.c:1261 ../src/empathy-call-window.c:1869 +#. 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:2784 +#: ../src/empathy-streamed-media-window.c:1894 +#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432 +#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527 msgid "Disconnected" msgstr "అననుసంధానించబడ్డారు" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3316 +#: ../libempathy-gtk/empathy-chat.c:3428 msgid "Would you like to store this password?" msgstr "ఈ సంకేతపదమును భద్రపరచాలనుకుంటున్నారా?" -#: ../libempathy-gtk/empathy-chat.c:3322 +#: ../libempathy-gtk/empathy-chat.c:3434 msgid "Remember" msgstr "గుర్తించుకొను" -#: ../libempathy-gtk/empathy-chat.c:3332 +#: ../libempathy-gtk/empathy-chat.c:3444 msgid "Not now" msgstr "ఇప్పుడు కాదు" -#: ../libempathy-gtk/empathy-chat.c:3376 +#: ../libempathy-gtk/empathy-chat.c:3488 msgid "Retry" msgstr "మరలా ప్రయత్నించు" -#: ../libempathy-gtk/empathy-chat.c:3380 +#: ../libempathy-gtk/empathy-chat.c:3492 msgid "Wrong password; please try again:" msgstr "సంకేతపదం తప్పు; దయచేసి మళ్ళీ ప్రయత్నించండి:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3510 +#: ../libempathy-gtk/empathy-chat.c:3622 msgid "This room is protected by a password:" msgstr "ఈ గది సంకేతపదముతో రక్షణ కలిగివుంది:" -#: ../libempathy-gtk/empathy-chat.c:3537 +#: ../libempathy-gtk/empathy-chat.c:3649 msgid "Join" msgstr "చేరు" -#: ../libempathy-gtk/empathy-chat.c:3739 ../src/empathy-event-manager.c:1282 -#: ../src/empathy-call-window.c:2125 +#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261 msgid "Connected" msgstr "అనుసంధానించబడ్డారు" -#: ../libempathy-gtk/empathy-chat.c:3794 +#: ../libempathy-gtk/empathy-chat.c:3906 msgid "Conversation" msgstr "సంభాషణ" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3799 +#: ../libempathy-gtk/empathy-chat.c:3911 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424 msgid "Unknown or invalid identifier" msgstr "తెలియని లేదా చెల్లని గుర్తింపకం" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426 msgid "Contact blocking temporarily unavailable" msgstr "పరిచయాన్ని నిరోధించుట తాత్కాలికంగా అందుబాటులోలేదు" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428 msgid "Contact blocking unavailable" msgstr "పరిచయాన్ని నిరోధించుట అందుబాటులోలేదు" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 msgid "Permission Denied" msgstr "అనుమతి నిరాకరించబడింది" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 msgid "Could not block contact" msgstr "పరిచయాన్ని నిరోధించలేకపోతుంది" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774 msgid "Edit Blocked Contacts" msgstr "నిరోధించబడిన పరిచయాలను సవరించు" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:521 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1495 +#: ../libempathy-gtk/empathy-individual-widget.c:1489 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" msgstr "ఖాతా:" +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2 +#| msgid "_Blocked Contacts" +msgid "Blocked Contacts" +msgstr "నిరోధించబడిన సంపర్కాలు" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 +#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-chatrooms-window.ui.h:3 +#| msgid "_Remove" +msgid "Remove" +msgstr "తీసివేయి " + #. Copy Link Address menu item #: ../libempathy-gtk/empathy-chat-text-view.c:320 -#: ../libempathy-gtk/empathy-theme-adium.c:1264 +#: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "లింకు చిరునామాను నకలుతీయు (_C)" #. Open Link menu item #: ../libempathy-gtk/empathy-chat-text-view.c:327 -#: ../libempathy-gtk/empathy-theme-adium.c:1271 +#: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "లింకును తెరువు (_O)" @@ -1670,18 +1707,18 @@ msgid "Block %s?" msgstr "%s నిరోధించాలా?" #: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#: ../libempathy-gtk/empathy-individual-dialogs.c:255 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" -msgstr "" +msgstr "మీరు మళ్ళీ మీరు సంప్రదించడం నుండి '% s' బ్లాక్ ఖచ్చితంగా?" #: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +#: ../libempathy-gtk/empathy-individual-dialogs.c:277 msgid "_Block" msgstr "నిరోధించు (_B)" #: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +#: ../libempathy-gtk/empathy-individual-dialogs.c:286 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "ఈ పరిచయము దుర్వినియోగాన్ని నివేదించు (_R)" @@ -1701,44 +1738,44 @@ msgstr "వాడుకరిని నిరోధించు (_B)" #: ../libempathy-gtk/empathy-contact-list-store.h:71 msgid "Ungrouped" -msgstr "" +msgstr "గుంపులో లేని" #: ../libempathy-gtk/empathy-contact-list-store.h:72 msgid "Favorite People" msgstr "ఇష్టమైన వ్యక్తులు (_F)" -#: ../libempathy-gtk/empathy-contact-list-view.c:1983 -#: ../libempathy-gtk/empathy-individual-view.c:2375 +#: ../libempathy-gtk/empathy-contact-list-view.c:1986 +#: ../libempathy-gtk/empathy-individual-view.c:2376 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "మీరు నిజంగా '%s' గుంపును తీసివేయాలనుకుంటున్నారా?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1985 -#: ../libempathy-gtk/empathy-individual-view.c:2378 +#: ../libempathy-gtk/empathy-contact-list-view.c:1988 +#: ../libempathy-gtk/empathy-individual-view.c:2379 msgid "Removing group" msgstr "గుంపును తీసివేస్తున్నది" #. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:2034 -#: ../libempathy-gtk/empathy-contact-list-view.c:2111 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 +#: ../libempathy-gtk/empathy-contact-list-view.c:2037 +#: ../libempathy-gtk/empathy-contact-list-view.c:2114 +#: ../libempathy-gtk/empathy-individual-view.c:2434 +#: ../libempathy-gtk/empathy-individual-view.c:2637 msgid "_Remove" msgstr "తీసివేయి (_R)" -#: ../libempathy-gtk/empathy-contact-list-view.c:2064 -#: ../libempathy-gtk/empathy-individual-view.c:2500 +#: ../libempathy-gtk/empathy-contact-list-view.c:2067 +#: ../libempathy-gtk/empathy-individual-view.c:2501 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "మీరు నిజంగానే '%s' పరిచయాన్ని తీసివేయాలనుకుంటున్నారా?" -#: ../libempathy-gtk/empathy-contact-list-view.c:2066 -#: ../libempathy-gtk/empathy-individual-view.c:2521 +#: ../libempathy-gtk/empathy-contact-list-view.c:2069 +#: ../libempathy-gtk/empathy-individual-view.c:2522 msgid "Removing contact" msgstr "పరిచయాన్ని తీసివేస్తున్నది" #: ../libempathy-gtk/empathy-contact-menu.c:220 -#: ../src/empathy-main-window.ui.h:14 +#: ../src/empathy-main-window-menubar.ui.h:14 msgid "_Add Contact…" msgstr "పరిచయాన్ని జతచేయి...(_A)" @@ -1747,48 +1784,48 @@ msgid "_Block Contact" msgstr "పరిచయాన్ని నిరోధించు (_B)" #: ../libempathy-gtk/empathy-contact-menu.c:329 -#: ../libempathy-gtk/empathy-individual-menu.c:547 -#: ../src/empathy-main-window.ui.h:16 +#: ../libempathy-gtk/empathy-individual-menu.c:758 +#: ../src/empathy-main-window-menubar.ui.h:16 msgid "_Chat" msgstr "చాట్ (_C)" #: ../libempathy-gtk/empathy-contact-menu.c:361 -#: ../libempathy-gtk/empathy-individual-menu.c:638 +#: ../libempathy-gtk/empathy-individual-menu.c:849 msgctxt "menu item" msgid "_Audio Call" msgstr "ఆడియో కాల్ (_A)" #: ../libempathy-gtk/empathy-contact-menu.c:394 -#: ../libempathy-gtk/empathy-individual-menu.c:682 +#: ../libempathy-gtk/empathy-individual-menu.c:894 msgctxt "menu item" msgid "_Video Call" msgstr "వీడియో కాల్ (_V)" #: ../libempathy-gtk/empathy-contact-menu.c:440 -#: ../libempathy-gtk/empathy-individual-menu.c:725 -#: ../src/empathy-main-window.ui.h:27 +#: ../libempathy-gtk/empathy-individual-menu.c:947 +#: ../src/empathy-main-window-menubar.ui.h:27 msgid "_Previous Conversations" msgstr "మునుపటి సంభాషణలు (_P)" #: ../libempathy-gtk/empathy-contact-menu.c:462 -#: ../libempathy-gtk/empathy-individual-menu.c:766 +#: ../libempathy-gtk/empathy-individual-menu.c:988 msgid "Send File" msgstr "ఫైలును పంపు" #: ../libempathy-gtk/empathy-contact-menu.c:485 -#: ../libempathy-gtk/empathy-individual-menu.c:808 +#: ../libempathy-gtk/empathy-individual-menu.c:1030 msgid "Share My Desktop" msgstr "నా డెస్క్‍టాప్‌ను పంచుకొను" #: ../libempathy-gtk/empathy-contact-menu.c:525 -#: ../libempathy-gtk/empathy-contact-widget.c:1890 -#: ../libempathy-gtk/empathy-individual-menu.c:843 -#: ../libempathy-gtk/empathy-individual-widget.c:1386 +#: ../libempathy-gtk/empathy-contact-widget.c:1887 +#: ../libempathy-gtk/empathy-individual-menu.c:1065 +#: ../libempathy-gtk/empathy-individual-widget.c:1372 msgid "Favorite" msgstr "ఇష్టాంశము" #: ../libempathy-gtk/empathy-contact-menu.c:554 -#: ../libempathy-gtk/empathy-individual-menu.c:871 +#: ../libempathy-gtk/empathy-individual-menu.c:1093 msgid "Infor_mation" msgstr "సమాచారము (_m)" @@ -1798,33 +1835,41 @@ msgid "_Edit" msgstr "సవరణ (_E)" #: ../libempathy-gtk/empathy-contact-menu.c:654 -#: ../libempathy-gtk/empathy-individual-menu.c:1058 -#: ../src/empathy-chat-window.c:1010 +#: ../libempathy-gtk/empathy-individual-menu.c:1284 +#: ../src/empathy-chat-window.c:1011 msgid "Inviting you to this room" msgstr "మిమ్మల్ని ఈ గదికి ఆహ్వానిస్తున్నారు" #: ../libempathy-gtk/empathy-contact-menu.c:685 -#: ../libempathy-gtk/empathy-individual-menu.c:1104 +#: ../libempathy-gtk/empathy-individual-menu.c:1330 msgid "_Invite to Chat Room" msgstr "చాట్ గదికి ఆహ్వానించు (_I)" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:514 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 msgid "Search contacts" msgstr "పరిచయాలను వెతుకు" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:544 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 msgid "Search: " msgstr "వెతుకు: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:602 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 msgid "_Add Contact" msgstr "పరిచయాన్ని జతచేయి...(_A)" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:620 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 msgid "No contacts found" msgstr "ఏ పరిచయాలు కనపడలేదు" +#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +msgid "Your message introducing yourself:" +msgstr "మీ సందేశం మిమ్మల్ని పరిచయం చెస్తుంది:" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +msgid "Please let me see when you're online. Thanks!" +msgstr "మీరు ఆన్లైన్ ఉన్నప్పుడు నన్ను చూడండి తెలియచేయండి. ధన్యవాదాలు!" + #: ../libempathy-gtk/empathy-contact-selector.c:129 msgid "Select a contact" msgstr "ఒక పరిచయాన్ని ఎంచుకొను" @@ -1877,153 +1922,153 @@ msgstr "దూరంగా ఉన్నపుడు సందేశము:" msgid "Channels:" msgstr "ఛానళ్ళు:" -#: ../libempathy-gtk/empathy-contact-widget.c:901 -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-contact-widget.c:897 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Country ISO Code:" msgstr "దేశము ISO కోడు:" -#: ../libempathy-gtk/empathy-contact-widget.c:903 -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-contact-widget.c:899 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Country:" msgstr "దేశము:" -#: ../libempathy-gtk/empathy-contact-widget.c:905 -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-contact-widget.c:901 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "State:" msgstr "రాష్ట్రము:" -#: ../libempathy-gtk/empathy-contact-widget.c:907 -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-contact-widget.c:903 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "City:" msgstr "పట్టణము:" -#: ../libempathy-gtk/empathy-contact-widget.c:909 -#: ../libempathy-gtk/empathy-individual-widget.c:503 +#: ../libempathy-gtk/empathy-contact-widget.c:905 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Area:" msgstr "ప్రాంతము:" -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:505 +#: ../libempathy-gtk/empathy-contact-widget.c:907 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "Postal Code:" msgstr "పోస్టల్ కోడ్:" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:507 +#: ../libempathy-gtk/empathy-contact-widget.c:909 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Street:" msgstr "వీధి:" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:509 +#: ../libempathy-gtk/empathy-contact-widget.c:911 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Building:" msgstr "భవనము:" -#: ../libempathy-gtk/empathy-contact-widget.c:917 -#: ../libempathy-gtk/empathy-individual-widget.c:511 +#: ../libempathy-gtk/empathy-contact-widget.c:913 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Floor:" msgstr "అంతస్థు:" -#: ../libempathy-gtk/empathy-contact-widget.c:919 -#: ../libempathy-gtk/empathy-individual-widget.c:513 +#: ../libempathy-gtk/empathy-contact-widget.c:915 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Room:" msgstr "గది:" -#: ../libempathy-gtk/empathy-contact-widget.c:921 -#: ../libempathy-gtk/empathy-individual-widget.c:515 +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Text:" msgstr "పాఠ్యము:" -#: ../libempathy-gtk/empathy-contact-widget.c:923 -#: ../libempathy-gtk/empathy-individual-widget.c:517 +#: ../libempathy-gtk/empathy-contact-widget.c:919 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Description:" msgstr "వివరణ:" -#: ../libempathy-gtk/empathy-contact-widget.c:925 -#: ../libempathy-gtk/empathy-individual-widget.c:519 +#: ../libempathy-gtk/empathy-contact-widget.c:921 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:927 -#: ../libempathy-gtk/empathy-individual-widget.c:521 +#: ../libempathy-gtk/empathy-contact-widget.c:923 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Accuracy Level:" msgstr "ఖచ్చితత్వ స్థాయి:" -#: ../libempathy-gtk/empathy-contact-widget.c:929 -#: ../libempathy-gtk/empathy-individual-widget.c:523 +#: ../libempathy-gtk/empathy-contact-widget.c:925 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Error:" msgstr "దోషము:" -#: ../libempathy-gtk/empathy-contact-widget.c:931 -#: ../libempathy-gtk/empathy-individual-widget.c:525 +#: ../libempathy-gtk/empathy-contact-widget.c:927 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Vertical Error (meters):" msgstr "నిలువు దోషము (మీటర్లు):" -#: ../libempathy-gtk/empathy-contact-widget.c:933 -#: ../libempathy-gtk/empathy-individual-widget.c:527 +#: ../libempathy-gtk/empathy-contact-widget.c:929 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Horizontal Error (meters):" msgstr "అడ్డ దోషము (మీటర్లు):" -#: ../libempathy-gtk/empathy-contact-widget.c:935 -#: ../libempathy-gtk/empathy-individual-widget.c:529 +#: ../libempathy-gtk/empathy-contact-widget.c:931 +#: ../libempathy-gtk/empathy-individual-widget.c:503 msgid "Speed:" msgstr "వేగము:" -#: ../libempathy-gtk/empathy-contact-widget.c:937 -#: ../libempathy-gtk/empathy-individual-widget.c:531 +#: ../libempathy-gtk/empathy-contact-widget.c:933 +#: ../libempathy-gtk/empathy-individual-widget.c:505 msgid "Bearing:" msgstr "బేరింగ్:" -#: ../libempathy-gtk/empathy-contact-widget.c:939 -#: ../libempathy-gtk/empathy-individual-widget.c:533 +#: ../libempathy-gtk/empathy-contact-widget.c:935 +#: ../libempathy-gtk/empathy-individual-widget.c:507 msgid "Climb Speed:" msgstr "ఎక్కు వేగము:" -#: ../libempathy-gtk/empathy-contact-widget.c:941 -#: ../libempathy-gtk/empathy-individual-widget.c:535 +#: ../libempathy-gtk/empathy-contact-widget.c:937 +#: ../libempathy-gtk/empathy-individual-widget.c:509 msgid "Last Updated on:" msgstr "చివరిగా నవీకరించబడింది:" -#: ../libempathy-gtk/empathy-contact-widget.c:943 -#: ../libempathy-gtk/empathy-individual-widget.c:537 +#: ../libempathy-gtk/empathy-contact-widget.c:939 +#: ../libempathy-gtk/empathy-individual-widget.c:511 msgid "Longitude:" msgstr "రేఖాంశము:" -#: ../libempathy-gtk/empathy-contact-widget.c:945 -#: ../libempathy-gtk/empathy-individual-widget.c:539 +#: ../libempathy-gtk/empathy-contact-widget.c:941 +#: ../libempathy-gtk/empathy-individual-widget.c:513 msgid "Latitude:" msgstr "అక్షాంశము:" -#: ../libempathy-gtk/empathy-contact-widget.c:947 -#: ../libempathy-gtk/empathy-individual-widget.c:541 +#: ../libempathy-gtk/empathy-contact-widget.c:943 +#: ../libempathy-gtk/empathy-individual-widget.c:515 msgid "Altitude:" msgstr "ఎత్తు:" -#: ../libempathy-gtk/empathy-contact-widget.c:1000 -#: ../libempathy-gtk/empathy-contact-widget.c:1015 -#: ../libempathy-gtk/empathy-individual-widget.c:629 -#: ../libempathy-gtk/empathy-individual-widget.c:644 -#: ../src/empathy-preferences.ui.h:12 +#: ../libempathy-gtk/empathy-contact-widget.c:996 +#: ../libempathy-gtk/empathy-contact-widget.c:1011 +#: ../libempathy-gtk/empathy-individual-widget.c:607 +#: ../libempathy-gtk/empathy-individual-widget.c:622 +#: ../src/empathy-preferences.ui.h:17 msgid "Location" msgstr "స్థానము" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:1017 -#: ../libempathy-gtk/empathy-individual-widget.c:646 +#: ../libempathy-gtk/empathy-contact-widget.c:1013 +#: ../libempathy-gtk/empathy-individual-widget.c:624 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:1069 -#: ../libempathy-gtk/empathy-individual-widget.c:695 +#: ../libempathy-gtk/empathy-contact-widget.c:1065 +#: ../libempathy-gtk/empathy-individual-widget.c:673 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y at %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1151 -#: ../libempathy-gtk/empathy-individual-widget.c:931 +#: ../libempathy-gtk/empathy-contact-widget.c:1147 +#: ../libempathy-gtk/empathy-individual-widget.c:915 msgid "Save Avatar" msgstr "అవతారాన్ని భద్రపరుచు" -#: ../libempathy-gtk/empathy-contact-widget.c:1207 -#: ../libempathy-gtk/empathy-individual-widget.c:989 +#: ../libempathy-gtk/empathy-contact-widget.c:1203 +#: ../libempathy-gtk/empathy-individual-widget.c:973 msgid "Unable to save avatar" msgstr "అవతారాన్ని భద్రపరచలేకపోతుంది" @@ -2033,7 +2078,7 @@ msgstr "స్థానము ఈ (తేది)వద్ద\t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1321 +#: ../libempathy-gtk/empathy-individual-widget.c:1308 msgid "Alias:" msgstr "అలియాస్:" @@ -2053,7 +2098,7 @@ msgstr "పరిచయము వివరాలు" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1525 +#: ../libempathy-gtk/empathy-individual-widget.c:1517 msgid "Identifier:" msgstr "గుర్తించునది:" @@ -2079,8 +2124,7 @@ msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." msgstr "" -"గుంపులో కనిపించాలనుకుంటున్న పరిచయాన్ని ఎంచుకోండి. మీరు ఒకటి కన్నా ఎక్కువ " -"గుంపులను " +"గుంపులో కనిపించాలనుకుంటున్న పరిచయాన్ని ఎంచుకోండి. మీరు ఒకటి కన్నా ఎక్కువ గుంపులను " "ఎంచుకొనవచ్చు లేదా అస్సలు ఎంచుకొనపోవచ్చునని గమనించండి." #: ../libempathy-gtk/empathy-groups-widget.c:364 @@ -2093,17 +2137,17 @@ msgid "Select" msgstr "ఎంచుకోండి" #: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1835 +#: ../src/empathy-main-window.c:1807 msgid "Group" msgstr "గుంపు" -#: ../libempathy-gtk/empathy-individual-dialogs.c:257 +#: ../libempathy-gtk/empathy-individual-dialogs.c:260 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "కిందపేర్కొన్న గుర్తింపు నిరోధించబడును:" msgstr[1] "కిందపేర్కొన్న గుర్తింపులు నిరోధించబడును:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:264 +#: ../libempathy-gtk/empathy-individual-dialogs.c:267 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "కిందపేర్కొన్న గుర్తింపు నిరోధించబడదు:" @@ -2129,41 +2173,69 @@ msgstr "జాబితాలో ఎడమవైపు ఎంచుకోబడ #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:137 +#: ../libempathy-gtk/empathy-individual-menu.c:145 #, c-format msgid "%s (%s)" msgstr "%s (%s)" +#: ../libempathy-gtk/empathy-individual-menu.c:309 +msgid "Select account to use to place the call" +msgstr "కాల్ స్థానానికి ఉపయోగించడానికి ఖాతా ఎంచుకోండి" + +#. translators: Call is a noun. This string is used in the window +#. * title +#: ../libempathy-gtk/empathy-individual-menu.c:313 +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-streamed-media-window.c:1299 +#: ../src/empathy-call-window.ui.h:2 +msgid "Call" +msgstr "కాల్" + +#: ../libempathy-gtk/empathy-individual-menu.c:378 +#| msgid "Provide" +msgid "Mobile" +msgstr "మొబైలు" + +#: ../libempathy-gtk/empathy-individual-menu.c:380 +msgid "Work" +msgstr "పని " + +#: ../libempathy-gtk/empathy-individual-menu.c:382 +msgid "HOME" +msgstr "ఇల్లు " + #. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:593 -#: ../libempathy-gtk/empathy-new-message-dialog.c:248 +#: ../libempathy-gtk/empathy-individual-menu.c:804 +#: ../libempathy-gtk/empathy-new-message-dialog.c:215 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:919 +#: ../libempathy-gtk/empathy-individual-menu.c:1142 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "సవరణ (_E)" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:945 +#: ../libempathy-gtk/empathy-individual-menu.c:1168 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "పరిచయాలను లింకుచేయి...(_O)" -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-view.c:2341 msgid "Delete and _Block" msgstr "తొలగించు మరియు నిరోధించు (_B)" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +#: ../libempathy-gtk/empathy-individual-view.c:2510 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " "remove all the contacts which make up this linked contact." msgstr "" +"మీరు నిజంగా లింక్ పరిచయం '% s' తొలగించడానికి అనుకుంటున్నారా? ఈ లింక్ సంప్రదించండి ను తయారుచేసే అన్ని " +"పరిచయాలను తొలగిస్తుంది గమనించండి." -#: ../libempathy-gtk/empathy-individual-widget.c:1672 +#: ../libempathy-gtk/empathy-individual-widget.c:1656 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2218,7 +2290,7 @@ msgstr "అన్‌లింక్ చేయి...(_U)" #: ../libempathy-gtk/empathy-linking-dialog.c:121 msgid "" "Completely split the displayed linked contacts into the separate contacts." -msgstr "" +msgstr "పూర్తిగా ప్రత్యేక పరిచయాలను లోకి ప్రదర్శించబడే లింక్ పరిచయాలను విడిపోయారు." #. Add button #. Translators: this is an action button in the linking dialogue. "Link" is @@ -2238,219 +2310,217 @@ msgid "" "Are you sure you want to unlink these linked contacts? This will completely " "split the linked contacts into separate contacts." msgstr "" +"మీరు ఈ లింక్ పరిచయాలను లింక్ తొలగించడానికి నిశ్చయించుకున్నారా? ఈ పూర్తిగా ప్రత్యేక పరిచయాలను లోకి లింక్ " +"పరిచయాలను స్ప్లిట్ ఉంటుంది." #: ../libempathy-gtk/empathy-linking-dialog.c:190 msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "అన్‌లింక్ చేయి (_U)" -#: ../libempathy-gtk/empathy-log-window.c:505 +#: ../libempathy-gtk/empathy-log-window.c:634 +msgid "History" +msgstr "చరిత్ర" + +#: ../libempathy-gtk/empathy-log-window.c:689 msgid "Show" -msgstr "" +msgstr "చూపించు" -#: ../libempathy-gtk/empathy-log-window.c:527 +#: ../libempathy-gtk/empathy-log-window.c:711 msgid "Search" msgstr "వెతుకు" -#: ../libempathy-gtk/empathy-log-window.c:745 -#: ../libempathy-gtk/empathy-log-window.c:859 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.c:1159 +msgid "Chat in %s" +msgstr "%sతో చాట్" + +#: ../libempathy-gtk/empathy-log-window.c:1161 +msgid "Chat with %s" +msgstr "% S తో చాట్" + +#: ../libempathy-gtk/empathy-log-window.c:1211 +#: ../libempathy-gtk/empathy-log-window.c:1358 #| msgid "%A %B %d %Y" msgctxt "A date with the time" msgid "%A, %e %B %Y %X" -msgstr "%A %B %d %Y" - -#: ../libempathy-gtk/empathy-log-window.c:747 -#, fuzzy, c-format -#| msgid "Call with %s" -msgid "Chat with %s" -msgstr "%sతో కాల్ చేయి" +msgstr "%A %B %d %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:814 +#: ../libempathy-gtk/empathy-log-window.c:1300 #, c-format msgid "* %s %s" -msgstr "" +msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:822 +#: ../libempathy-gtk/empathy-log-window.c:1306 #, c-format msgid "%s: %s" -msgstr "" +msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:878 -#: ../libempathy-gtk/empathy-log-window.c:880 ../src/empathy-ft-manager.c:1026 -msgid "%" -msgstr "%" +#: ../libempathy-gtk/empathy-log-window.c:1382 +msgid "%s second" +msgid_plural "%s seconds" +msgstr[0] "%s రెండవ " +msgstr[1] "%d సెకనుల క్రితం" -#: ../libempathy-gtk/empathy-log-window.c:887 +#: ../libempathy-gtk/empathy-log-window.c:1389 +msgid "%s minute" +msgid_plural "%s minutes" +msgstr[0] "%d నిముషము" +msgstr[1] "%d నిముషాలు" + +#: ../libempathy-gtk/empathy-log-window.c:1397 #, c-format msgid "Call took %s, ended at %s" -msgstr "" +msgstr "కాల్,% s పట్టింది% s వద్ద ముగిసింది" -#: ../libempathy-gtk/empathy-log-window.c:1213 +#: ../libempathy-gtk/empathy-log-window.c:1729 msgid "Today" -msgstr "" +msgstr "నేడు" -#: ../libempathy-gtk/empathy-log-window.c:1217 -#, fuzzy -#| msgid "Western" +#: ../libempathy-gtk/empathy-log-window.c:1733 msgid "Yesterday" -msgstr "వెస్ట్రన్" +msgstr "నిన్న" -#: ../libempathy-gtk/empathy-log-window.c:1233 -#, fuzzy -#| msgid "%A %B %d %Y" -msgctxt "" -"A date such as '23 May 2010', %e is the day, %B the month and %Y the year" +#. Translators: A date such as '23 May 2010' (strftime format) +#: ../libempathy-gtk/empathy-log-window.c:1748 msgid "%e %B %Y" -msgstr "%A %B %d %Y" +msgstr "%A %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1314 -#: ../libempathy-gtk/empathy-log-window.c:2680 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3444 msgid "Anytime" -msgstr "" +msgstr "ఏ సమయములోనా" -#: ../libempathy-gtk/empathy-log-window.c:1385 -#: ../libempathy-gtk/empathy-log-window.c:1688 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.c:1916 +#: ../libempathy-gtk/empathy-log-window.c:2372 #| msgid "None" msgid "Anyone" -msgstr "ఏదీకాదు" +msgstr "ఎవరైనా" -#: ../libempathy-gtk/empathy-log-window.c:1953 +#: ../libempathy-gtk/empathy-log-window.c:2685 msgid "Who" -msgstr "" +msgstr "ఎవరు" -#: ../libempathy-gtk/empathy-log-window.c:2156 +#: ../libempathy-gtk/empathy-log-window.c:2889 msgid "When" -msgstr "" +msgstr "ఎపుడు" -#: ../libempathy-gtk/empathy-log-window.c:2272 +#: ../libempathy-gtk/empathy-log-window.c:3005 msgid "Anything" -msgstr "" +msgstr "ఏదైనా" -#: ../libempathy-gtk/empathy-log-window.c:2274 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.c:3007 #| msgid "Set status" msgid "Text chats" -msgstr "స్థితిని అమర్చు" +msgstr "పాఠ్య చాట్లు" -#: ../libempathy-gtk/empathy-log-window.c:2276 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.c:3009 +#: ../src/empathy-preferences.ui.h:4 #| msgid "Call" msgid "Calls" -msgstr "కాల్" +msgstr "కాల్స్ " -#: ../libempathy-gtk/empathy-log-window.c:2281 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.c:3014 #| msgid "Incoming call" msgid "Incoming calls" -msgstr "లోనికివచ్చు కాల్" +msgstr "లోనికివచ్చు కాల్స్" -#: ../libempathy-gtk/empathy-log-window.c:2282 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.c:3015 #| msgid "Outgoing voice call" msgid "Outgoing calls" -msgstr "బయటకు వెళ్ళు వాయిస్ కాల్" +msgstr "బయటకు వెళ్ళు వాయిస్ కాల్స్" -#: ../libempathy-gtk/empathy-log-window.c:2283 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.c:3016 #| msgid "Missed call from %s" msgid "Missed calls" -msgstr "%s నుండి మిస్సుడ్ కాల్ వచ్చింది" +msgstr "మిస్సుడ్ కాల్స్" -#: ../libempathy-gtk/empathy-log-window.c:2304 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.c:3038 #| msgid "Chat" msgid "What" -msgstr "చాట్" +msgstr "ఏమిటి" -#: ../libempathy-gtk/empathy-log-window.c:2917 +#: ../libempathy-gtk/empathy-log-window.c:3747 msgid "Are you sure you want to delete all logs of previous conversations?" -msgstr "" +msgstr "మీరు మునుపటి సంభాషణలు అన్ని లాగ్లను తొలగించడానికి నిశ్చయించుకున్నారా?" -#: ../libempathy-gtk/empathy-log-window.c:2921 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.c:3751 #| msgid "C_lear" msgid "Clear All" -msgstr "శుభ్రపరచు (_l)" +msgstr "అన్న శుభ్రపరచు " -#: ../libempathy-gtk/empathy-log-window.c:2928 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.c:3758 #| msgid "Connected from:" msgid "Delete from:" -msgstr "దీని నుండి అనుసంధానించబడింది:" +msgstr "దీని నుండి తొలగ్మిచు:" -#. translators: Call is a noun. This string is used in the window -#. * title #: ../libempathy-gtk/empathy-log-window.ui.h:1 -#: ../src/empathy-streamed-media-window.c:1340 -msgid "Call" -msgstr "కాల్" +msgid "Loading..." +msgstr " లోడ్ అవుతోంది ...ముత" -#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 #: ../src/empathy-chat-window.ui.h:3 msgid "Chat" msgstr "చాట్" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 -msgid "History" -msgstr "" - #: ../libempathy-gtk/empathy-log-window.ui.h:4 -#, fuzzy +msgid "Delete All History..." +msgstr "చరిత్ర అన్న తొలగించు ." + +#: ../libempathy-gtk/empathy-log-window.ui.h:5 #| msgid "Provide" msgid "Profile" -msgstr "సమకూర్చు" +msgstr "ప్రొఫైల్" -#: ../libempathy-gtk/empathy-log-window.ui.h:5 -#: ../src/empathy-call-window.ui.h:20 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-call-window.ui.h:22 +#: ../src/empathy-streamed-media-window.ui.h:20 msgid "Video" msgstr "వీడియో" -#: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20 +#: ../libempathy-gtk/empathy-log-window.ui.h:7 +#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 +#: ../src/empathy-main-window-menubar.ui.h:20 msgid "_Edit" msgstr "సవరణ (_E)" -#: ../libempathy-gtk/empathy-log-window.ui.h:7 -#, fuzzy +#: ../libempathy-gtk/empathy-log-window.ui.h:8 #| msgid "File" msgid "_File" -msgstr "ఫైల్" +msgstr "ఫైల్ (_F)" -#: ../libempathy-gtk/empathy-log-window.ui.h:8 +#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" -msgstr "" +msgstr "పేజీ 2" #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 msgid "Contact ID:" msgstr "పరిచయము ఐడి:" #. add chat button -#: ../libempathy-gtk/empathy-new-message-dialog.c:258 +#: ../libempathy-gtk/empathy-new-message-dialog.c:225 msgid "C_hat" msgstr "చాట్ (_h)" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:277 +#: ../libempathy-gtk/empathy-new-message-dialog.c:244 msgid "New Conversation" msgstr "కొత్త సంభాషణ" #. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:216 +#: ../libempathy-gtk/empathy-new-call-dialog.c:204 msgid "Send _Video" msgstr "వీడియోను పంపు (_V)" #. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:224 +#: ../libempathy-gtk/empathy-new-call-dialog.c:215 msgid "C_all" msgstr "కాల్ (_a)" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:234 +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "New Call" msgstr "కొత్త కాల్" @@ -2469,34 +2539,34 @@ msgstr "" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:170 -#: ../libempathy-gtk/empathy-presence-chooser.c:206 +#: ../libempathy-gtk/empathy-presence-chooser.c:167 +#: ../libempathy-gtk/empathy-presence-chooser.c:203 msgid "Custom Message…" msgstr "అనురూపిత సందేశము..." -#: ../libempathy-gtk/empathy-presence-chooser.c:223 -#: ../libempathy-gtk/empathy-presence-chooser.c:225 +#: ../libempathy-gtk/empathy-presence-chooser.c:220 +#: ../libempathy-gtk/empathy-presence-chooser.c:222 msgid "Edit Custom Messages…" msgstr "అనురూపిత సందేశాలను సవరించు..." -#: ../libempathy-gtk/empathy-presence-chooser.c:348 +#: ../libempathy-gtk/empathy-presence-chooser.c:345 msgid "Click to remove this status as a favorite" msgstr "ఈ స్థితిని ఇష్టాంశము నుండి తీసివేయుటకు నొక్కండి" -#: ../libempathy-gtk/empathy-presence-chooser.c:357 +#: ../libempathy-gtk/empathy-presence-chooser.c:354 msgid "Click to make this status a favorite" msgstr "ఈ స్థితిని ఇష్టాంశముగా చేయుటకు నొక్కండి" -#: ../libempathy-gtk/empathy-presence-chooser.c:391 +#: ../libempathy-gtk/empathy-presence-chooser.c:388 msgid "Set status" msgstr "స్థితిని అమర్చు" -#: ../libempathy-gtk/empathy-presence-chooser.c:946 +#: ../libempathy-gtk/empathy-presence-chooser.c:943 msgid "Set your presence and current status" msgstr "మీ ఉనికిని మరియు ప్రస్తుత స్థితిని అమర్చండి" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1134 +#: ../libempathy-gtk/empathy-presence-chooser.c:1131 msgid "Custom messages…" msgstr "అనురూపిత సందేశాలు..." @@ -2510,24 +2580,27 @@ msgid "New %s account" msgstr "కొత్త %s ఖాతా" #: ../libempathy-gtk/empathy-search-bar.ui.h:1 -msgid "Find Next" -msgstr "తరువాతది కనుగొను" +msgid "Find:" +msgstr "కనుగొను:" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -msgid "Find Previous" -msgstr "మునుపటిది కనుగొను" +#| msgid "Match case" +msgid "Mat_ch case" +msgstr "సరిపోలు సందర్భం (_c)" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Find:" -msgstr "కనుగొను:" +msgid "Phrase not found" +msgstr "పదబందం కనపడలేదు" #: ../libempathy-gtk/empathy-search-bar.ui.h:4 -msgid "Match case" -msgstr "సరిపోలు సందర్భం" +#| msgid "_Next Tab" +msgid "_Next" +msgstr "తరువాత (_N)" -#: ../libempathy-gtk/empathy-search-bar.ui.h:5 -msgid "Phrase not found" -msgstr "పదబందం కనపడలేదు" +#: ../libempathy-gtk/empathy-search-bar.ui.h:5 +#| msgid "_Previous Tab" +msgid "_Previous" +msgstr "మునుపటి (_P)" #: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" @@ -2569,45 +2642,39 @@ msgstr "బయటకు వెళ్ళు వాయిస్ కాల్" msgid "Voice call ended" msgstr "వాయిల్ కాల్ ముగిసినది" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:364 -msgid "Enter Custom Message" -msgstr "అనురూపిత సందేశమును ప్రవేశపెట్టు" - -#: ../libempathy-gtk/empathy-status-preset-dialog.c:523 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 msgid "Edit Custom Messages" msgstr "అనురూపిత సందేశాలను సవరించు" -#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -msgid "Save _New Status Message" -msgstr "కొత్త స్థితి సందేశాన్ని భద్రపరుచు (_N)" - -#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2 -msgid "Saved Status Messages" -msgstr "భద్రపరుచబడిన స్థితి సందేశాలు" +#: ../libempathy-gtk/empathy-theme-adium.c:1036 +#, c-format +#| msgid "Message received" +msgid "Message edited at %s" +msgstr "సందేశం% s వద్ద సవరించబడింది" -#: ../libempathy-gtk/empathy-theme-adium.c:1782 +#: ../libempathy-gtk/empathy-theme-adium.c:1726 msgid "Normal" msgstr "సాధారణ" -#: ../libempathy-gtk/empathy-theme-manager.c:75 +#: ../libempathy-gtk/empathy-theme-manager.c:70 msgid "Classic" msgstr "శాస్త్రీయ" -#: ../libempathy-gtk/empathy-theme-manager.c:76 +#: ../libempathy-gtk/empathy-theme-manager.c:71 msgid "Simple" msgstr "సరళమైన" -#: ../libempathy-gtk/empathy-theme-manager.c:77 +#: ../libempathy-gtk/empathy-theme-manager.c:72 msgid "Clean" msgstr "శుభ్రముచేయి" -#: ../libempathy-gtk/empathy-theme-manager.c:78 +#: ../libempathy-gtk/empathy-theme-manager.c:73 msgid "Blue" msgstr "నీలం" #: ../libempathy-gtk/empathy-tls-dialog.c:150 msgid "The identity provided by the chat server cannot be verified." -msgstr "" +msgstr "చాట్ సర్వర్ అందించిన గుర్తింపు ధ్రువీకరించబడదు." #: ../libempathy-gtk/empathy-tls-dialog.c:157 msgid "The certificate is not signed by a Certification Authority." @@ -2666,8 +2733,7 @@ msgstr "కొనసాగు" #: ../libempathy-gtk/empathy-tls-dialog.c:287 msgid "This connection is untrusted. Would you like to continue anyway?" -msgstr "" -"అనుసంధానము నమ్మదగినది కాదు. ఏది ఏమైనప్పటికీ మీరు కొనసాగాలనుకుంటున్నారా?" +msgstr "అనుసంధానము నమ్మదగినది కాదు. ఏది ఏమైనప్పటికీ మీరు కొనసాగాలనుకుంటున్నారా?" #: ../libempathy-gtk/empathy-tls-dialog.c:297 msgid "Remember this choice for future connections" @@ -2677,29 +2743,28 @@ msgstr "మునుముందు అనుసంధానాలకు ఈ ఎ msgid "Certificate Details" msgstr "ధృవీకరణపత్రం వివరాలు" -#: ../libempathy-gtk/empathy-ui-utils.c:1653 +#: ../libempathy-gtk/empathy-ui-utils.c:1735 msgid "Unable to open URI" msgstr "URI తెరువలేకపోతుంది" -#: ../libempathy-gtk/empathy-ui-utils.c:1748 +#: ../libempathy-gtk/empathy-ui-utils.c:1831 msgid "Select a file" msgstr "ఒక ఫైల్‌ని ఎంచుకొను" -#: ../libempathy-gtk/empathy-ui-utils.c:1820 +#: ../libempathy-gtk/empathy-ui-utils.c:1903 msgid "Insufficient free space to save file" msgstr "ఫైలును భద్రపరుచుటకు తగిన ఖాళీ స్థలము లేదు" -#: ../libempathy-gtk/empathy-ui-utils.c:1828 +#: ../libempathy-gtk/empathy-ui-utils.c:1911 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " "Please choose another location." msgstr "" -"ఈ ఫైలును భద్రపరుచుటకు %s ఖాళీ స్థలము అవసరము, కాని కేవలం %s మాత్రమే అందుబాటులో " -"ఉన్నది. దయచేసి " +"ఈ ఫైలును భద్రపరుచుటకు %s ఖాళీ స్థలము అవసరము, కాని కేవలం %s మాత్రమే అందుబాటులో ఉన్నది. దయచేసి " "వేరొక స్థానమును ఎన్నుకోండి." -#: ../libempathy-gtk/empathy-ui-utils.c:1872 +#: ../libempathy-gtk/empathy-ui-utils.c:1955 #, c-format msgid "Incoming file from %s" msgstr "%s నుండి ఫైల్ లోనికివస్తున్నది" @@ -2887,23 +2952,23 @@ msgstr "ఏ దోష సందేశము లేదు" msgid "Instant Message (Empathy)" msgstr "సత్వర సందేశం (ఎంపతి)" -#: ../src/empathy.c:309 +#: ../src/empathy.c:431 msgid "Don't connect on startup" msgstr "వ్యవస్థ ప్రారంభములో అనుసంధానించవద్దు" -#: ../src/empathy.c:313 +#: ../src/empathy.c:435 msgid "Don't display the contact list or any other dialogs on startup" msgstr "వ్యవస్థ ప్రారంభమయినపుడు పరిచయ జాబితా గాని లేక ఏ ఇతర డైలాగులను చూపవద్దు" -#: ../src/empathy.c:321 +#: ../src/empathy.c:450 msgid "- Empathy IM Client" msgstr "- ఎంపతి IM క్లయింటు" -#: ../src/empathy.c:500 +#: ../src/empathy.c:637 msgid "Error contacting the Account Manager" msgstr "ఖాతా నిర్వాహకాన్ని సంప్రదించుటలో దోషము" -#: ../src/empathy.c:502 +#: ../src/empathy.c:639 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -2911,6 +2976,9 @@ msgid "" "\n" "%s" msgstr "" +"టెలెపథ్య్ ఖాతా మేనేజర్ కనెక్ట్ చేసేటప్పుడు ఒక లోపం ఉంది. లోపం జరిగినది:\n" +"\n" +"% s" #: ../src/empathy-about-dialog.c:81 msgid "" @@ -2919,10 +2987,8 @@ msgid "" "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" -"ఎంపతి అనేది ఒక ఉచిత సాఫ్ట్‍వేర్; దీనిని మీరు ఫ్రీ సాఫ్ట్‍వేర్ ఫౌండేషన్ " -"ప్రచురించిన విధంగా గ్నూ జనరల్ పబ్లిక్ " -"లైసెన్స్ నిబంధనలకు అనుగుణంగా పంచవచ్చు మరియు/లేదా సవరించవచ్చు; వెర్షన్ 2 " -"లైసెన్స్, లేదా (మీ ఐచ్చికాన్ని " +"ఎంపతి అనేది ఒక ఉచిత సాఫ్ట్‍వేర్; దీనిని మీరు ఫ్రీ సాఫ్ట్‍వేర్ ఫౌండేషన్ ప్రచురించిన విధంగా గ్నూ జనరల్ పబ్లిక్ " +"లైసెన్స్ నిబంధనలకు అనుగుణంగా పంచవచ్చు మరియు/లేదా సవరించవచ్చు; వెర్షన్ 2 లైసెన్స్, లేదా (మీ ఐచ్చికాన్ని " "బట్టి) ఏదైనా తరువాత వెర్షన్." #: ../src/empathy-about-dialog.c:85 @@ -2932,10 +2998,8 @@ msgid "" "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." msgstr "" -"ఎంపతి అనేది ఏ విధమైన పూచికత్తులు లేకుండా ఉపయోగపడుతుందనే నమ్మకంతో పంచబడుతుంది; " -"వ్యాపారానికి గాని లేదా " -"ఒక ఖచ్చితమైన ప్రయోజనానికి ఉపయోగించవచ్చని కనీసం భావించిన పూచికత్తులు కూడా " -"లేకుండా ఇవ్వబడుతుంది. " +"ఎంపతి అనేది ఏ విధమైన పూచికత్తులు లేకుండా ఉపయోగపడుతుందనే నమ్మకంతో పంచబడుతుంది; వ్యాపారానికి గాని లేదా " +"ఒక ఖచ్చితమైన ప్రయోజనానికి ఉపయోగించవచ్చని కనీసం భావించిన పూచికత్తులు కూడా లేకుండా ఇవ్వబడుతుంది. " "మరిన్ని వివరాలకు గ్నూ జనరల్ పబ్లిక్ లైసెన్స్ చూడండి." #: ../src/empathy-about-dialog.c:89 @@ -2944,14 +3008,13 @@ msgid "" "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-130159 USA" msgstr "" -"మీరు ఎంపతితో పాటుగా గ్నూ జనరల్ పబ్లిక్ లైసెన్స్ యొక్క నకలు పొందివుండాలి; " -"ఒకవేళ పొందకపోతే, Free " -"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-" -"1301 USA కి వ్రాయండి" +"మీరు ఎంపతితో పాటుగా గ్నూ జనరల్ పబ్లిక్ లైసెన్స్ యొక్క నకలు పొందివుండాలి; ఒకవేళ పొందకపోతే, Free " +"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " +"02110-1301 USA కి వ్రాయండి" #: ../src/empathy-about-dialog.c:107 msgid "An Instant Messaging client for GNOME" -msgstr "GNOME కొరకు సత్వర సందేశక క్లయింటు" +msgstr "గ్నోమ్ కొరకు సత్వర సందేశక క్లయింటు" #: ../src/empathy-about-dialog.c:113 msgid "translator-credits" @@ -2985,8 +3048,7 @@ msgid "" "You can either go back and try to enter your accounts' details again or quit " "this assistant and add accounts later from the Edit menu." msgstr "" -"మీరు మీ ఖాతాల సమాచారమును ప్రవేశపెట్టుటకు మరలా వెనక్కువెళ్ళి ప్రయత్నించవచ్చు " -"లేదా ఈ సహాయకాన్ని నిష్క్రమించి " +"మీరు మీ ఖాతాల సమాచారమును ప్రవేశపెట్టుటకు మరలా వెనక్కువెళ్ళి ప్రయత్నించవచ్చు లేదా ఈ సహాయకాన్ని నిష్క్రమించి " "మరియు సవరణ మెనూ నుండి మీ ఖాతాలను తరువాత జతచేయండి." #: ../src/empathy-account-assistant.c:220 @@ -3025,10 +3087,8 @@ msgid "" "programs. With a microphone or a webcam you can also have audio or video " "calls." msgstr "" -"ఎంపతితో మీరు ఆన్‌లైనులో ఉన్న వ్యక్తులతో మాట్లాడవచ్చును మరియు గూగుల్ టాక్, " -"AIM, విండోస్ లైవ్ వంటి ఇతర " -"చాట్ ప్రోగ్రాములు ఉపయోగించే తోటివారితో మరియు స్నేహితులతో చాట్ చేయవచ్చు. " -"మైక్రోఫోన్ లేదా వెబ్‌కామ్‌తో మీరు ఆడియో లేదా " +"ఎంపతితో మీరు ఆన్‌లైనులో ఉన్న వ్యక్తులతో మాట్లాడవచ్చును మరియు గూగుల్ టాక్, AIM, విండోస్ లైవ్ వంటి ఇతర " +"చాట్ ప్రోగ్రాములు ఉపయోగించే తోటివారితో మరియు స్నేహితులతో చాట్ చేయవచ్చు. మైక్రోఫోన్ లేదా వెబ్‌కామ్‌తో మీరు ఆడియో లేదా " "వీడియో కాల్సును కూడా చేయవచ్చు." #: ../src/empathy-account-assistant.c:629 @@ -3049,8 +3109,7 @@ msgstr "లేదు, నాకు ఒక కొత్త ఖాతా కావ #: ../src/empathy-account-assistant.c:705 msgid "No, I just want to see people online nearby for now" -msgstr "" -"లేదు, ఇప్పుడు కేవలం దగ్గరలోని ఆన్‌లైన్‌లోవున్న వ్యక్తులను చూడాలనుకుంటున్నాను" +msgstr "లేదు, ఇప్పుడు కేవలం దగ్గరలోని ఆన్‌లైన్‌లోవున్న వ్యక్తులను చూడాలనుకుంటున్నాను" #: ../src/empathy-account-assistant.c:726 msgid "Select the accounts you want to import:" @@ -3073,6 +3132,9 @@ msgid "" "details below are correct. You can easily change these details later or " "disable this feature by using the 'Accounts' dialog" msgstr "" +"తాదాత్మ్యం స్వయంచాలకంగా కనుగొనడంలో మరియు మీరు అదే నెట్వర్క్ పై కనెక్ట్ ప్రజలు చాట్ చెయ్యవచ్చు. ను " +"ఉపయోగించడానికి మీరు భావించినా, క్రింద వివరాలను సరైనవని తనిఖీ చెయ్యండి. మీరు సులభంగా 'అకౌంట్స్' డైలాగ్ " +"ఉపయోగించి ఈ ఫీచర్ తరువాత ఈ వివరాలు మార్పు లేదా సాధ్యం చేసుకోవచ్చు" #: ../src/empathy-account-assistant.c:1091 #: ../src/empathy-account-assistant.c:1147 @@ -3090,6 +3152,9 @@ msgid "" "install the telepathy-salut package and create a People Nearby account from " "the Accounts dialog" msgstr "" +"మీరు telepathy-salut ఇన్స్టాల్ కాదు అని, మీ స్థానిక నెట్వర్కు అనుసంధానం ప్రజలు చాట్ చేయలేరు. మీరు " +"ఈ లక్షణాలను సాధ్యం భావించినా, telepathy-salut ప్యాకేజీ ఇన్స్టాల్ దయచేసి మరియు అకౌంట్స్ డైలాగ్ నుండి ఒక " +"పీపుల్ సమీపంలో ఖాతాని సృష్టించుకోండి" #: ../src/empathy-account-assistant.c:1149 msgid "telepathy-salut not installed" @@ -3125,7 +3190,8 @@ msgid "Your new account has not been saved yet." msgstr "మీ కొత్త ఖాతా ఇంకా భద్రపరుచబడలేదు." #: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780 +#: ../src/empathy-streamed-media-window.c:754 +#: ../src/empathy-call-window.c:1216 msgid "Connecting…" msgstr "అనుసంధానిస్తున్నది..." @@ -3194,10 +3260,9 @@ msgstr "" "మీరు కొనసాగాలనుకుంటున్నారా?" #: ../src/empathy-accounts-dialog.ui.h:1 -#, fuzzy #| msgid "_Add…" msgid "Add…" -msgstr "జతచేయి...(_A)" +msgstr "జతచేయి..." #: ../src/empathy-accounts-dialog.ui.h:2 msgid "Loading account information" @@ -3211,19 +3276,12 @@ msgstr "ఏ ప్రోటోకాల్ స్థాపించబడిల msgid "Protocol:" msgstr "ప్రోటోకాల్:" -#: ../src/empathy-accounts-dialog.ui.h:5 -#, fuzzy -#| msgid "_Remove" -msgid "Remove" -msgstr "తీసివేయి (_R)" - #: ../src/empathy-accounts-dialog.ui.h:6 msgid "" "To add a new account, you first have to install a backend for each protocol " "you want to use." msgstr "" -"కొత్త ఖాతాను జతచేయుటకు, మీరు ఉపయోగించాలనుకుంటున్న ప్రతీ ప్రొటోకాల్‌కు మొదట " -"బ్యాకెండ్‌ను స్థాపించాలి." +"కొత్త ఖాతాను జతచేయుటకు, మీరు ఉపయోగించాలనుకుంటున్న ప్రతీ ప్రొటోకాల్‌కు మొదట బ్యాకెండ్‌ను స్థాపించాలి." #: ../src/empathy-accounts-dialog.ui.h:7 msgid "_Import…" @@ -3241,338 +3299,369 @@ msgstr "ఎంపతి ప్రామాణీకరణ క్లయింట msgid "People nearby" msgstr "దగ్గరలోని ప్రజలు" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:120 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:192 msgid "- Empathy Audio/Video Client" msgstr "- ఎంపతి ఆడియో/వీడియో క్లయింటు" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:138 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:217 msgid "Empathy Audio/Video Client" msgstr "ఎంపతి ఆడియో/వీడియో క్లయింటు" -#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472 +#: ../src/empathy-streamed-media-window.c:431 msgid "Contrast" msgstr "భేదము" -#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475 +#: ../src/empathy-streamed-media-window.c:434 msgid "Brightness" msgstr "ప్రకాశము" -#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478 +#: ../src/empathy-streamed-media-window.c:437 msgid "Gamma" msgstr "గామా" -#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583 +#: ../src/empathy-streamed-media-window.c:542 msgid "Volume" msgstr "ధ్వనిస్థాయి" -#: ../src/empathy-streamed-media-window.c:1153 -#: ../src/empathy-call-window.c:1127 +#: ../src/empathy-streamed-media-window.c:1110 msgid "_Sidebar" msgstr "పక్క పట్టీ(_S)" -#: ../src/empathy-streamed-media-window.c:1173 -#: ../src/empathy-call-window.c:1149 +#: ../src/empathy-streamed-media-window.c:1130 msgid "Audio input" msgstr "ఆడియో ఇన్‌పుట్" -#: ../src/empathy-streamed-media-window.c:1177 -#: ../src/empathy-call-window.c:1153 +#: ../src/empathy-streamed-media-window.c:1134 msgid "Video input" msgstr "వీడియో ఇన్‌పుట్" -#: ../src/empathy-streamed-media-window.c:1181 -#: ../src/empathy-call-window.c:1157 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Dialpad" msgstr "డయల్‌ప్యాడ్" -#: ../src/empathy-streamed-media-window.c:1192 -#: ../src/empathy-call-window.c:1167 +#: ../src/empathy-streamed-media-window.c:1151 msgid "Details" msgstr "వివరాలు" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1261 -#: ../src/empathy-call-window.c:1239 +#: ../src/empathy-streamed-media-window.c:1220 +#: ../src/empathy-call-window.c:1825 #, c-format msgid "Call with %s" msgstr "%sతో కాల్ చేయి" -#: ../src/empathy-streamed-media-window.c:1494 -#: ../src/empathy-call-window.c:1459 +#: ../src/empathy-streamed-media-window.c:1453 +#: ../src/empathy-call-window.c:2069 msgid "The IP address as seen by the machine" msgstr "యంత్రముతో చూడబడిన IP చిరునామా" -#: ../src/empathy-streamed-media-window.c:1496 -#: ../src/empathy-call-window.c:1461 +#: ../src/empathy-streamed-media-window.c:1455 +#: ../src/empathy-call-window.c:2071 msgid "The IP address as seen by a server on the Internet" msgstr "అంతర్జాలంతో ఒక సేవకముతో చూడబడిన IP చిరునామా" -#: ../src/empathy-streamed-media-window.c:1498 -#: ../src/empathy-call-window.c:1463 +#: ../src/empathy-streamed-media-window.c:1457 +#: ../src/empathy-call-window.c:2073 msgid "The IP address of the peer as seen by the other side" -msgstr "" +msgstr "ఇతర వైపు కనిపించే పీర్ యొక్క IP చిరునామా" -#: ../src/empathy-streamed-media-window.c:1500 -#: ../src/empathy-call-window.c:1465 +#: ../src/empathy-streamed-media-window.c:1459 +#: ../src/empathy-call-window.c:2075 msgid "The IP address of a relay server" msgstr "రిలే సేవకము యొక్క IP చిరునామా" -#: ../src/empathy-streamed-media-window.c:1502 -#: ../src/empathy-call-window.c:1467 +#: ../src/empathy-streamed-media-window.c:1461 +#: ../src/empathy-call-window.c:2077 msgid "The IP address of the multicast group" msgstr "బహుళప్రసార గుంపు యొక్క IP చిరునామా" -#: ../src/empathy-streamed-media-window.c:1884 +#: ../src/empathy-streamed-media-window.c:1843 msgctxt "encoding video codec" msgid "Unknown" msgstr "తెలియదు" -#: ../src/empathy-streamed-media-window.c:1887 +#: ../src/empathy-streamed-media-window.c:1846 msgctxt "encoding audio codec" msgid "Unknown" msgstr "తెలియదు" -#: ../src/empathy-streamed-media-window.c:1890 +#: ../src/empathy-streamed-media-window.c:1849 msgctxt "decoding video codec" msgid "Unknown" msgstr "తెలియదు" -#: ../src/empathy-streamed-media-window.c:1893 +#: ../src/empathy-streamed-media-window.c:1852 msgctxt "decoding audio codec" msgid "Unknown" msgstr "తెలియదు" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2185 +#: ../src/empathy-streamed-media-window.c:2144 #, c-format msgid "Connected — %d:%02dm" msgstr "అనుసంధానించబడింది — %d:%02dm" -#: ../src/empathy-streamed-media-window.c:2246 -#: ../src/empathy-call-window.c:2187 +#: ../src/empathy-streamed-media-window.c:2205 +#: ../src/empathy-call-window.c:2846 msgid "Technical Details" msgstr "సాంకేతిక వివరాలు" -#: ../src/empathy-streamed-media-window.c:2284 -#: ../src/empathy-call-window.c:2225 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:2884 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " "computer" -msgstr "" -"మీ కంప్యూటరుచే సహకరించబడుతున్న ఏ ఆడియో ఫార్మేట్లను %s సాఫ్ట్‌వేర్ " -"అర్థంచేసుకోలేకపోతున్నది" +msgstr "మీ కంప్యూటరుచే సహకరించబడుతున్న ఏ ఆడియో ఫార్మేట్లను %s సాఫ్ట్‌వేర్ అర్థంచేసుకోలేకపోతున్నది" -#: ../src/empathy-streamed-media-window.c:2289 -#: ../src/empathy-call-window.c:2230 +#: ../src/empathy-streamed-media-window.c:2248 +#: ../src/empathy-call-window.c:2889 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " "computer" -msgstr "" +msgstr "% s యొక్క సాఫ్ట్వేర్ మీ కంప్యూటర్ మద్దతు వీడియో ఫార్మాట్లలో అర్థం లేదు" -#: ../src/empathy-streamed-media-window.c:2295 -#: ../src/empathy-call-window.c:2236 +#: ../src/empathy-streamed-media-window.c:2254 +#: ../src/empathy-call-window.c:2895 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " "does not allow direct connections." msgstr "" -"%s కి అనుసంధానమును స్థాపించలేకపోతున్నది. మీలో ఒకరు నేరుగా అనుసంధానమగుటకు " -"అనుమతించని నెట్‌వర్క్ పై " +"%s కి అనుసంధానమును స్థాపించలేకపోతున్నది. మీలో ఒకరు నేరుగా అనుసంధానమగుటకు అనుమతించని నెట్‌వర్క్ పై " "ఉండి వుండవచ్చును." -#: ../src/empathy-streamed-media-window.c:2301 -#: ../src/empathy-call-window.c:2242 +#: ../src/empathy-streamed-media-window.c:2260 +#: ../src/empathy-call-window.c:2901 msgid "There was a failure on the network" msgstr "నెట్‌వర్కు నందు వైఫల్యము ఉన్నది" -#: ../src/empathy-streamed-media-window.c:2305 -#: ../src/empathy-call-window.c:2246 +#: ../src/empathy-streamed-media-window.c:2264 +#: ../src/empathy-call-window.c:2905 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "ఈ కాల్‌కి అవసరమైన ఆడియో ఫార్మేట్లు మీ కంప్యూటర్‌లో స్థాపించబడిలేవు" -#: ../src/empathy-streamed-media-window.c:2308 -#: ../src/empathy-call-window.c:2249 +#: ../src/empathy-streamed-media-window.c:2267 +#: ../src/empathy-call-window.c:2908 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "ఈ కాల్‌కి అవసరమైన వీడియో ఫార్మేట్లు మీ కంప్యూటర్‌లో స్థాపించబడిలేవు" -#: ../src/empathy-streamed-media-window.c:2318 -#: ../src/empathy-call-window.c:2261 +#: ../src/empathy-streamed-media-window.c:2277 +#: ../src/empathy-call-window.c:2920 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please report this bug and attach logs gathered from the 'Debug' window in " "the Help menu." msgstr "" +"ఊహించని ఏదో ఒక Telepathy భాగం లో జరిగింది. దయచేసి ఈ బగ్ నివేదిక మరియు " +"సహాయం మెను లో 'డీబగ్' విండో నుండి సేకరించిన లాగ్లను అటాచ్." -#: ../src/empathy-streamed-media-window.c:2326 -#: ../src/empathy-call-window.c:2270 +#: ../src/empathy-streamed-media-window.c:2285 +#: ../src/empathy-call-window.c:2929 msgid "There was a failure in the call engine" msgstr "కాల్ ఇంజనులో ఒక వైఫల్యము ఉన్నది" -#: ../src/empathy-streamed-media-window.c:2329 -#: ../src/empathy-call-window.c:2273 +#: ../src/empathy-streamed-media-window.c:2288 +#: ../src/empathy-call-window.c:2932 msgid "The end of the stream was reached" msgstr "ప్రవాహము చివరకు చేరుకున్నది" -#: ../src/empathy-streamed-media-window.c:2369 -#: ../src/empathy-call-window.c:2313 +#: ../src/empathy-streamed-media-window.c:2328 +#: ../src/empathy-call-window.c:2972 msgid "Can't establish audio stream" msgstr "ఆడియో ప్రవాహాన్ని స్థాపించలేకపోతుంది" -#: ../src/empathy-streamed-media-window.c:2379 -#: ../src/empathy-call-window.c:2323 +#: ../src/empathy-streamed-media-window.c:2338 +#: ../src/empathy-call-window.c:2982 msgid "Can't establish video stream" msgstr "వీడియో ప్రవాహాన్ని స్థాపించలేకపోతుంది" -#: ../src/empathy-call-window.ui.h:1 +#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2 +#: ../src/empathy-streamed-media-window.ui.h:1 msgid "Audio" msgstr "ఆడియో" -#: ../src/empathy-call-window.ui.h:2 -msgid "Call the contact again" -msgstr "పరిచయానికి మళ్ళీ కాల్ చేయి" - #: ../src/empathy-call-window.ui.h:3 -msgid "Camera Off" -msgstr "కెమెరా ఆపు" +#: ../src/empathy-streamed-media-window.ui.h:5 +msgid "Decoding Codec:" +msgstr "డీకోడింగ్ కొడెక్:" #: ../src/empathy-call-window.ui.h:4 -msgid "Camera On" -msgstr "కెమెరా ఆన్ చేయి" +#| msgid "_Disable" +msgid "Disable camera" +msgstr "కెమెరా నిలిపివేయి" #: ../src/empathy-call-window.ui.h:5 -msgid "Decoding Codec:" -msgstr "డీకోడింగ్ కొడెక్:" +msgid "Display the dialpad" +msgstr "డీల్పడ్ ప్రదర్శన" #: ../src/empathy-call-window.ui.h:6 -msgid "Disable camera and stop sending video" -msgstr "కెమెరాను అచేతనపరుచు మరియు వీడియోని పంపుట ఆపివేయి" +#: ../src/empathy-streamed-media-window.ui.h:9 +msgid "Encoding Codec:" +msgstr "ఎన్కోడింగ్ కొడెక్:" #: ../src/empathy-call-window.ui.h:7 -msgid "Enable camera and send video" -msgstr "కెమెరాను చేతనపరిచి, వీడియోను పంపు" +#: ../src/empathy-streamed-media-window.ui.h:10 +msgid "Hang up" +msgstr "హాంగ్ చేయి" #: ../src/empathy-call-window.ui.h:8 -msgid "Enable camera but don't send video" -msgstr "కెమెరాను చేతనపరుచు కాని వీడియో పంపవద్దు" +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Hang up current call" +msgstr "ప్రస్తుత కాల్‌ని హాంగ్ చేయి" #: ../src/empathy-call-window.ui.h:9 -msgid "Encoding Codec:" -msgstr "ఎన్కోడింగ్ కొడెక్:" +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Local Candidate:" +msgstr "స్థానిక అభ్యర్ధి:" #: ../src/empathy-call-window.ui.h:10 -msgid "Hang up" -msgstr "హాంగ్ చేయి" +msgid "Maximise me" +msgstr "నన్ను గరిష్టీకరించు" #: ../src/empathy-call-window.ui.h:11 -msgid "Hang up current call" -msgstr "ప్రస్తుత కాల్‌ని హాంగ్ చేయి" +msgid "Minimise me" +msgstr "నన్ను కనిష్టీకరించు" #: ../src/empathy-call-window.ui.h:12 -msgid "Local Candidate:" -msgstr "స్థానిక అభ్యర్ధి:" +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Remote Candidate:" +msgstr "దూరస్థ అభ్యర్ధి:" #: ../src/empathy-call-window.ui.h:13 -msgid "Preview" -msgstr "మునుజూపు" +#: ../src/empathy-streamed-media-window.ui.h:16 +msgid "Send Audio" +msgstr "ఆడియోను పంపు" #: ../src/empathy-call-window.ui.h:14 -msgid "Redial" -msgstr "తిరిగిడయిల్‌చేయి" +#| msgid "Send _Video" +msgid "Send Video" +msgstr "వీడియోను పంపు " #: ../src/empathy-call-window.ui.h:15 -msgid "Remote Candidate:" -msgstr "దూరస్థ అభ్యర్ధి:" +#| msgid "Dialpad" +msgid "Show dialpad" +msgstr "చుపు డీల్ప" #: ../src/empathy-call-window.ui.h:16 -msgid "Send Audio" -msgstr "ఆడియోను పంపు" +msgid "Start a video call" +msgstr "ఒక వీడియో కాల్ ప్రారంభండ్" #: ../src/empathy-call-window.ui.h:17 -msgid "Toggle audio transmission" -msgstr "" +msgid "Start an audio call" +msgstr "ఒక ఆడియో కాల్ ప్రారంభం" -#: ../src/empathy-call-window.ui.h:18 ../src/empathy-call-window.c:1824 -#: ../src/empathy-call-window.c:1825 ../src/empathy-call-window.c:1826 -#: ../src/empathy-call-window.c:1827 -msgid "Unknown" -msgstr "తెలియదు" +#: ../src/empathy-call-window.ui.h:18 +msgid "Swap camera" +msgstr "మార్పిడి కెమెరా" #: ../src/empathy-call-window.ui.h:19 -msgid "V_ideo" -msgstr "వీడియో (_i)" +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Toggle audio transmission" +msgstr "నొక్కండి ఆడియో ప్రసార" -#: ../src/empathy-call-window.ui.h:21 -msgid "Video Off" -msgstr "వీడియో ఆపు" +#: ../src/empathy-call-window.ui.h:20 +msgid "Toggle video transmission" +msgstr "నొక్కండి వీడియో ప్రసార" -#: ../src/empathy-call-window.ui.h:22 -msgid "Video On" -msgstr "వీడియో ఆన్‌చేయి" +#: ../src/empathy-call-window.ui.h:21 +#: ../src/empathy-streamed-media-window.ui.h:18 +#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477 +#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479 +msgid "Unknown" +msgstr "తెలియదు" #: ../src/empathy-call-window.ui.h:23 -msgid "Video Preview" -msgstr "వీడియో మునుజూపు" +#| msgctxt "menu item" +#| msgid "_Video Call" +msgid "Video call" +msgstr "వీడియో కాల్ " #: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:24 msgid "_Call" msgstr "కాల్ (_C)" #: ../src/empathy-call-window.ui.h:25 -#, fuzzy -#| msgid "Dialpad" -msgid "_Dialpad" -msgstr "డయల్‌ప్యాడ్" +#| msgid "Camera On" +msgid "_Camera" +msgstr "కెమెరా (_C)" + +#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-main-window-menubar.ui.h:18 +msgid "_Contents" +msgstr "విషయసూచిక (_C)" + +#: ../src/empathy-call-window.ui.h:27 +#: ../src/empathy-main-window-menubar.ui.h:19 +msgid "_Debug" +msgstr "డీబగ్ (_D)" + +#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 +#: ../src/empathy-main-window-menubar.ui.h:22 +msgid "_Help" +msgstr "సహాయం (_H)" + +#: ../src/empathy-call-window.ui.h:30 +msgid "_Microphone" +msgstr "మైక్రోఫోను (_M)" + +#: ../src/empathy-call-window.ui.h:31 +#| msgid "Geoclue Settings" +msgid "_Settings" +msgstr "అమరికలు (_S)" -#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30 +#: ../src/empathy-call-window.ui.h:32 +#: ../src/empathy-main-window-menubar.ui.h:30 +#: ../src/empathy-streamed-media-window.ui.h:25 msgid "_View" msgstr "వీక్షణం (_V)" -#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500 +#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d చదువనిది)" msgstr[1] "%s (%d చదువనివి)" -#: ../src/empathy-chat-window.c:492 +#: ../src/empathy-chat-window.c:493 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (మరియు %u ఇతర)" msgstr[1] "%s (మరియు %u ఇతరాలు)" -#: ../src/empathy-chat-window.c:508 +#: ../src/empathy-chat-window.c:509 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d ఇతరుల నుండి చదవనివి)" msgstr[1] "%s (%d ఇతరుల నుండి చదవనివి)" -#: ../src/empathy-chat-window.c:517 +#: ../src/empathy-chat-window.c:518 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d అన్నిటిని నుండి చదవనివి)" msgstr[1] "%s (%d అన్నిటిని నుండి చదవనివి)" -#: ../src/empathy-chat-window.c:732 +#: ../src/empathy-chat-window.c:733 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:742 +#: ../src/empathy-chat-window.c:743 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "%d సందేశమును పంపుతున్నది" msgstr[1] "%d సందేశాలను పంపుతున్నది" -#: ../src/empathy-chat-window.c:764 +#: ../src/empathy-chat-window.c:765 msgid "Typing a message." msgstr "ఒక సందేశమును టైపు చేస్తున్నారు." @@ -3604,10 +3693,6 @@ msgstr "ట్యాబ్‌ను కుడివైపుకు కదుప msgid "Notify for All Messages" msgstr "అన్ని సందేశాలకూ తెలియజేయి" -#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18 -msgid "_Contents" -msgstr "విషయసూచిక (_C)" - #: ../src/empathy-chat-window.ui.h:10 msgid "_Conversation" msgstr "సంభాషణ (_C)" @@ -3620,10 +3705,6 @@ msgstr "ట్యాబ్‌ను వేరుచేయి (_D)" msgid "_Favorite Chat Room" msgstr "ఇష్టమైన చాట్ గది (_F)" -#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22 -msgid "_Help" -msgstr "సహాయం (_H)" - #: ../src/empathy-chat-window.ui.h:15 msgid "_Next Tab" msgstr "తరువాత ట్యాబ్ (_N)" @@ -3644,15 +3725,15 @@ msgstr "ట్యాబ్‌లు (_T)" msgid "_Undo Close Tab" msgstr "ట్యాబ్‌ని మూసివేయుట రద్దుచేయి (_U)" -#: ../src/empathy-chatrooms-window.c:241 +#: ../src/empathy-chatrooms-window.c:251 msgid "Name" msgstr "పేరు" -#: ../src/empathy-chatrooms-window.c:259 +#: ../src/empathy-chatrooms-window.c:269 msgid "Room" msgstr "గది" -#: ../src/empathy-chatrooms-window.c:267 +#: ../src/empathy-chatrooms-window.c:277 msgid "Auto-Connect" msgstr "స్వయం-అనుసంధానం" @@ -3660,95 +3741,96 @@ msgstr "స్వయం-అనుసంధానం" msgid "Manage Favorite Rooms" msgstr "ఇష్టమైన గదులను నిర్వహించు" -#: ../src/empathy-event-manager.c:542 +#: ../src/empathy-event-manager.c:521 msgid "Incoming video call" msgstr "లోనికివచ్చు వీడియో కాల్" -#: ../src/empathy-event-manager.c:542 +#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449 msgid "Incoming call" msgstr "లోనికివచ్చు కాల్" -#: ../src/empathy-event-manager.c:546 +#: ../src/empathy-event-manager.c:525 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s మీకు వీడియో కాల్ చేస్తున్నారు, మీరు సమాధానమివ్వాలనుకుంటున్నారా?" -#: ../src/empathy-event-manager.c:547 +#: ../src/empathy-event-manager.c:526 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s మీకు కాల్ చేస్తున్నారు. మీరు సమాధానమివ్వాలనుకుంటున్నారా?" -#: ../src/empathy-event-manager.c:550 ../src/empathy-event-manager.c:751 -#: ../src/empathy-event-manager.c:784 +#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 +#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455 #, c-format msgid "Incoming call from %s" msgstr "%s నుండి లోనికి కాల్ వస్తున్నది" -#: ../src/empathy-event-manager.c:575 +#: ../src/empathy-event-manager.c:554 msgid "_Reject" msgstr "తిరస్కరించు (_R)" -#: ../src/empathy-event-manager.c:583 ../src/empathy-event-manager.c:591 +#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 msgid "_Answer" msgstr "సమాధానంయివ్వు (_A)" -#: ../src/empathy-event-manager.c:591 +#: ../src/empathy-event-manager.c:570 msgid "_Answer with video" -msgstr "" +msgstr "వీడియోతో జవాబువ్వండి (_A)" -#: ../src/empathy-event-manager.c:751 ../src/empathy-event-manager.c:784 +#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 +#: ../src/empathy-call-window.c:1455 #, c-format msgid "Incoming video call from %s" msgstr "%s నుండి వీడియో కాల్ వస్తున్నది" -#: ../src/empathy-event-manager.c:857 +#: ../src/empathy-event-manager.c:836 msgid "Room invitation" msgstr "గది ఆహ్వానము" -#: ../src/empathy-event-manager.c:859 +#: ../src/empathy-event-manager.c:838 #, c-format msgid "Invitation to join %s" msgstr "%s లో చేరుటకు ఆహ్వానం" -#: ../src/empathy-event-manager.c:866 +#: ../src/empathy-event-manager.c:845 #, c-format msgid "%s is inviting you to join %s" msgstr "%s మిమ్మలను %sకు జేరుటకు ఆహ్వానిస్తున్నారు" -#: ../src/empathy-event-manager.c:874 +#: ../src/empathy-event-manager.c:853 msgid "_Decline" msgstr "తిరస్కరించు(_D)" -#: ../src/empathy-event-manager.c:879 +#: ../src/empathy-event-manager.c:858 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "చేరు (_J)" -#: ../src/empathy-event-manager.c:906 +#: ../src/empathy-event-manager.c:885 #, c-format msgid "%s invited you to join %s" msgstr "%s మిమ్ములను %sనందు జేరుటకు ఆహ్వానించారు" -#: ../src/empathy-event-manager.c:912 +#: ../src/empathy-event-manager.c:891 #, c-format msgid "You have been invited to join %s" msgstr "%s లో చేరుటకు మీరు ఆహ్వానించబడ్డారు" -#: ../src/empathy-event-manager.c:963 +#: ../src/empathy-event-manager.c:942 #, c-format msgid "Incoming file transfer from %s" msgstr "%s నుండి వచ్చుచున్న ఫైల్ బదిలీకరణ" -#: ../src/empathy-event-manager.c:1155 ../src/empathy-main-window.c:375 +#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375 msgid "Password required" msgstr "సంకేతపదం అవసరం" -#: ../src/empathy-event-manager.c:1211 +#: ../src/empathy-event-manager.c:1190 #, c-format msgid "%s would like permission to see when you are online" -msgstr "" +msgstr "లో ఉన్నప్పుడు% s చూడండి అనుమతి కావాలనుకుంటున్నారని" -#: ../src/empathy-event-manager.c:1215 +#: ../src/empathy-event-manager.c:1194 #, c-format msgid "" "\n" @@ -3848,6 +3930,10 @@ msgstr "\"%s\" యొక్క ఇంటిగ్రిటిని పరిశ msgid "Hashing \"%s\"" msgstr "\"%s\" హాషింగ్" +#: ../src/empathy-ft-manager.c:1026 +msgid "%" +msgstr "%" + #: ../src/empathy-ft-manager.c:1038 msgid "File" msgstr "ఫైల్" @@ -3869,8 +3955,7 @@ msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." msgstr "" -"దిగుమతి చేయుటకు ఏ ఖాతాలు కనుగొనలేకపోయింది. ఎంపతి ప్రస్తుతం ఖాతాలను పిడ్జిన్ " -"నుండి దిగుమతి చేయుటకు " +"దిగుమతి చేయుటకు ఏ ఖాతాలు కనుగొనలేకపోయింది. ఎంపతి ప్రస్తుతం ఖాతాలను పిడ్జిన్ నుండి దిగుమతి చేయుటకు " "మాత్రమే సహకరిస్తుంది." #: ../src/empathy-import-dialog.c:199 @@ -3926,111 +4011,104 @@ msgid "Top up account credit" msgstr "టాప్ అప్ ఖాతా క్రెడిట్" #. top up button -#: ../src/empathy-main-window.c:1050 +#: ../src/empathy-main-window.c:1046 msgid "Top Up..." msgstr "టాప్ అప్..." -#: ../src/empathy-main-window.c:1817 +#: ../src/empathy-main-window.c:1789 msgid "Contact" msgstr "చిరునామా" -#: ../src/empathy-main-window.c:2169 +#: ../src/empathy-main-window.c:2121 msgid "Contact List" msgstr "పరిచయముల జాబితా" -#: ../src/empathy-main-window.c:2287 -msgid "Show and edit accounts" -msgstr "ఖాతాలను చూపించు మరియు సవరించు" - -#: ../src/empathy-main-window.ui.h:1 +#: ../src/empathy-main-window-menubar.ui.h:1 msgid "Contacts on a _Map" msgstr "పటము పై పరిచయాలు (_M)" -#: ../src/empathy-main-window.ui.h:2 +#: ../src/empathy-main-window-menubar.ui.h:2 msgid "Credit Balance" msgstr "క్రెడిట్ బ్యాలెన్స్" -#: ../src/empathy-main-window.ui.h:3 +#: ../src/empathy-main-window-menubar.ui.h:3 msgid "Find in Contact _List" msgstr "పరిచయముల జాబితాలో వెతుకు (_L)" -#: ../src/empathy-main-window.ui.h:4 +#: ../src/empathy-main-window-menubar.ui.h:4 msgid "Join _Favorites" msgstr "ఇష్టాంశాలలో చేరు (_F)" -#: ../src/empathy-main-window.ui.h:5 +#: ../src/empathy-main-window-menubar.ui.h:5 msgid "Manage Favorites" msgstr "ఇష్టాంశాలను నిర్వహించు" -#: ../src/empathy-main-window.ui.h:6 +#: ../src/empathy-main-window-menubar.ui.h:6 msgid "N_ormal Size" msgstr "సాధారణ పరిమాణము (_o)" -#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1 +#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 msgid "New _Call…" msgstr "కొత్త కాల్...(_C)" -#: ../src/empathy-main-window.ui.h:8 +#: ../src/empathy-main-window-menubar.ui.h:8 msgid "Normal Size With _Avatars" msgstr "అవతారములతో సాధారణ పరిమాణము (_A)" -#: ../src/empathy-main-window.ui.h:9 +#: ../src/empathy-main-window-menubar.ui.h:9 msgid "P_references" msgstr "ప్రాధాన్యతలు (_r)" -#: ../src/empathy-main-window.ui.h:10 +#: ../src/empathy-main-window-menubar.ui.h:10 msgid "Show P_rotocols" msgstr "ప్రోటోకాల్సును చూపించు (_r)" -#: ../src/empathy-main-window.ui.h:11 +#: ../src/empathy-main-window-menubar.ui.h:11 msgid "Sort by _Name" msgstr "పేరుని బట్టి క్రమబద్దీకరించు (_N)" -#: ../src/empathy-main-window.ui.h:12 +#: ../src/empathy-main-window-menubar.ui.h:12 msgid "Sort by _Status" msgstr "స్థితిని బట్టి క్రమబద్దీకరించు (_S)" -#: ../src/empathy-main-window.ui.h:13 +#: ../src/empathy-main-window-menubar.ui.h:13 msgid "_Accounts" msgstr "ఖాతాలు (_A)" -#: ../src/empathy-main-window.ui.h:15 +#: ../src/empathy-main-window-menubar.ui.h:15 msgid "_Blocked Contacts" msgstr "నిరోధించబడిన పరిచయాలు (_O)" -#: ../src/empathy-main-window.ui.h:17 +#: ../src/empathy-main-window-menubar.ui.h:17 msgid "_Compact Size" msgstr "పరిమాణమును కుదించు (_C)" -#: ../src/empathy-main-window.ui.h:19 -msgid "_Debug" -msgstr "డీబగ్ (_D)" - -#: ../src/empathy-main-window.ui.h:21 +#: ../src/empathy-main-window-menubar.ui.h:21 msgid "_File Transfers" msgstr "ఫైల్ బదిలీలు (_F)" -#: ../src/empathy-main-window.ui.h:23 +#: ../src/empathy-main-window-menubar.ui.h:23 msgid "_Join…" msgstr "చేరు...(_J)" -#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3 +#: ../src/empathy-main-window-menubar.ui.h:24 +#: ../src/empathy-status-icon.ui.h:3 msgid "_New Conversation…" msgstr "కొత్త సంభాషణ...(_N)" -#: ../src/empathy-main-window.ui.h:25 +#: ../src/empathy-main-window-menubar.ui.h:25 msgid "_Offline Contacts" msgstr "ఆఫ్‌లైన్ పరిచయాలు (_O)" -#: ../src/empathy-main-window.ui.h:26 +#: ../src/empathy-main-window-menubar.ui.h:26 msgid "_Personal Information" msgstr "వ్యక్తిగత సమాచారము (_P)" -#: ../src/empathy-main-window.ui.h:28 +#: ../src/empathy-main-window-menubar.ui.h:28 msgid "_Room" msgstr "గది (_R)" -#: ../src/empathy-main-window.ui.h:29 +#: ../src/empathy-main-window-menubar.ui.h:29 msgid "_Search for Contacts…" msgstr "పరిచయాల కోసం వెతుకు...(_S)" @@ -4077,17 +4155,14 @@ msgstr "గది జాబితాను లోడు చేయలేకపో #: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "" "Enter the room name to join here or click on one or more rooms in the list." -msgstr "" -"ఇక్కడ చేరుటకు గది పేరును ప్రవేశపెట్టండి లేదా జాబితాలోని ఒకటి లేదా ఎక్కువ గదుల " -"పై నొక్కండి." +msgstr "ఇక్కడ చేరుటకు గది పేరును ప్రవేశపెట్టండి లేదా జాబితాలోని ఒకటి లేదా ఎక్కువ గదుల పై నొక్కండి." #: ../src/empathy-new-chatroom-dialog.ui.h:4 msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" msgstr "" -"గదికి ఆతిధ్యమిచ్చు సేవకమును ప్రవేశపెట్టండి, లేదా ఒకవేళ గది ప్రస్తుత ఖాతా " -"సేవకములో ఉంటే ఖాళీగా వదిలివేయండి" +"గదికి ఆతిధ్యమిచ్చు సేవకమును ప్రవేశపెట్టండి, లేదా ఒకవేళ గది ప్రస్తుత ఖాతా సేవకములో ఉంటే ఖాళీగా వదిలివేయండి" #: ../src/empathy-new-chatroom-dialog.ui.h:5 msgid "Join Room" @@ -4101,79 +4176,79 @@ msgstr "గది జాబితా" msgid "_Room:" msgstr "గది (_R):" -#: ../src/empathy-preferences.c:156 +#: ../src/empathy-preferences.c:169 msgid "Message received" msgstr "సందేశం స్వీకరించబడింది" -#: ../src/empathy-preferences.c:157 +#: ../src/empathy-preferences.c:170 msgid "Message sent" msgstr "సందేశం పంపబడింది" -#: ../src/empathy-preferences.c:158 +#: ../src/empathy-preferences.c:171 msgid "New conversation" msgstr "కొత్త సంభాషణ" -#: ../src/empathy-preferences.c:159 +#: ../src/empathy-preferences.c:172 msgid "Contact goes online" msgstr "పరిచయం ఆన్‌లైన్‌కు వెళుతుంది" -#: ../src/empathy-preferences.c:160 +#: ../src/empathy-preferences.c:173 msgid "Contact goes offline" msgstr "పరిచయం ఆఫ్‌లైనుకు వెళుతుంది" -#: ../src/empathy-preferences.c:161 +#: ../src/empathy-preferences.c:174 msgid "Account connected" msgstr "ఖాతా అనుసంధానించబడింది" -#: ../src/empathy-preferences.c:162 +#: ../src/empathy-preferences.c:175 msgid "Account disconnected" msgstr "ఖాతా అననుసంధానించబడింది" -#: ../src/empathy-preferences.c:459 +#: ../src/empathy-preferences.c:484 msgid "Language" msgstr "భాష" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:709 +#: ../src/empathy-preferences.c:734 msgid "Juliet" msgstr "జూలియట్" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:716 +#: ../src/empathy-preferences.c:741 msgid "Romeo" msgstr "రోమియో" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:722 +#: ../src/empathy-preferences.c:747 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "ఓ రోమియో, రోమియో, ఎక్కడున్నావు రోమియో?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:725 +#: ../src/empathy-preferences.c:750 msgid "Deny thy father and refuse thy name;" -msgstr "" +msgstr "నీ తండ్రి తిరస్కరించు మరియు నీ పేరు తిరస్కరించవచ్చు;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:728 +#: ../src/empathy-preferences.c:753 msgid "Or if thou wilt not, be but sworn my love" -msgstr "" +msgstr "లేదా నీవు విల్ట్ లేకపోతే, కానీ నా ప్రేమ ప్రమాణ స్వీకారం" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:731 +#: ../src/empathy-preferences.c:756 msgid "And I'll no longer be a Capulet." -msgstr "" +msgstr "నేను ఇకపై ఒక Capulet ఉంటాం." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:759 msgid "Shall I hear more, or shall I speak at this?" msgstr "నేనింకా ఎక్కువ వినాలా, లేక నేను ఇక మాట్లాడవచ్చా?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:737 +#: ../src/empathy-preferences.c:762 msgid "Juliet has disconnected" msgstr "జూలియట్ అననుసంధానించింది" -#: ../src/empathy-preferences.c:1131 +#: ../src/empathy-preferences.c:1166 msgid "Preferences" msgstr "ప్రాధాన్యతలు" @@ -4181,144 +4256,159 @@ msgstr "ప్రాధాన్యతలు" msgid "Appearance" msgstr "కనిపించువిధము" -#: ../src/empathy-preferences.ui.h:2 +#: ../src/empathy-preferences.ui.h:3 msgid "Behavior" msgstr "ప్రవర్తన" -#: ../src/empathy-preferences.ui.h:3 +#: ../src/empathy-preferences.ui.h:5 msgid "Chat Th_eme:" msgstr "చాట్ థీము (_e):" -#: ../src/empathy-preferences.ui.h:4 +#: ../src/empathy-preferences.ui.h:6 msgid "Disable notifications when _away or busy" msgstr "దూరంగా లేదాతీరికలేనప్పుడు ప్రకటనలను అచేతనపరుచు (_a)" -#: ../src/empathy-preferences.ui.h:5 +#: ../src/empathy-preferences.ui.h:7 msgid "Disable sounds when _away or busy" msgstr "దూరంగా లేదా తీరికలేనప్పుడు శబ్దములను అచేతనపరుచు (_a)" -#: ../src/empathy-preferences.ui.h:6 +#: ../src/empathy-preferences.ui.h:8 msgid "Display incoming events in the notification area" msgstr "లోనికివచ్చు ఘటనలను ప్రకటిత ప్రాంతములో చూపించు" -#: ../src/empathy-preferences.ui.h:7 +#: ../src/empathy-preferences.ui.h:9 +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 "" +"ప్రతిధ్వని రద్దు ఇతర వ్యక్తి మీ వాయిస్ ధ్వని స్వచ్చమైన చేయడానికి సహాయపడుతుంది, కానీ కొన్ని కంప్యూటర్లలో " +"సమస్యలు కారణం కావచ్చు. మీరు లేదా ఇతర వ్యక్తి కాల్స్ సమయంలో వింత ధ్వనులను లేదా గ్లిట్చెస్ వినడానికి ఉంటే, " +"ప్రతిధ్వని రద్దు ఆఫ్ చెయ్యడానికి మరియు కాల్ మళ్ళీ ప్రారంభించడానికి ప్రయత్నించండి." + +#: ../src/empathy-preferences.ui.h:10 msgid "Enable notifications when a contact comes online" msgstr "పరిచయము ఆన్‌లైనుకు వచ్చినప్పుడు ప్రకటనలను చేతనపరుచు" -#: ../src/empathy-preferences.ui.h:8 +#: ../src/empathy-preferences.ui.h:11 msgid "Enable notifications when a contact goes offline" msgstr "పరిచయం ఆఫ్‌లైన్‌కు వెళ్ళినప్పుడు ప్రకటనలను చేతనపరుచు" -#: ../src/empathy-preferences.ui.h:9 +#: ../src/empathy-preferences.ui.h:12 msgid "Enable notifications when the _chat is not focused" msgstr "చాట్ పై దృష్టిసారించనప్పుడు ప్రకటనలను చేతనపరుచు (_c)" -#: ../src/empathy-preferences.ui.h:10 +#: ../src/empathy-preferences.ui.h:13 msgid "Enable spell checking for languages:" msgstr "ఈ భాషలకు అక్షరక్రమ తనిఖీచేయుటని చేతనపరుచు:" -#: ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-preferences.ui.h:14 msgid "General" msgstr "సాధారణ" -#: ../src/empathy-preferences.ui.h:13 +#: ../src/empathy-preferences.ui.h:15 +msgid "Input level:" +msgstr "ఇన్పుట్ స్థాయి:" + +#: ../src/empathy-preferences.ui.h:16 +msgid "Input volume:" +msgstr "ఇన్పుట్ పరిమాణం:" + +#: ../src/empathy-preferences.ui.h:18 msgid "Location sources:" msgstr "స్థాన మూలాలు:" -#: ../src/empathy-preferences.ui.h:14 +#: ../src/empathy-preferences.ui.h:19 msgid "Log conversations" msgstr "సంభాషణల చిట్టా" -#: ../src/empathy-preferences.ui.h:15 +#: ../src/empathy-preferences.ui.h:20 msgid "Notifications" msgstr "ప్రకటనలు" -#: ../src/empathy-preferences.ui.h:16 +#: ../src/empathy-preferences.ui.h:21 msgid "Play sound for events" msgstr "ఘటనల కొరకు శబ్దమును ప్లేచేయి" -#: ../src/empathy-preferences.ui.h:17 +#: ../src/empathy-preferences.ui.h:22 msgid "Privacy" msgstr "గోప్యత" -#: ../src/empathy-preferences.ui.h:18 +#: ../src/empathy-preferences.ui.h:23 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 "" -"స్థానము ఖచ్చితత్వమును తగ్గించుట వలన మీ పట్టణము, రాష్ట్రము మరియు దేశము కంటే " -"ఎక్కువ స్పష్టముగా " +"స్థానము ఖచ్చితత్వమును తగ్గించుట వలన మీ పట్టణము, రాష్ట్రము మరియు దేశము కంటే ఎక్కువ స్పష్టముగా " "ప్రచురించబడవు. GPS నిర్దేశకాలు ఖచ్చితముగా 1 డెసిమల్ స్థానమునకు ఉంటాయి." -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:24 msgid "Show _smileys as images" msgstr "చిరునవ్వులను బొమ్మల వలె చూపించు (_s)" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:25 msgid "Show contact _list in rooms" msgstr "గదులలో పరిచయ జాబితాను చూపించు (_l)" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:26 msgid "Sounds" msgstr "శబ్దములు" -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:27 msgid "Spell Checking" msgstr "అక్షరక్రమ తనిఖీ" -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:28 msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." -msgstr "" -"మీరు ఏ భాషలకైతే ఒక నిఘంటువుని స్థాపించారో ఆ భాషల యొక్క జాబితా మాత్రమే " -"ప్రతిబింబిస్తుంది." +msgstr "మీరు ఏ భాషలకైతే ఒక నిఘంటువుని స్థాపించారో ఆ భాషల యొక్క జాబితా మాత్రమే ప్రతిబింబిస్తుంది." -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:29 msgid "Themes" msgstr "థీములు" -#: ../src/empathy-preferences.ui.h:25 -#, fuzzy +#: ../src/empathy-preferences.ui.h:30 #| msgid "Theme Variant:" msgid "Variant:" -msgstr "థీము రూపాంతరం:" +msgstr "రూపాంతరం:" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:31 msgid "_Automatically connect on startup" msgstr "వ్యవస్థ ప్రారంభమయినపుడు స్వయంచాలకంగా అనుసంధానమవ్వు (_A)" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:32 msgid "_Cellphone" msgstr "సెల్‌ఫోన్ (_C)" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:33 msgid "_Enable bubble notifications" msgstr "బుడగ ప్రకటనలను చేతనపరుచు (_E)" -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:34 msgid "_Enable sound notifications" msgstr "శబ్దపు ప్రకటనలను చేతనపరుచు (_E)" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:35 msgid "_GPS" msgstr "_GPS" -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:36 msgid "_Network (IP, Wi-Fi)" msgstr "నెట్‌వర్కు (IP, Wi-Fi) (_N)" -#: ../src/empathy-preferences.ui.h:32 +#: ../src/empathy-preferences.ui.h:37 msgid "_Open new chats in separate windows" msgstr "వేరువేరు విండోలలో కొత్త చాట్‌లను తెరువు (_O)" -#: ../src/empathy-preferences.ui.h:33 +#: ../src/empathy-preferences.ui.h:38 msgid "_Publish location to my contacts" msgstr "స్థానమును నా పరిచయములకు ప్రచురించు (_P)" #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees. -#: ../src/empathy-preferences.ui.h:35 +#: ../src/empathy-preferences.ui.h:40 msgid "_Reduce location accuracy" msgstr "స్థానము ఖచ్చితత్వమును తగ్గించు (_R)" @@ -4330,91 +4420,136 @@ msgstr "స్థితి" msgid "_Quit" msgstr "నిష్క్రమించు (_Q)" +#: ../src/empathy-streamed-media-window.ui.h:2 +msgid "Call the contact again" +msgstr "పరిచయానికి మళ్ళీ కాల్ చేయి" + +#: ../src/empathy-streamed-media-window.ui.h:3 +msgid "Camera Off" +msgstr "కెమెరా ఆపు" + +#: ../src/empathy-streamed-media-window.ui.h:4 +msgid "Camera On" +msgstr "కెమెరా ఆన్ చేయి" + +#: ../src/empathy-streamed-media-window.ui.h:6 +msgid "Disable camera and stop sending video" +msgstr "కెమెరాను అచేతనపరుచు మరియు వీడియోని పంపుట ఆపివేయి" + +#: ../src/empathy-streamed-media-window.ui.h:7 +msgid "Enable camera and send video" +msgstr "కెమెరాను చేతనపరిచి, వీడియోను పంపు" + +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "Enable camera but don't send video" +msgstr "కెమెరాను చేతనపరుచు కాని వీడియో పంపవద్దు" + +#: ../src/empathy-streamed-media-window.ui.h:13 +msgid "Preview" +msgstr "మునుజూపు" + +#: ../src/empathy-streamed-media-window.ui.h:14 +msgid "Redial" +msgstr "తిరిగిడయిల్‌చేయి" + +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "V_ideo" +msgstr "వీడియో (_i)" + +#: ../src/empathy-streamed-media-window.ui.h:21 +msgid "Video Off" +msgstr "వీడియో ఆపు" + +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Video On" +msgstr "వీడియో ఆన్‌చేయి" + +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Video Preview" +msgstr "వీడియో మునుజూపు" + #: ../src/empathy-map-view.c:448 msgid "Contact Map View" msgstr "పరిచయ పటము వీక్షణ" -#: ../src/empathy-debug-window.c:1218 +#: ../src/empathy-debug-window.c:1228 msgid "Save" msgstr "భద్రపరచు" -#: ../src/empathy-debug-window.c:1394 +#: ../src/empathy-debug-window.c:1435 msgid "Debug Window" msgstr "దోషశుద్ది విండో" -#: ../src/empathy-debug-window.c:1476 +#: ../src/empathy-debug-window.c:1517 msgid "Pause" msgstr "నిలిపివేయి" -#: ../src/empathy-debug-window.c:1488 +#: ../src/empathy-debug-window.c:1529 msgid "Level " msgstr "స్థాయి " -#: ../src/empathy-debug-window.c:1508 +#: ../src/empathy-debug-window.c:1549 msgid "Debug" msgstr "దోషశుద్ది" -#: ../src/empathy-debug-window.c:1514 +#: ../src/empathy-debug-window.c:1555 msgid "Info" msgstr "సమాచారము" -#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569 +#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610 msgid "Message" msgstr "సందేశము" -#: ../src/empathy-debug-window.c:1526 +#: ../src/empathy-debug-window.c:1567 msgid "Warning" msgstr "హెచ్చరిక" -#: ../src/empathy-debug-window.c:1532 +#: ../src/empathy-debug-window.c:1573 msgid "Critical" msgstr "క్లిష్టమైన" -#: ../src/empathy-debug-window.c:1538 +#: ../src/empathy-debug-window.c:1579 msgid "Error" msgstr "దోషము" -#: ../src/empathy-debug-window.c:1557 +#: ../src/empathy-debug-window.c:1598 msgid "Time" msgstr "సమయం" -#: ../src/empathy-debug-window.c:1560 +#: ../src/empathy-debug-window.c:1601 msgid "Domain" msgstr "డొమైన్" -#: ../src/empathy-debug-window.c:1562 +#: ../src/empathy-debug-window.c:1603 msgid "Category" msgstr "వర్గము" -#: ../src/empathy-debug-window.c:1564 +#: ../src/empathy-debug-window.c:1605 msgid "Level" msgstr "స్థాయి" -#: ../src/empathy-debug-window.c:1601 +#: ../src/empathy-debug-window.c:1642 msgid "" "The selected connection manager does not support the remote debugging " "extension." -msgstr "" -"ఎంచుకున్న అనుసంధాన నిర్వాహకము దూరస్థ దోషశుద్ధిచేసే పొడిగింపుకు సహకరించుటలేదు." +msgstr "ఎంచుకున్న అనుసంధాన నిర్వాహకము దూరస్థ దోషశుద్ధిచేసే పొడిగింపుకు సహకరించుటలేదు." -#: ../src/empathy-invite-participant-dialog.c:429 -#: ../src/empathy-invite-participant-dialog.c:477 +#: ../src/empathy-invite-participant-dialog.c:179 +#: ../src/empathy-invite-participant-dialog.c:205 msgid "Invite Participant" msgstr "భాగస్వామిని ఆహ్వానించు" -#: ../src/empathy-invite-participant-dialog.c:430 +#: ../src/empathy-invite-participant-dialog.c:180 msgid "Choose a contact to invite into the conversation:" msgstr "సంభాషణలోకి ఆహ్వానించుటకు ఒక పరిచయాన్ని ఎన్నుకోండి:" -#: ../src/empathy-invite-participant-dialog.c:473 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Invite" msgstr "ఆహ్వానించు" #: ../src/empathy-accounts.c:183 msgid "Don't display any dialogs; do any work (eg, importing) and exit" -msgstr "" -"ఏ డైలాగులను ప్రదర్శించవద్దు; ఏదైనా పనిచేయి (ఉదా. దిగుమతిచేయుట) మరియు " -"నిష్క్రమించు" +msgstr "ఏ డైలాగులను ప్రదర్శించవద్దు; ఏదైనా పనిచేయి (ఉదా. దిగుమతిచేయుట) మరియు నిష్క్రమించు" #: ../src/empathy-accounts.c:187 msgid "" @@ -4423,8 +4558,7 @@ msgstr "కేవలం \"దగ్గరలోని వ్యక్తుల #: ../src/empathy-accounts.c:191 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" -msgstr "" -"ప్రాథమికంగా ఇచ్చిన ఖాతాను ఎంచుకొను (ఉదా, gabble/jabber/foo_40example_2eorg0)" +msgstr "ప్రాథమికంగా ఇచ్చిన ఖాతాను ఎంచుకొను (ఉదా, gabble/jabber/foo_40example_2eorg0)" #: ../src/empathy-accounts.c:193 msgid "" @@ -4438,7 +4572,16 @@ msgstr "- ఎంపతి ఖాతాలు" msgid "Empathy Accounts" msgstr "ఎంపతి ఖాతాలు" -#: ../src/empathy-debugger.c:66 +#: ../src/empathy-debugger.c:70 +msgid "Show a particular service" +msgstr "ఒక నిర్దిష్ట సేవ చూపించు" + +#: ../src/empathy-debugger.c:75 +#| msgid "Empathy Debugger" +msgid "- Empathy Debugger" +msgstr "- తాదాత్మ్యం డీబగ్గర్" + +#: ../src/empathy-debugger.c:114 msgid "Empathy Debugger" msgstr "ఎంపతి దోష శుద్దిచేసేది" @@ -4451,17 +4594,19 @@ msgid "Respond" msgstr "స్పందించు" #: ../src/empathy-notifications-approver.c:217 +#: ../src/empathy-call-window.c:1459 msgid "Reject" msgstr "తిరస్కరించు" #: ../src/empathy-notifications-approver.c:222 #: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-call-window.c:1460 msgid "Answer" msgstr "సమాధానమివ్వు" #: ../src/empathy-notifications-approver.c:227 msgid "Answer with video" -msgstr "" +msgstr "వీడియో తో సమాధానం" #: ../src/empathy-notifications-approver.c:235 #: ../src/empathy-notifications-approver.c:245 @@ -4473,37 +4618,76 @@ msgstr "నిరాకరించు" msgid "Accept" msgstr "అంగీకరించు" +#. translators: the 'Provide' button is displayed in a notification +#. * bubble when Empathy is asking for an account password; clicking on it +#. * brings the password popup. #: ../src/empathy-notifications-approver.c:260 msgid "Provide" msgstr "సమకూర్చు" -#: ../src/empathy-call-observer.c:133 +#: ../src/empathy-call-observer.c:134 #, c-format msgid "%s just tried to call you, but you were in another call." -msgstr "" -"%s ఇప్పుడే కాల్ చేయడానికి ప్రయత్నించారు, కాని మీరు వేరే కాల్ నందు ఉన్నారు." +msgstr "%s ఇప్పుడే కాల్ చేయడానికి ప్రయత్నించారు, కాని మీరు వేరే కాల్ నందు ఉన్నారు." -#: ../src/empathy-call-window.c:1246 -#, fuzzy, c-format -#| msgid "Call with %s" -msgid "Call with %d participants" -msgstr "%sతో కాల్ చేయి" +#. Translators: this is an "Info" label. It should be as short +#. * as possible. +#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111 +msgid "i" +msgstr " నెను" + +#: ../src/empathy-call-window.c:2775 +msgid "On hold" +msgstr "లొ దచు" + +#: ../src/empathy-call-window.c:2778 +msgid "Mute" +msgstr "నిశబ్దం" + +#: ../src/empathy-call-window.c:2780 +#| msgid "Location" +msgid "Duration" +msgstr "నిడివి" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2124 -#, fuzzy, c-format +#: ../src/empathy-call-window.c:2783 +#, c-format #| msgid "Connected — %d:%02dm" msgid "%s — %d:%02dm" -msgstr "అనుసంధానించబడింది — %d:%02dm" - -#: ../src/empathy-call-window.c:2125 -msgid "On hold" -msgstr "" +msgstr "%s — %d:%02dm" -#: ../libempathy-gtk/empathy-search-bar.c:282 +#: ../libempathy-gtk/empathy-search-bar.c:243 msgid "_Match case" msgstr "సరిపోలు సందర్భం (_M)" +#~ msgid "Find Next" +#~ msgstr "తరువాతది కనుగొను" + +#~ msgid "Find Previous" +#~ msgstr "మునుపటిది కనుగొను" + +#~ msgid "Enter Custom Message" +#~ msgstr "అనురూపిత సందేశమును ప్రవేశపెట్టు" + +#~ msgid "Save _New Status Message" +#~ msgstr "కొత్త స్థితి సందేశాన్ని భద్రపరుచు (_N)" + +#~ msgid "Saved Status Messages" +#~ msgstr "భద్రపరుచబడిన స్థితి సందేశాలు" + +#, fuzzy +#~| msgid "Dialpad" +#~ msgid "_Dialpad" +#~ msgstr "డయల్‌ప్యాడ్" + +#~ msgid "Show and edit accounts" +#~ msgstr "ఖాతాలను చూపించు మరియు సవరించు" + +#, fuzzy +#~| msgid "Call with %s" +#~ msgid "Call with %d participants" +#~ msgstr "%sతో కాల్ చేయి" + #~ msgid "All" #~ msgstr "అన్ని" @@ -4693,9 +4877,6 @@ msgstr "సరిపోలు సందర్భం (_M)" #~ msgid "Allow _network usage" #~ msgstr "నెట్వర్కు వినియోగమును అనుమతించుము (_n)" -#~ msgid "Geoclue Settings" -#~ msgstr "Geoclue అమరికలు" - #~ msgid "Unable to start application for service %s: %s" #~ msgstr "సేవ %s కొరకు అనువర్తనమును ప్రారంభించలేదు: %s" diff --git a/po/tr.po b/po/tr.po index d27579d6..13684978 100644 --- a/po/tr.po +++ b/po/tr.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2011-11-01 12:39+0000\n" -"PO-Revision-Date: 2011-11-02 12:18+0200\n" +"POT-Creation-Date: 2011-12-28 20:46+0000\n" +"PO-Revision-Date: 2011-12-29 20:01+0200\n" "Last-Translator: Muhammet Kara \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" @@ -44,22 +44,14 @@ msgid "Always open a separate chat window for new chats." msgstr "Yeni sohbetler için her zaman ayrı bir pencere aç." #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Çağrı ses düzeyi" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Yüzde olarak çağrı ses düzeyi." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "Camera device" msgstr "Kamera aygıtı" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 msgid "Camera position" msgstr "Kamera konumu" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." @@ -67,59 +59,59 @@ msgstr "" "Grup sohbetindeyken takma isim tamamlamada (tab) ismin sonuna eklenecek " "karakter." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 msgid "Chat window theme" msgstr "Sohbet penceresi teması" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "Chat window theme variant" msgstr "Sohbet penceresi tema varyantı" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" "İmla denetçisinin kullanacağı dillerin virgülle ayrılmış listesi (örn: \"tr, " "en, fr\")." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Compact contact list" msgstr "Sıkışık bağlantı listesi" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 msgid "Connection managers should be used" msgstr "Bağlantı yöneticileri kullanılmalıdır" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Contact list sort criterion" msgstr "Bağlantı listesi sıralama kıstası" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 msgid "D-Bus object path of the last account selected to join a room." msgstr "Bir odaya katılmak için son seçilen hesabın D-Bus nesne yolu" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "" "Görüntülü aramalarda kullanılacak öntanımlı kamera aygıtı, /dev/vide0 vb." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Default directory to select an avatar image from" msgstr "Bir avatar resmi seçmek için öntanımlı dizin" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Disable popup notifications when away" msgstr "Uzaktayken açılır uyarıları etkisizleştir" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Disable sounds when away" msgstr "Uzaktayken sesleri etkisizleştir" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Display incoming events in the status area" msgstr "Gelen olayları durum alanında göster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "" "Display incoming events in the status area. If false, present them to the " "user immediately." @@ -127,248 +119,248 @@ msgstr "" "Gelen olayları durum alanında göster. Eğer devre dışıysa, kullanıcıya hemen " "göster." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Echo cancellation support" msgstr "Yankı giderme desteği" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy can publish the user's location" msgstr "Empati kullanıcının yerini yayınlayabilirsiniz" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Empathy can use the GPS to guess the location" msgstr "Empati konumu tahmin etmek için GPS kullanabilir" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy can use the cellular network to guess the location" msgstr "Empati konumu tahmin etmek için hücresel ağ kullanabilir" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy can use the network to guess the location" msgstr "Empati konumu tahmin etmek için ağ kullanabilir" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Empathy default download folder" msgstr "Empati öntanımlı indirme klasörü" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Empathy should auto-away when idle" msgstr "Empathy boş duruyorsa otomatik olarak uzakta durumuna geçmeli" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Empathy should auto-connect on startup" msgstr "Başlangıçta Empati otomatik bağlanmalı" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Empathy should reduce the location's accuracy" msgstr "Empati konumun hassasiyetini azaltmalı" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "" "Empati sohbet penceresi simgesi olarak bağlantının avatarını kullanmalı" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Enable WebKit Developer Tools" msgstr "WebKit Geliştirici Araçlarını Etkinleştir" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Enable popup notifications for new messages" msgstr "Yeni mesajlar için açılır uyarıları etkinleştir" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Enable spell checker" msgstr "İmla denetçisini etkinleştir" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Hide main window" msgstr "Ana pencereyi gizle" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Hide the main window." msgstr "Ana pencereyi gizle." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Last account selected in Join Room dialog" msgstr "Odaya Katıl iletişim penceresinde son seçilen hesap" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Nick completed character" msgstr "Takma ad tamamlama karakteri" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Open new chats in separate windows" msgstr "Yeni sohbetleri ayrı pencerelerde aç" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Path of the Adium theme to use" msgstr "Kullanılacak Adium teması yolu" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "" "Eğer sohbet için kullanılan tema Adium ise kullanılacak Adium temasının yolu." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound for incoming messages" msgstr "Gelen mesajlar için bir ses çal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for new conversations" msgstr "Yeni sohbetler için bir ses çal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for outgoing messages" msgstr "Giden mesajlar için bir ses çal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Play a sound when a contact logs in" msgstr "Bir bağlantı giriş yaptığında bir ses çal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound when a contact logs out" msgstr "Bir kişi çıkış yaptığında bir ses çal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when we log in" msgstr "Giriş yaptığımızda bir ses çal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound when we log out" msgstr "Çıkış yaptığımızda bir ses çal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Pop up notifications if the chat isn't focused" msgstr "Sohbet odaklanmamışsa uyarıları açılır pencerede göster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Pop up notifications when a contact logs in" msgstr "Bir kişi oturum açtığında uyarıları açılır pencerede göster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Pop up notifications when a contact logs out" msgstr "Bir kişi çıkış yaptığında uyarıları açılır pencerede göster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Position the camera preview should be during a call." msgstr "Arama sırasında kamera önizlemesinin olması gereken konum." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "Show Balance in contact list" msgstr "Kişi listesinde bakiyeyi göster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Show avatars" msgstr "Avatarları göster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Show contact list in rooms" msgstr "Odalarda bağlantı listesini göster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Show hint about closing the main window" msgstr "Ana pencereyi kapatırken ipucu göster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Show offline contacts" msgstr "Çevrimdışı bağlantıları göster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Show protocols" msgstr "İletişim kurallarını göster" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Spell checking languages" msgstr "İmla denetimi dilleri" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "The default folder to save file transfers in." msgstr "Dosya transferlerini içine kaydetmek için öntanımlı klasör." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "The last directory that an avatar image was chosen from." msgstr "Bir avatar resminin seçildiği son dizin." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "The position for the chat window side pane" msgstr "Sohbet penceresi kenar paneli konumu" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "The stored position (in pixels) of the chat window side pane." msgstr "Sohbet penceresi kenar panelinin kayıtlı konumu (piksel olarak)." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "The theme that is used to display the conversation in chat windows." msgstr "Sohbet pencerelerinde konuşmayı göstermek için kullanılan tema." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "" "Sohbet pencerelerinde konuşmayı göstermek için kullanılan tema değişkeni." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "Grafiksel gülümsemeleri kullan" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Use notification sounds" msgstr "Uyarı seslerini kullan" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use theme for chat rooms" msgstr "Sohbet odaları için tema kullan" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "" "Empati'nin bağlantılara kullanıcının yerini yayınlayıp yayınlayamayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Empati'nin konumu tahmin etmek için GPS kullanıp kullanamayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "" "Empati'nin konumu tahmin etmek için cep telefonu şebekesini kullanıp " "kullanamayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether Empathy can use the network to guess the location." msgstr "Empati'nin konumu tahmin etmek için ağı kullanıp kullanamayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "" "Başlangıçta Empati'nin hesaplarınıza otomatik olarak giriş yapıp yapmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "" "Whether Empathy should go into away mode automatically if the user is idle." msgstr "" "Kullanıcının bilgisayar başında olmadığı zaman Empati'nin uzakta kipine " "otomatik olarak geçip geçmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" "Empati'nin gizlilik nedenleriyle konumun doğruluğunu azaltıp azaltmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" "Empati'nin bağlantının avatarını sohbet penceresi simgesi olarak kullanıp " "kullanmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "Web Inspector gibi WebKit geliştirici araçlarının etkin olması." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." @@ -376,72 +368,72 @@ msgstr "" "Bağlantı yöneticilerinin otomatik olarak bağlantıyı kesmek/yeniden bağlanmak " "için kullanılıp kullanılmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "" "Whether to check words typed against the languages you want to check with." msgstr "" "Yazılan kelimelerin seçtiğiniz dillere göre imla denetiminden geçip " "geçmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Whether to convert smileys into graphical images in conversations." msgstr "" "Konuşmalarda gülümsemelerin grafiksel görüntülere çevrilip çevrilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "" "Pulseaudio'nun yankı giderme filtresinin etkinleştirilip " "etkinleştirilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "" "Bağlantılar ağa giriş yaparken uyarı amaçlı bir ses çalınıp çalınmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "" "Bağlantılar ağdan çıkış yaparken uyarı amaçlı bir ses çalınıp çalınmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Whether to play a sound to notify of events." msgstr "Olaylar için uyarı amaçlı bir ses çalınıp çalınmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to play a sound to notify of incoming messages." msgstr "Gelen mesajlar için uyarı amaçlı bir ses çalınıp çalınmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Whether to play a sound to notify of new conversations." msgstr "Yeni sohbetler için uyarı amaçlı bir ses çalınıp çalınmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to play a sound to notify of outgoing messages." msgstr "Giden mesajlar için uyarı amaçlı bir ses çalınıp çalınmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Whether to play a sound when logging into a network." msgstr "Bir ağa giriş yapılırken uyarı amaçlı bir ses çalınıp çalınmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to play a sound when logging out of a network." msgstr "Bir ağdan çıkış yapılırken uyarı amaçlı bir ses çalınıp çalınmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to play sound notifications when away or busy." msgstr "Uzakta veya meşgul iken uyarı amaçlı seslerin çalınıp çalınmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to show a popup notification when a contact goes offline." msgstr "Bir kişi çevrimdışı olduğunda bir uyarı belirtilip belirtilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Whether to show a popup notification when a contact goes online." msgstr "Bir kişi çevrimiçi olduğunda bir uyarı belirtilip belirtilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." @@ -449,46 +441,46 @@ msgstr "" "Sohbet halen açık fakat odaklanmamış olsa dahi yeni bir mesaj alınırken " "açılır bir uyarı gösterilip gösterilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Whether to show a popup notification when receiving a new message." msgstr "" "Yeni bir mesaj alınırken açılır uyarıların gösterilip gösterilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Whether to show account balances in the contact list." msgstr "Kişi listesinde hesap bakiyelerinin gösterilip gösterilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "" "Bağlantı listesindeki ve sohbet pencerelerindeki bağlantılar için avatar " "gösterilip gösterilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Whether to show contacts that are offline in the contact list." msgstr "" "Bağlantı listesindeki çevrimdışı bağlantıların gösterilip gösterilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Whether to show popup notifications when away or busy." msgstr "Uzakta veya meşgul iken açılır uyarıların gösterilip gösterilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to show protocols for contacts in the contact list." msgstr "" "Bağlantı listesindeki kişilerin iletişim kurallarının gösterilip " "gösterilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Whether to show the contact list in chat rooms." msgstr "Sohbet odalarında bağlantı listesinin gösterilip gösterilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "Whether to show the contact list in compact mode." msgstr "Bağlantı listesinin sıkışık kipte gösterilip gösterilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." @@ -496,11 +488,11 @@ msgstr "" "Başlık çubuğundaki 'x' düğmesi ile ana pencerenin kapatılması hakkında mesaj " "penceresinin gösterilip gösterilmeyeceği." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether to use the theme for chat rooms." msgstr "Temanın sohbet odaları için kullanılıp kullanılmayacağı." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's name with the value \"name\". A value of \"state\" will sort " @@ -516,23 +508,51 @@ msgstr "Mesajlaşma ve VoIP hesaplarını Yönet" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2307 +#: ../src/empathy-accounts-dialog.c:2406 msgid "Messaging and VoIP Accounts" msgstr "Mesajlaşma ve VoIP Hesapları" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Sebep belirtilmemiş" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Durumda değişiklik istendi" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Dosya transferini iptal ettiniz" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Diğer katılımcı dosya transferini iptal etti" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Dosya transfer etmeye çalışılırken hata" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Diğer katılımcı dosya transfer edemiyor" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311 +msgid "Unknown reason" +msgstr "Bilinmeyen sebep" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Dosya transferi tamamlandı, ama dosya bozuk" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Uzaktan bağlantıda dosya aktarma desteklenmiyor" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Seçilen dosya normal bir dosya değil" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Seçilen dosya boş" @@ -552,171 +572,139 @@ msgstr "%s Arandı" msgid "Call from %s" msgstr "%s'den Gelen Çağrı" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "Soket türü desteklenmiyor" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "Sebep belirtilmemiş" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "Durumda değişiklik istendi" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "Dosya transferini iptal ettiniz" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "Diğer katılımcı dosya transferini iptal etti" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "Dosya transfer etmeye çalışılırken hata" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "Diğer katılımcı dosya transfer edemiyor" - -#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "Bilinmeyen sebep" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:231 msgid "Available" msgstr "Ulaşılabilir" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:233 msgid "Busy" msgstr "Meşgul" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:236 msgid "Away" msgstr "Uzakta" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:238 msgid "Invisible" msgstr "Görünmez" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:240 msgid "Offline" msgstr "Çevrimdışı" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:243 msgctxt "presence" msgid "Unknown" msgstr "Bilinmiyor" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:283 msgid "No reason specified" msgstr "Sebep belirtilmemiş" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341 msgid "Status is set to offline" msgstr "Durum çevrimdışına ayarlı" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Ağ hatası" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 msgid "Authentication failed" msgstr "Kimlik denetimi başarısız" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Encryption error" msgstr "Şifreleme hatası" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:293 msgid "Name in use" msgstr "İsim kullanımda" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327 msgid "Certificate not provided" msgstr "Sertifika sağlanmamış" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate untrusted" msgstr "Sertifika güvenilmez" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate expired" msgstr "Sertifikanın süresi dolmuş" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate not activated" msgstr "Sertifika etkinleştirilmemiş" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate hostname mismatch" msgstr "Sertifikanın makine adı uyuşmuyor" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate fingerprint mismatch" msgstr "Sertifikanın parmak izi uyuşmuyor" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate self-signed" msgstr "Sertifika kendinden-imzalı" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:309 msgid "Certificate error" msgstr "Sertifika hatası" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:343 msgid "Encryption is not available" msgstr "Şifreleme kullanılabilir değil" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:345 msgid "Certificate is invalid" msgstr "Sertifika geçerli" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:347 msgid "Connection has been refused" msgstr "Bağlantı reddedildi" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:349 msgid "Connection can't be established" msgstr "Bağlantı kurulamadı" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:351 msgid "Connection has been lost" msgstr "Bağlantı koptu" -#: ../libempathy/empathy-utils.c:354 +#: ../libempathy/empathy-utils.c:353 msgid "This resource is already connected to the server" msgstr "Bu kaynak zaten sunucuya bağlı" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:355 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "Bağlantı, aynı kaynak kullanılarak yeni bir bağlantı ile değiştirildi" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:358 msgid "The account already exists on the server" msgstr "Sunucuda böyle bir hesap zaten var" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:360 msgid "Server is currently too busy to handle the connection" msgstr "Sunucu, şu anda bağlantı kuramayacak kadar meşgul" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:362 msgid "Certificate has been revoked" msgstr "Sertifika iptal edildi" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:364 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "Sertifika güvensiz bir şifreleme algoritması kullanıyor ya da kriptografik " "olarak zayıf" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:367 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -724,23 +712,23 @@ msgstr "" "Sunucu sertifikasının uzunluğu veya sunucu sertifikası zincirinin derinliği, " "şifreleme kütüphanesi tarafından uygulanan sınırları aşıyor" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:371 msgid "Your software is too old" msgstr "Yazılımınız çok eski" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:530 msgid "People Nearby" msgstr "Yakındaki İnsanlar" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:535 msgid "Yahoo! Japan" msgstr "Yahoo! Japonya" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:564 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:565 msgid "Facebook Chat" msgstr "Facebook Sohbet" @@ -788,98 +776,70 @@ msgstr "gelecekte" msgid "All accounts" msgstr "Tüm hesaplar" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "Hesap" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "Parola" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Sunucu" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Port" -#: ../libempathy-gtk/empathy-account-widget.c:769 -#: ../libempathy-gtk/empathy-account-widget.c:826 +#: ../libempathy-gtk/empathy-account-widget.c:763 +#: ../libempathy-gtk/empathy-account-widget.c:815 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 -msgid "My Web Accounts" -msgstr "Web Hesaplarım" - -#: ../libempathy-gtk/empathy-account-widget.c:1209 -#, c-format -msgid "The account %s is edited via %s." -msgstr "%s hesabı, %s aracılığıyla düzenlendi." - -#: ../libempathy-gtk/empathy-account-widget.c:1215 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "%s hesabı Empathy içinden düzenlenemiyor." - -#: ../libempathy-gtk/empathy-account-widget.c:1234 -msgid "Launch My Web Accounts" -msgstr "Web Hesaplarımı Başlat" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1242 -#, c-format -msgid "Edit %s" -msgstr "%s'i Düzenle" - -#: ../libempathy-gtk/empathy-account-widget.c:1592 +#: ../libempathy-gtk/empathy-account-widget.c:1396 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "Kullanıcı Adı:" -#: ../libempathy-gtk/empathy-account-widget.c:1910 +#: ../libempathy-gtk/empathy-account-widget.c:1708 msgid "A_pply" msgstr "U_ygula" -#: ../libempathy-gtk/empathy-account-widget.c:1940 +#: ../libempathy-gtk/empathy-account-widget.c:1737 msgid "L_og in" msgstr "_Oturum aç" -#: ../libempathy-gtk/empathy-account-widget.c:2014 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "Bu hesap sunucu üzerinde zaten bulunuyor" -#: ../libempathy-gtk/empathy-account-widget.c:2017 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "Sunucuda yeni bir hesap oluştur" -#: ../libempathy-gtk/empathy-account-widget.c:2209 -msgid "Ca_ncel" -msgstr "Va_zgeç" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2487 +#: ../libempathy-gtk/empathy-account-widget.c:2239 #, c-format msgid "%1$s on %2$s" msgstr "%2$s üzerinde %1$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2513 +#: ../libempathy-gtk/empathy-account-widget.c:2265 #, c-format msgid "%s Account" msgstr "%s Hesabı" -#: ../libempathy-gtk/empathy-account-widget.c:2517 +#: ../libempathy-gtk/empathy-account-widget.c:2269 msgid "New account" msgstr "Yeni hesap" @@ -927,7 +887,7 @@ msgstr "Parolayı Anımsa" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 msgid "Remember password" msgstr "Parolayı anımsa" @@ -1252,7 +1212,7 @@ msgid "STUN Server:" msgstr "STUN Sunucusu:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 msgid "Server:" msgstr "Sunucu:" @@ -1358,40 +1318,40 @@ msgstr "Bu iletişim kuralında acil aramalar desteklenmiyor" msgid "You don't have enough credit in order to place this call" msgstr "Bu çağrıyı gerçekleştirmek için yeterli krediniz yok" -#: ../libempathy-gtk/empathy-chat.c:706 +#: ../libempathy-gtk/empathy-chat.c:705 msgid "Failed to open private chat" msgstr "Özel sohbet açma başarısız oldu" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:763 msgid "Topic not supported on this conversation" msgstr "Bu görüşmede başlık desteklenmiyor" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:769 msgid "You are not allowed to change the topic" msgstr "Başlığı değiştirmenize izin verilmiyor" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:970 #, c-format msgid "“%s” is not a valid contact ID" msgstr "“%s”, geçerli bir kişi kimliği değil" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1065 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: geçerli görüşmedeki tüm iletileri sil" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1068 msgid "/topic : set the topic of the current conversation" msgstr "/topic : geçerli konuşmanın başlığını ayarla" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/join : join a new chat room" msgstr "/join : yeni bir sohbet odasına katıl" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1074 msgid "/j : join a new chat room" msgstr "/j : yeni bir sohbet odasına katıl" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "" "/part [] []: leave the chat room, by default the " "current one" @@ -1399,23 +1359,23 @@ msgstr "" "/part [] []: (öntanımlı olarak, şu anda " "bulunulan) sohbet odasından ayrıl" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1082 msgid "/query []: open a private chat" msgstr "/query []: özel bir sohbet aç" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/msg : open a private chat" msgstr "/msg []: özel bir sohbet aç" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/nick : change your nickname on the current server" msgstr "/nick : geçerli sunucudaki rumuzunuzu değiştirin" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/me : send an ACTION message to the current conversation" msgstr "/me : geçerli görüşmeye bir EYLEM iletisi gönder" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1425,11 +1385,11 @@ msgstr "" "ileti göndermek için kullanılır. Örneğin: ''/say /join yeni bir sohbet " "odasına katılmak için kullanılır''" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "/whois : display information about a contact" msgstr "/whois : bir kişi hakkındaki bilgileri göster" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1437,121 +1397,121 @@ msgstr "" "/help []: bütün desteklenen komutları göster. Eğer " "tanımlanmışsa, kullanım biçimini göster." -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1121 #, c-format msgid "Usage: %s" msgstr "Kullanım: %s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1166 msgid "Unknown command" msgstr "Bilinmeyen komut" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1292 msgid "Unknown command; see /help for the available commands" msgstr "" "Bilinmeyen komut; kullanılabilir komutlar için /help komutunu deneyiniz" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1456 msgid "insufficient balance to send message" msgstr "mesaj göndermek için yetersiz bakiye" -#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474 +#: ../libempathy-gtk/empathy-chat.c:1537 #, c-format msgid "Error sending message '%s': %s" msgstr "'%s' mesajı gönderilirken hata : %s" -#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479 +#: ../libempathy-gtk/empathy-chat.c:1541 #, c-format msgid "Error sending message: %s" msgstr "Mesaj gönderme hatası: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1469 +#: ../libempathy-gtk/empathy-chat.c:1468 #, c-format msgid "insufficient balance to send message. Top up." msgstr "mesaj göndermek için yetersiz bakiye. Kredi yükle." -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1508 msgid "not capable" msgstr "kapasitesiz" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1515 msgid "offline" msgstr "çevrimdışı" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1518 msgid "invalid contact" msgstr "geçersiz bağlantı" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1521 msgid "permission denied" msgstr "izin verilmedi" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1524 msgid "too long message" msgstr "çok uzun mesaj" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1527 msgid "not implemented" msgstr "uygulanmamış" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1531 msgid "unknown" msgstr "bilinmiyor" -#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761 msgid "Topic:" msgstr "Başlık:" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1610 #, c-format msgid "Topic set to: %s" msgstr "Başlık değiştirildi: %s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "No topic defined" msgstr "Başlık belirtilmemiş" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2125 msgid "(No Suggestions)" msgstr "(Öneri Yok)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2193 #, c-format msgid "Add '%s' to Dictionary" msgstr "'%s' kelimesini Sözlüğe ekle" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2230 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "'%s' kelimesini %s Sözlüğe ekle" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2300 msgid "Insert Smiley" msgstr "Gülümseme Ekle" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 -#: ../libempathy-gtk/empathy-ui-utils.c:1843 +#: ../libempathy-gtk/empathy-chat.c:2318 +#: ../libempathy-gtk/empathy-ui-utils.c:1868 msgid "_Send" msgstr "_Gönder" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2373 +#: ../libempathy-gtk/empathy-chat.c:2375 msgid "_Spelling Suggestions" msgstr "_Yazım Önerileri" -#: ../libempathy-gtk/empathy-chat.c:2462 +#: ../libempathy-gtk/empathy-chat.c:2464 msgid "Failed to retrieve recent logs" msgstr "Son kayıtlara erişme başarısız oldu" -#: ../libempathy-gtk/empathy-chat.c:2599 +#: ../libempathy-gtk/empathy-chat.c:2601 #, c-format msgid "%s has disconnected" msgstr "%s bağlantısını kesti" @@ -1559,12 +1519,12 @@ msgstr "%s bağlantısını kesti" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2606 +#: ../libempathy-gtk/empathy-chat.c:2608 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s tarafından %1$s kanaldan atıldı" -#: ../libempathy-gtk/empathy-chat.c:2609 +#: ../libempathy-gtk/empathy-chat.c:2611 #, c-format msgid "%s was kicked" msgstr "%s kanaldan atıldı" @@ -1572,17 +1532,17 @@ msgstr "%s kanaldan atıldı" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2617 +#: ../libempathy-gtk/empathy-chat.c:2619 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s tarafından %1$s yasaklandı" -#: ../libempathy-gtk/empathy-chat.c:2620 +#: ../libempathy-gtk/empathy-chat.c:2622 #, c-format msgid "%s was banned" msgstr "%s yasaklandı" -#: ../libempathy-gtk/empathy-chat.c:2624 +#: ../libempathy-gtk/empathy-chat.c:2626 #, c-format msgid "%s has left the room" msgstr "%s odayı terk etti" @@ -1592,17 +1552,17 @@ msgstr "%s odayı terk etti" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2633 +#: ../libempathy-gtk/empathy-chat.c:2635 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2658 +#: ../libempathy-gtk/empathy-chat.c:2660 #, c-format msgid "%s has joined the room" msgstr "%s odaya katıldı" -#: ../libempathy-gtk/empathy-chat.c:2683 +#: ../libempathy-gtk/empathy-chat.c:2685 #, c-format msgid "%s is now known as %s" msgstr "%s şimdi %s olarak biliniyor" @@ -1610,87 +1570,88 @@ msgstr "%s şimdi %s olarak biliniyor" #. 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:2836 -#: ../src/empathy-streamed-media-window.c:1896 -#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1536 -#: ../src/empathy-call-window.c:1586 ../src/empathy-call-window.c:2632 +#: ../libempathy-gtk/empathy-chat.c:2846 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "Bağlı Değil" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3482 +#: ../libempathy-gtk/empathy-chat.c:3492 msgid "Would you like to store this password?" msgstr "Bu parolayı kaydetmek istiyor musunuz?" -#: ../libempathy-gtk/empathy-chat.c:3488 +#: ../libempathy-gtk/empathy-chat.c:3498 msgid "Remember" msgstr "Hatırla" -#: ../libempathy-gtk/empathy-chat.c:3498 +#: ../libempathy-gtk/empathy-chat.c:3508 msgid "Not now" msgstr "Şimdi değil" -#: ../libempathy-gtk/empathy-chat.c:3542 +#: ../libempathy-gtk/empathy-chat.c:3552 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Yeniden Dene" -#: ../libempathy-gtk/empathy-chat.c:3546 +#: ../libempathy-gtk/empathy-chat.c:3556 msgid "Wrong password; please try again:" msgstr "Yanlış parola: lütfen tekrar deneyin:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3676 +#: ../libempathy-gtk/empathy-chat.c:3686 msgid "This room is protected by a password:" msgstr "Bu oda bir parolayla korunuyor:" -#: ../libempathy-gtk/empathy-chat.c:3703 +#: ../libempathy-gtk/empathy-chat.c:3713 msgid "Join" msgstr "Katıl" -#: ../libempathy-gtk/empathy-chat.c:3891 ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "Bağlı" -#: ../libempathy-gtk/empathy-chat.c:3946 +#: ../libempathy-gtk/empathy-chat.c:3956 msgid "Conversation" msgstr "Konuşma" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3951 +#: ../libempathy-gtk/empathy-chat.c:3961 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Bilinmeyen ya da geçersiz tanımlayıcı" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Kişi engelleme geçici olarak kullanılamıyor" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Kişi engelleme kullanılamıyor" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "İzin verilmedi" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Kişi engellenemedi" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Engellenmiş Kişileri Düzenle" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:512 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1441 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" @@ -1708,428 +1669,311 @@ msgid "Remove" msgstr "Sil" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "Bağ Adresini _Kopyala" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 +#: ../libempathy-gtk/empathy-chat-text-view.c:329 #: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "_Bağı Aç" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:417 msgid "%A %B %d %Y" msgstr "%A %B %d %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "Bağlantı Bilgisini Düzenle" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 -msgid "Personal Information" -msgstr "Kişisel Bilgi" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 -msgid "New Contact" -msgstr "Yeni Bağlantı" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 -#, c-format -msgid "Block %s?" -msgstr "%s engellensin mi?" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:255 -#, c-format -msgid "Are you sure you want to block '%s' from contacting you again?" -msgstr "" -"'%s'in sizinle tekrar iletişim kurmasını engellemek istediğinizden emin " -"misiniz?" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:277 -msgid "_Block" -msgstr "_Engelle" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:286 -msgid "_Report this contact as abusive" -msgid_plural "_Report these contacts as abusive" -msgstr[0] "Bu kişiyi kötü niyetli olarak bildi_r" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "_Sonra Karar Ver" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 -msgid "Subscription Request" -msgstr "Kayıt İsteği" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 -msgid "_Block User" -msgstr "Kullanıcıyı _Engelle" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1935 -#: ../libempathy-gtk/empathy-individual-view.c:2375 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Gerçekten '%s' grubunu kaldırmak istiyor musunuz?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1937 -#: ../libempathy-gtk/empathy-individual-view.c:2378 -msgid "Removing group" -msgstr "Grup kaldırılıyor" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-contact-list-view.c:2063 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 -msgid "_Remove" -msgstr "Kaldı_r" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2016 -#: ../libempathy-gtk/empathy-individual-view.c:2500 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Gerçekten '%s' bağlantısını kaldırmak istiyor musunuz?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2018 -#: ../libempathy-gtk/empathy-individual-view.c:2521 -msgid "Removing contact" -msgstr "Bağlantı kaldırılıyor" - -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "Kişi _Ekle..." - -#: ../libempathy-gtk/empathy-contact-menu.c:292 -msgid "_Block Contact" -msgstr "Kişiyi _Engelle" - -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:321 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../libempathy-gtk/empathy-new-message-dialog.c:320 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "S_ohbet" - -#: ../libempathy-gtk/empathy-contact-menu.c:353 -#: ../libempathy-gtk/empathy-individual-menu.c:850 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "_Sesli Arama" +#: ../libempathy-gtk/empathy-contact-dialogs.c:278 +msgid "Personal Information" +msgstr "Kişisel Bilgi" -#: ../libempathy-gtk/empathy-contact-menu.c:386 -#: ../libempathy-gtk/empathy-individual-menu.c:895 -msgctxt "menu item" -msgid "_Video Call" -msgstr "_Video Arama" +#: ../libempathy-gtk/empathy-contact-dialogs.c:379 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +msgid "New Contact" +msgstr "Yeni Bağlantı" -#: ../libempathy-gtk/empathy-contact-menu.c:432 -#: ../libempathy-gtk/empathy-individual-menu.c:948 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "Önceki _Konuşmalar" +#: ../libempathy-gtk/empathy-contact-dialogs.c:448 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 +#, c-format +msgid "Block %s?" +msgstr "%s engellensin mi?" -#: ../libempathy-gtk/empathy-contact-menu.c:454 -#: ../libempathy-gtk/empathy-individual-menu.c:989 -msgid "Send File" -msgstr "Dosya Gönder" +#: ../libempathy-gtk/empathy-contact-dialogs.c:453 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#, c-format +msgid "Are you sure you want to block '%s' from contacting you again?" +msgstr "" +"'%s'in sizinle tekrar iletişim kurmasını engellemek istediğinizden emin " +"misiniz?" -#: ../libempathy-gtk/empathy-contact-menu.c:477 -#: ../libempathy-gtk/empathy-individual-menu.c:1031 -msgid "Share My Desktop" -msgstr "Masaüstümü Paylaş" +#: ../libempathy-gtk/empathy-contact-dialogs.c:458 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +msgid "_Block" +msgstr "_Engelle" -#: ../libempathy-gtk/empathy-contact-menu.c:506 -#: ../libempathy-gtk/empathy-individual-menu.c:1094 -msgid "Infor_mation" -msgstr "Bil_gi" +#: ../libempathy-gtk/empathy-contact-dialogs.c:476 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +msgid "_Report this contact as abusive" +msgid_plural "_Report these contacts as abusive" +msgstr[0] "Bu kişiyi kötü niyetli olarak bildi_r" -#: ../libempathy-gtk/empathy-contact-menu.c:552 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "Düz_enle" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 +msgid "Decide _Later" +msgstr "_Sonra Karar Ver" -#: ../libempathy-gtk/empathy-contact-menu.c:606 -#: ../libempathy-gtk/empathy-individual-menu.c:1285 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "Sizi bu odaya davet ediyor" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 +msgid "Subscription Request" +msgstr "Kayıt İsteği" -#: ../libempathy-gtk/empathy-contact-menu.c:637 -#: ../libempathy-gtk/empathy-individual-menu.c:1331 -msgid "_Invite to Chat Room" -msgstr "Sohbet Odasına _Davet Et" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "_Block User" +msgstr "Kullanıcıyı _Engelle" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:505 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Kişi ara" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:535 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Ara: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:593 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "Kişi _Ekle" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Kişi bulunamadı" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 msgid "Your message introducing yourself:" msgstr "Kendinizi tanıtan mesajınız:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:635 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 msgid "Please let me see when you're online. Thanks!" msgstr "Lütfen çevrimiçi olduğunuzda sizi görebilmeme izin verin. Teşekkürler!" -#: ../libempathy-gtk/empathy-contact-widget.c:502 +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Kanallar:" -#: ../libempathy-gtk/empathy-contact-widget.c:797 -#: ../libempathy-gtk/empathy-individual-widget.c:421 +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "Ülke ISO Kodu:" -#: ../libempathy-gtk/empathy-contact-widget.c:799 -#: ../libempathy-gtk/empathy-individual-widget.c:423 +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Ülke:" -#: ../libempathy-gtk/empathy-contact-widget.c:801 -#: ../libempathy-gtk/empathy-individual-widget.c:425 +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Eyalet:" -#: ../libempathy-gtk/empathy-contact-widget.c:803 -#: ../libempathy-gtk/empathy-individual-widget.c:427 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Şehir:" -#: ../libempathy-gtk/empathy-contact-widget.c:805 -#: ../libempathy-gtk/empathy-individual-widget.c:429 +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Alan:" -#: ../libempathy-gtk/empathy-contact-widget.c:807 -#: ../libempathy-gtk/empathy-individual-widget.c:431 +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Posta Kodu:" -#: ../libempathy-gtk/empathy-contact-widget.c:809 -#: ../libempathy-gtk/empathy-individual-widget.c:433 +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Sokak:" -#: ../libempathy-gtk/empathy-contact-widget.c:811 -#: ../libempathy-gtk/empathy-individual-widget.c:435 +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Bina:" -#: ../libempathy-gtk/empathy-contact-widget.c:813 -#: ../libempathy-gtk/empathy-individual-widget.c:437 +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Kat:" -#: ../libempathy-gtk/empathy-contact-widget.c:815 -#: ../libempathy-gtk/empathy-individual-widget.c:439 +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Oda:" -#: ../libempathy-gtk/empathy-contact-widget.c:817 -#: ../libempathy-gtk/empathy-individual-widget.c:441 +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Metin:" -#: ../libempathy-gtk/empathy-contact-widget.c:819 -#: ../libempathy-gtk/empathy-individual-widget.c:443 +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Açıklama:" -#: ../libempathy-gtk/empathy-contact-widget.c:821 -#: ../libempathy-gtk/empathy-individual-widget.c:445 +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:823 -#: ../libempathy-gtk/empathy-individual-widget.c:447 +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Doğruluk Seviyesi:" -#: ../libempathy-gtk/empathy-contact-widget.c:825 -#: ../libempathy-gtk/empathy-individual-widget.c:449 +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Hata:" -#: ../libempathy-gtk/empathy-contact-widget.c:827 -#: ../libempathy-gtk/empathy-individual-widget.c:451 +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Dikey Hata (metre):" -#: ../libempathy-gtk/empathy-contact-widget.c:829 -#: ../libempathy-gtk/empathy-individual-widget.c:453 +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Yatay Hata (metre):" -#: ../libempathy-gtk/empathy-contact-widget.c:831 -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Hız:" -#: ../libempathy-gtk/empathy-contact-widget.c:833 -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Yatak:" -#: ../libempathy-gtk/empathy-contact-widget.c:835 -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Tırmanma Hızı:" -#: ../libempathy-gtk/empathy-contact-widget.c:837 -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Son Güncelleme Tarihi:" -#: ../libempathy-gtk/empathy-contact-widget.c:839 -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Boylam:" -#: ../libempathy-gtk/empathy-contact-widget.c:841 -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Enlem:" -#: ../libempathy-gtk/empathy-contact-widget.c:843 -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Rakım:" -#: ../libempathy-gtk/empathy-contact-widget.c:896 -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:559 -#: ../libempathy-gtk/empathy-individual-widget.c:574 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:15 msgid "Location" msgstr "Konum" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:576 +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:965 -#: ../libempathy-gtk/empathy-individual-widget.c:625 +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y tarih %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1047 -#: ../libempathy-gtk/empathy-individual-widget.c:867 +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Avatarı Kaydet" -#: ../libempathy-gtk/empathy-contact-widget.c:1103 -#: ../libempathy-gtk/empathy-individual-widget.c:925 +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Avatar kaydedilemiyor" -#: ../libempathy-gtk/empathy-contact-widget.c:1787 -#: ../libempathy-gtk/empathy-individual-menu.c:1066 -#: ../libempathy-gtk/empathy-individual-widget.c:1324 -msgid "Favorite" -msgstr "Beğenilen" - -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 -#| msgid "Full name:" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 msgid "Full name" msgstr "Tam adı" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 -#| msgid "Phone number:" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 msgid "Phone number" msgstr "Telefon numarası" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 -#| msgid "E-mail address:" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 msgid "E-mail address" msgstr "E-posta adresi" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 -#| msgid "Website:" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Website" msgstr "Web sitesi" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 -#| msgid "Birthday:" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Birthday" msgstr "Doğum günü" #. 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:113 msgid "Last seen:" msgstr "Son görüşme:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 msgid "Connected from:" msgstr "Şuradan bağlandı:" #. 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:119 msgid "Away message:" msgstr "Uzak mesajı:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 -#| msgid "Work" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "work" msgstr "iş" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 -#| msgid "Romeo" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 msgid "home" msgstr "ev" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 -#| msgid "Mobile" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 msgid "mobile" msgstr "cep" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 -#| msgid "Favorite" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 msgid "voice" msgstr "sesli çağrı" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 -#| msgid "Preferences" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 msgid "preferred" msgstr "tercih edilen" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 msgid "postal" msgstr "posta" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 -#| msgid "Appearance" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 msgid "parcel" msgstr "paket" @@ -2139,7 +1983,7 @@ msgstr "Konum (tarih) de \t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1260 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "Takma ad:" @@ -2159,7 +2003,7 @@ msgstr "Bağlantı Ayrıntıları" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1469 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "Tanımlayıcı:" @@ -2198,93 +2042,174 @@ msgid "Select" msgstr "Seç" #: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1967 +#: ../src/empathy-main-window.c:1949 msgid "Group" msgstr "Grup" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Aşağıdaki kişi kartları engellenecek:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:267 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Aşağıdaki kişi kartları engellenemiyor:" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Bağlantı Bilgisini Düzenle" + #. Translators: the heading at the top of the Information dialogue #: ../libempathy-gtk/empathy-individual-information-dialog.c:288 msgid "Linked Contacts" msgstr "Bağlı Kişiler" -#: ../libempathy-gtk/empathy-individual-linker.c:370 +#: ../libempathy-gtk/empathy-individual-linker.c:372 msgid "Select contacts to link" msgstr "Bağlantılanacak kişileri seç" -#: ../libempathy-gtk/empathy-individual-linker.c:444 +#: ../libempathy-gtk/empathy-individual-linker.c:447 msgid "New contact preview" msgstr "Yeni kişi önizlemesi" -#: ../libempathy-gtk/empathy-individual-linker.c:488 +#: ../libempathy-gtk/empathy-individual-linker.c:491 msgid "Contacts selected in the list on the left will be linked together." msgstr "Sol taraftaki listeden seçilen kişiler birbirine bağlantılanacak." #. 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:145 +#: ../libempathy-gtk/empathy-individual-menu.c:181 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:363 msgid "Select account to use to place the call" msgstr "Arama için kullanılacak hesabı seçin" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 +#: ../libempathy-gtk/empathy-individual-menu.c:367 #: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1301 +#: ../src/empathy-streamed-media-window.c:1288 #: ../src/empathy-call-window.ui.h:2 msgid "Call" msgstr "Çağrı" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:432 msgid "Mobile" msgstr "Cep" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:434 msgid "Work" msgstr "İş" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:436 msgid "HOME" msgstr "EV" +#: ../libempathy-gtk/empathy-individual-menu.c:677 +msgid "_Block Contact" +msgstr "Kişiyi _Engelle" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-main-window-menubar.ui.h:16 +msgid "_Chat" +msgstr "S_ohbet" + #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:805 -#: ../libempathy-gtk/empathy-new-message-dialog.c:314 +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1143 +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Sesli Arama" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Video Arama" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-main-window-menubar.ui.h:27 +msgid "_Previous Conversations" +msgstr "Önceki _Konuşmalar" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +msgid "Send File" +msgstr "Dosya Gönder" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "Masaüstümü Paylaş" + +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Beğenilen" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "Bil_gi" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "Düz_enle" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1169 +#: ../libempathy-gtk/empathy-individual-menu.c:1385 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "_Kişileri Bağla..." -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1011 +msgid "Inviting you to this room" +msgstr "Sizi bu odaya davet ediyor" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +msgid "_Invite to Chat Room" +msgstr "Sohbet Odasına _Davet Et" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-main-window-menubar.ui.h:14 +msgid "_Add Contact…" +msgstr "Kişi _Ekle..." + +#: ../libempathy-gtk/empathy-individual-view.c:2355 msgid "Delete and _Block" msgstr "Sil ve _Engelle" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +#: ../libempathy-gtk/empathy-individual-view.c:2390 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Gerçekten '%s' grubunu kaldırmak istiyor musunuz?" + +#: ../libempathy-gtk/empathy-individual-view.c:2393 +msgid "Removing group" +msgstr "Grup kaldırılıyor" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2448 +#: ../libempathy-gtk/empathy-individual-view.c:2665 +msgid "_Remove" +msgstr "Kaldı_r" + +#: ../libempathy-gtk/empathy-individual-view.c:2525 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Gerçekten '%s' bağlantısını kaldırmak istiyor musunuz?" + +#: ../libempathy-gtk/empathy-individual-view.c:2534 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2293,7 +2218,11 @@ msgstr "" "'%s' bağlı kişisini gerçekten silmek istiyor musunuz? Bu işlemin, bu bağlı " "kişiyi oluşturan tüm kişileri sileceğini unutmayın." -#: ../libempathy-gtk/empathy-individual-widget.c:1608 +#: ../libempathy-gtk/empathy-individual-view.c:2546 +msgid "Removing contact" +msgstr "Bağlantı kaldırılıyor" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2375,134 +2304,134 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "_Bağı çöz" -#: ../libempathy-gtk/empathy-log-window.c:620 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Geçmiş" -#: ../libempathy-gtk/empathy-log-window.c:675 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Göster" -#: ../libempathy-gtk/empathy-log-window.c:697 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Ara" -#: ../libempathy-gtk/empathy-log-window.c:1145 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "%s'de Sohbet Et" -#: ../libempathy-gtk/empathy-log-window.c:1147 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "%s ile Sohbet Et" -#: ../libempathy-gtk/empathy-log-window.c:1197 -#: ../libempathy-gtk/empathy-log-window.c:1344 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e %B %Y, %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1286 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1292 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1368 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s saniye" -#: ../libempathy-gtk/empathy-log-window.c:1375 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s dakika" -#: ../libempathy-gtk/empathy-log-window.c:1383 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Çağrı %s sürdü, %s'de sonlandı" -#: ../libempathy-gtk/empathy-log-window.c:1715 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Bugün" -#: ../libempathy-gtk/empathy-log-window.c:1719 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Dün" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1734 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1815 -#: ../libempathy-gtk/empathy-log-window.c:3430 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Herhangi bir zaman" -#: ../libempathy-gtk/empathy-log-window.c:1902 -#: ../libempathy-gtk/empathy-log-window.c:2358 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Herhangi biri" -#: ../libempathy-gtk/empathy-log-window.c:2671 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Kim" -#: ../libempathy-gtk/empathy-log-window.c:2875 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Ne Zaman" -#: ../libempathy-gtk/empathy-log-window.c:2991 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Herhangi bir şey" -#: ../libempathy-gtk/empathy-log-window.c:2993 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Yazılı sohbetler" -#: ../libempathy-gtk/empathy-log-window.c:2995 +#: ../libempathy-gtk/empathy-log-window.c:3044 #: ../src/empathy-preferences.ui.h:4 msgid "Calls" msgstr "Çağrılar" -#: ../libempathy-gtk/empathy-log-window.c:3000 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Gelen çağrılar" -#: ../libempathy-gtk/empathy-log-window.c:3001 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Giden çağrılar" -#: ../libempathy-gtk/empathy-log-window.c:3002 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Cevapsız çağrılar" -#: ../libempathy-gtk/empathy-log-window.c:3024 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Ne" -#: ../libempathy-gtk/empathy-log-window.c:3719 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "" "Önceki görüşmelerin tüm kayıtlarını silmek istediğinizden emin misiniz?" -#: ../libempathy-gtk/empathy-log-window.c:3723 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Tümünü Temizle" -#: ../libempathy-gtk/empathy-log-window.c:3730 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Şuradan itibaren sil:" @@ -2543,76 +2472,82 @@ msgstr "_Dosya" msgid "page 2" msgstr "sayfa 2" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "Bu kişi çevrimdışı" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 msgid "The specified contact is either invalid or unknown" msgstr "Belirtilen kişi geçersiz ya da bilinmiyor" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" msgstr "Bu kişi, bu türden görüşmeyi desteklemiyor" -#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 msgid "The requested functionality is not implemented for this protocol" msgstr "Ä°stenen işlev, bu iletişim kuralına uygulanmamış" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 msgid "Could not start a conversation with the given contact" msgstr "Verilen kişi ile bir görüşme başlatılamadı" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "Bu kanalda yasaklısınız" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "Bu kanal tamamen dolu" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 msgid "You must be invited to join this channel" msgstr "Bu kanala katılmak için davet edilmiş olmanız gerekiyor" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" msgstr "Bağlı değilken devam edilemez" -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "Ä°zin verilmedi" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "Görüşme başlatılırken bir hata oluştu" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "Kişi belirteci ya da telefon numarası girin:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:334 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "Yeni Konuşma" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:226 +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "_Video Call" msgstr "_Video Arama" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:236 +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 msgid "_Audio Call" msgstr "_Sesli Arama" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:246 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "Yeni Çağrı" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "%s hesabı için kimlik doğrulama başarısız oldu" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2824,19 +2759,19 @@ msgstr "Gelecekteki bağlantılarda bu seçimi hatırla" msgid "Certificate Details" msgstr "Sertifika Ayrıntıları" -#: ../libempathy-gtk/empathy-ui-utils.c:1738 +#: ../libempathy-gtk/empathy-ui-utils.c:1742 msgid "Unable to open URI" msgstr "URI açılamıyor" -#: ../libempathy-gtk/empathy-ui-utils.c:1835 +#: ../libempathy-gtk/empathy-ui-utils.c:1860 msgid "Select a file" msgstr "Bir dosya seçin" -#: ../libempathy-gtk/empathy-ui-utils.c:1907 +#: ../libempathy-gtk/empathy-ui-utils.c:1935 msgid "Insufficient free space to save file" msgstr "Dosyayı kaydetmek için yeterli boş alan yok" -#: ../libempathy-gtk/empathy-ui-utils.c:1915 +#: ../libempathy-gtk/empathy-ui-utils.c:1943 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2845,7 +2780,7 @@ msgstr "" "Bu dosyayı kaydetmek için %s boş alan gerekiyor, ama sadece %s " "kullanılabilir alan var. Lütfen başka bir konum seçiniz." -#: ../libempathy-gtk/empathy-ui-utils.c:1959 +#: ../libempathy-gtk/empathy-ui-utils.c:1987 #, c-format msgid "Incoming file from %s" msgstr "%s'den gelen dosya" @@ -3017,32 +2952,32 @@ msgstr "Batı" msgid "Vietnamese" msgstr "Vietnamca" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Hata iletisi yok" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Anlık Ä°leti (Empathy)" -#: ../src/empathy.c:433 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Başlangıçta bağlanma" -#: ../src/empathy.c:437 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "" "Başlangıçta kişi listesi ya da herhangi bir iletişim penceresi gösterme" -#: ../src/empathy.c:452 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "- Empati Mesajlaşma Ä°stemcisi" -#: ../src/empathy.c:639 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Hesap Yöneticisiyle temasa geçilirken hata oluştu" -#: ../src/empathy.c:641 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3087,11 +3022,11 @@ msgstr "" "gereklidir; eğer almadıysanız Free Software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-130159 USA adresine yazın." -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "GNOME için Anında Mesajlaşma istemcisi" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Deniz Koçak \n" @@ -3128,35 +3063,36 @@ msgstr "" "yardımcıdan çıkın ve daha sonra Düzen menüsünden hesapları eklemeyin." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1274 msgid "An error occurred" msgstr "Bir hata oluştu" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "Ne tür bir sohbet hesabınız var?" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "Kurmak istediğiniz herhangi bir başka sohbet hesabınız var mı?" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "Hesap bilgilerinizi girin" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "Ne tür bir sohbet hesabı oluşturmak istiyorsunuz?" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "Başka sohbet hesapları oluşturmak ister misiniz?" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "Yeni hesap için ayrıntıları girin" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3168,41 +3104,41 @@ msgstr "" "arkadaşlarınızla sohbet edebilirsiniz. Bir mikrofon ya da bir web kamerası " "ile ses veya video aramaları yapabilirsiniz." -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "Başka sohbet programları ile kullandığınız bir hesabınız var mı?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "Evet, hesabımı bilgirimi aktar" -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "Evet, şimdi hesap bilgilerimi gireceğim" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "Hayır, yeni bir hesap istiyorum" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "Hayır, sadece yakındaki insanları çevirim içi görmek istiyorum" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "İçe aktarmak istediğiniz hesapları seçin:" -#: ../src/empathy-account-assistant.c:813 +#: ../src/empathy-account-assistant.c:816 #: ../src/empathy-new-chatroom-dialog.c:625 #: ../src/empathy-new-chatroom-dialog.c:626 msgid "Yes" msgstr "Evet" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "Hayır şimdilik hepsi bu" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3215,16 +3151,16 @@ msgstr "" "kolaylıkla değiştirebilir ya da 'Hesaplar' iletişim penceresini kullanarak " "bu özelliği kapatabilirsiniz." -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1150 msgid "Edit->Accounts" msgstr "Düzenle->Hesaplar" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "Bu özelliği şu a_nda açmak istemiyorum" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1146 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3236,85 +3172,93 @@ msgstr "" "paketini kurun ve Hesaplar iletişim penceresinden bir Yakındaki Kişiler " "hesabı oluşturun." -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1152 msgid "telepathy-salut not installed" msgstr "telepathy-salut kurulu değil" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1198 msgid "Messaging and VoIP Accounts Assistant" msgstr "Mesajlaşma ve VoIP Hesapları Yardımcısı" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1232 msgid "Welcome to Empathy" msgstr "Empati'ye Hoşgeldiniz" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1241 msgid "Import your existing accounts" msgstr "Varolan hesaplarınızı içe aktarın" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1259 msgid "Please enter personal details" msgstr "Lütfen kişisel ayrıntıları girin" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "%s hesabınıza kaydedilmemiş değişiklikler var." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "Yeni hesabınız henüz kaydedilmedi." -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:754 -#: ../src/empathy-call-window.c:1320 +#: ../src/empathy-accounts-dialog.c:352 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "Bağlanıyor..." -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:393 #, c-format msgid "Offline — %s" msgstr "Çevrimdışı — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:405 #, c-format msgid "Disconnected — %s" msgstr "Bağlantı koptu — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:416 msgid "Offline — No Network Connection" msgstr "Çevrimdışı — Ağ Bağlantısı Yok" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:423 msgid "Unknown Status" msgstr "Bilinmeyen Durum" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:435 msgid "Offline — Account Disabled" msgstr "Çevrimdışı — Hesap Devredışı" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"Yeni bir hesap oluşturmak üzeresiniz ve bu değişikliklerinizi\n" -"kaybedecek. Devam etmek istediğinize emin misiniz?" +#: ../src/empathy-accounts-dialog.c:538 +msgid "Edit Connection Parameters" +msgstr "Bağlantı Değiştirgelerini Düzenle" + +#: ../src/empathy-accounts-dialog.c:701 +msgid "Failed to retrieve your personal information from the server." +msgstr "Kişisel bilgilerinizin sunucudan alınması başarısız oldu." + +#: ../src/empathy-accounts-dialog.c:707 +msgid "Go online to edit your personal information." +msgstr "Kişisel bilgilerinizi düzenlemek için internete bağlanın." -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:792 +msgid "_Edit Connection Parameters..." +msgstr "Bağlantı Değiştirgelerini _Düzenle..." + +#: ../src/empathy-accounts-dialog.c:1293 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "%s'i bilgisayarınızdan silmek istiyor musunuz?" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1297 msgid "This will not remove your account on the server." msgstr "Bu, sunucudaki hesabınızı silmeyecektir." -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1533 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3323,15 +3267,15 @@ msgstr "" "kaybedecek. Devam etmek istediğinize emin misiniz?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1744 msgid "_Enable" msgstr "_Etkinleştir" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1745 msgid "_Disable" msgstr "_Devre dışı bırak" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2255 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3367,11 +3311,11 @@ msgstr "" msgid "_Import…" msgstr "_İçe aktar..." -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr " -Empathy kimlik denetimi istemcisi" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Empathy kimlik denetimi istemcisi" @@ -3387,96 +3331,96 @@ msgstr "- Empathy Ses/Görüntü Ä°stemcisi" msgid "Empathy Audio/Video Client" msgstr "Empathy Ses/Görüntü Ä°stemcisi" -#: ../src/empathy-streamed-media-window.c:431 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Karşıtlık" -#: ../src/empathy-streamed-media-window.c:434 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Parlaklık" -#: ../src/empathy-streamed-media-window.c:437 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Gama" -#: ../src/empathy-streamed-media-window.c:542 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Ses Seviyesi" -#: ../src/empathy-streamed-media-window.c:1110 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "_Kenar çubuğu" -#: ../src/empathy-streamed-media-window.c:1130 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Ses girişi" -#: ../src/empathy-streamed-media-window.c:1134 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Video girişi" -#: ../src/empathy-streamed-media-window.c:1142 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Tuş Takımı" -#: ../src/empathy-streamed-media-window.c:1153 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Ayrıntılar" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1222 -#: ../src/empathy-call-window.c:1929 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format msgid "Call with %s" msgstr "%s ile çağrı" -#: ../src/empathy-streamed-media-window.c:1455 -#: ../src/empathy-call-window.c:2173 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 msgid "The IP address as seen by the machine" msgstr "Makine tarafından görülen biçimde IP adresi" -#: ../src/empathy-streamed-media-window.c:1457 -#: ../src/empathy-call-window.c:2175 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 msgid "The IP address as seen by a server on the Internet" msgstr "Ä°nternetteki bir sunucu tarafından görülen biçimde IP adresi" -#: ../src/empathy-streamed-media-window.c:1459 -#: ../src/empathy-call-window.c:2177 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 msgid "The IP address of the peer as seen by the other side" msgstr "Karşı taraftan görülen biçimde paylaşımcının IP adresi" -#: ../src/empathy-streamed-media-window.c:1461 -#: ../src/empathy-call-window.c:2179 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 msgid "The IP address of a relay server" msgstr "Aktarım sunucusunun IP adresi" -#: ../src/empathy-streamed-media-window.c:1463 -#: ../src/empathy-call-window.c:2181 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 msgid "The IP address of the multicast group" msgstr "Çoklu yayın grubunun IP adresi" -#: ../src/empathy-streamed-media-window.c:1845 -#: ../src/empathy-streamed-media-window.c:1848 -#: ../src/empathy-streamed-media-window.c:1851 -#: ../src/empathy-streamed-media-window.c:1854 +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 msgctxt "codec" msgid "Unknown" msgstr "Bilinmiyor" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2146 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "Bağlı - %d:%02dd" -#: ../src/empathy-streamed-media-window.c:2207 -#: ../src/empathy-call-window.c:2984 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 msgid "Technical Details" msgstr "Teknik Detaylar" -#: ../src/empathy-streamed-media-window.c:2245 -#: ../src/empathy-call-window.c:3023 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3485,8 +3429,8 @@ msgstr "" "%s'in yazılımı bilgisayarınız tarafından desteklenen ses formatlarının " "hiçbirini anlayamıyor" -#: ../src/empathy-streamed-media-window.c:2250 -#: ../src/empathy-call-window.c:3028 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3495,8 +3439,8 @@ msgstr "" "%s'in yazılımı bilgisayarınız tarafından desteklenen video formatlarının " "hiçbirini anlamıyor" -#: ../src/empathy-streamed-media-window.c:2256 -#: ../src/empathy-call-window.c:3034 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3505,26 +3449,26 @@ msgstr "" "%s ile bağlantı kurulamıyor. İçinizden biri doğrudan bağlantılara izin " "vermeyen bir ağ üzerinde olabilir." -#: ../src/empathy-streamed-media-window.c:2262 -#: ../src/empathy-call-window.c:3040 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 msgid "There was a failure on the network" msgstr "Ağ' da bir hata oluştu" -#: ../src/empathy-streamed-media-window.c:2266 -#: ../src/empathy-call-window.c:3044 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "Bu çağrı için gerekli olan ses biçimleri bilgisayarınızda yüklü değil" -#: ../src/empathy-streamed-media-window.c:2269 -#: ../src/empathy-call-window.c:3047 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Bu çağrı için gerekli olan görüntü biçimleri bilgisayarınızda yüklü değil" -#: ../src/empathy-streamed-media-window.c:2279 -#: ../src/empathy-call-window.c:3059 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please bu hatayı bildirin ve Yardım menüsündeki 'Hata Ayıklama' " "penceresinden alınan günlük kayıtlarını ekleyin." -#: ../src/empathy-streamed-media-window.c:2287 -#: ../src/empathy-call-window.c:3068 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 msgid "There was a failure in the call engine" msgstr "Çağrı motorunda bir hata oluştu" -#: ../src/empathy-streamed-media-window.c:2290 -#: ../src/empathy-call-window.c:3071 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 msgid "The end of the stream was reached" msgstr "Akışın sonuna ulaşıldı" -#: ../src/empathy-streamed-media-window.c:2330 -#: ../src/empathy-call-window.c:3111 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 msgid "Can't establish audio stream" msgstr "Ses akışı kurulamıyor" -#: ../src/empathy-streamed-media-window.c:2340 -#: ../src/empathy-call-window.c:3121 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 msgid "Can't establish video stream" msgstr "Görüntü akışı kurulamıyor" @@ -3642,8 +3586,8 @@ msgstr "Video aktarımını aç/kapat" #: ../src/empathy-call-window.ui.h:21 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2581 ../src/empathy-call-window.c:2582 -#: ../src/empathy-call-window.c:2583 ../src/empathy-call-window.c:2584 +#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 msgid "Unknown" msgstr "Bilinmiyor" @@ -3803,96 +3747,96 @@ msgstr "Otomatik-Bağlan" msgid "Manage Favorite Rooms" msgstr "Sık Kullanılan Odaları Yönet" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Gelen görüntülü arama" -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1553 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "Gelen çağrı" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s sizi görüntülü olarak arıyor. Yanıtlamak ister misiniz?" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s sizi arıyor. Yanıtlamak ister misiniz?" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1559 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "%s kişisinden gelen çağrı" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "_Reddet" -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "Cev_apla" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "_Görüntülü olarak cevapla" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1559 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" msgstr "%s'den gelen görüntülü arama" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Oda daveti" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "%s'e katılma daveti" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s sizi %s 'e katılmanız için davet ediyor" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "_Reddet" -#: ../src/empathy-event-manager.c:858 +#: ../src/empathy-event-manager.c:860 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Katıl" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s sizi %s 'e katılmanız için davet etti" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "%s'e katılmaya davet edildiniz" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "%s kişisinden gelen dosya transferi" -#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375 msgid "Password required" msgstr "Parola gerekli" -#: ../src/empathy-event-manager.c:1210 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s çevrimiçi olduğunuz zaman sizi görebilmek için izin istiyor" -#: ../src/empathy-event-manager.c:1214 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3902,105 +3846,105 @@ msgstr "" "Mesaj: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Bilinmiyor" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s / %s hız %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s / %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "\"%s\" dosyası %s kişisinden alınıyor" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "\"%s\" dosyası %s kişisine gönderiliyor" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "\"%s\" dosyası %s kullanıcısından alınırken hata" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Dosya alırken hata" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "\"%s\" dosyası %s kullanıcısına gönderilirken hata" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Dosya gönderirken hata" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "\"%s\" dosyası %s kişisinden alındı" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "\"%s\" dosyası %s kişisine gönderildi" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Dosya transferi tamamlandı" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Diğer katılımcının yanıtı bekleniyor" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "\"%s\" bütünlüğünü kontrol ediliyor" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Karma \"%s\"" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Dosya" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Kalan" @@ -4026,72 +3970,72 @@ msgid "Import Accounts" msgstr "Hesapları İçe Aktar" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "İçe Aktar" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "Protokol" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "Kaynak" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-main-window.c:392 msgid "Provide Password" msgstr "Parola Gir" -#: ../src/empathy-main-window.c:401 +#: ../src/empathy-main-window.c:398 msgid "Disconnect" msgstr "Bağlantıyı kes" -#: ../src/empathy-main-window.c:642 +#: ../src/empathy-main-window.c:635 msgid "No match found" msgstr "Eşleşme bulunamadı" -#: ../src/empathy-main-window.c:750 +#: ../src/empathy-main-window.c:743 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "Üzgünüm. %s hesapları, %s yazılımınız güncellenene kadar kullanılamaz." -#: ../src/empathy-main-window.c:818 +#: ../src/empathy-main-window.c:811 msgid "Update software..." msgstr "Yazılımı güncelle..." -#: ../src/empathy-main-window.c:824 ../src/empathy-main-window.c:949 +#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938 msgid "Close" msgstr "Kapat" -#: ../src/empathy-main-window.c:937 +#: ../src/empathy-main-window.c:926 msgid "Reconnect" msgstr "Yeniden Bağlan" -#: ../src/empathy-main-window.c:943 +#: ../src/empathy-main-window.c:932 msgid "Edit Account" msgstr "Hesabı Düzenle" #. Translators: this string will be something like: #. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:1088 +#: ../src/empathy-main-window.c:1071 #, c-format msgid "Top up %s (%s)..." msgstr "%s doldur (%s)..." -#: ../src/empathy-main-window.c:1135 +#: ../src/empathy-main-window.c:1118 msgid "Top up account credit" msgstr "Hesap kontörü doldur" #. top up button -#: ../src/empathy-main-window.c:1206 +#: ../src/empathy-main-window.c:1189 msgid "Top Up..." msgstr "Doldur..." -#: ../src/empathy-main-window.c:1949 +#: ../src/empathy-main-window.c:1931 msgid "Contact" msgstr "Bağlantı" -#: ../src/empathy-main-window.c:2324 +#: ../src/empathy-main-window.c:2306 msgid "Contact List" msgstr "Bağlantı Listesi" @@ -4251,79 +4195,79 @@ msgstr "Oda Listesi" msgid "_Room:" msgstr "_Oda:" -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Mesaj alındı" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Mesaj gönderildi" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Yeni sohbet" -#: ../src/empathy-preferences.c:172 +#: ../src/empathy-preferences.c:169 msgid "Contact goes online" msgstr "Bağlantı çevrimiçi oldu" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "Bağlantı çevrimdışı oldu" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Hesap bağlı" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Hesap bağlı değil" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Dil" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:725 msgid "Juliet" msgstr "Juliet" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:732 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:738 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Ah Romeo, Romeo, neden Romeo'sun sen?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "Ä°nkar et babanı ve adını yadsı;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "Yapamazsan, yemin et sevdiğine" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "Vazgeçeyim Capulet olmaktan ben." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "Daha dinleyeyim mi, yoksa açılayım mı ona?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "Juliet bağlı değil" -#: ../src/empathy-preferences.c:1175 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "Tercihler" @@ -4383,35 +4327,27 @@ msgstr "Diller için yazım denetimini etkinleştir:" msgid "General" msgstr "Genel" -#: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "Giriş düzeyi:" - #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "Giriş ses düzeyi:" - -#: ../src/empathy-preferences.ui.h:18 msgid "Location sources:" msgstr "Konum kaynakları:" -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:17 msgid "Log conversations" msgstr "Görüşmelerin günlüğünü tut" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:18 msgid "Notifications" msgstr "Uyarılar" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:19 msgid "Play sound for events" msgstr "Etkinlikler için ses çal" -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:20 msgid "Privacy" msgstr "Gizlilik" -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:21 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 " @@ -4421,74 +4357,74 @@ msgstr "" "bilgisinden daha fazla kesin olmayacak demektir. GPS koordinatları 1 ondalık " "basamağa kadar doğru olacaktır." -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:22 msgid "Show _smileys as images" msgstr "Gülüm_semeleri görüntü olarak göster" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:23 msgid "Show contact _list in rooms" msgstr "Odalarda kişi _listesini göster" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:24 msgid "Sounds" msgstr "Sesler" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:25 msgid "Spell Checking" msgstr "Ä°mla Denetimi" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:26 msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." msgstr "Dillerin listesi sadece sözlük yüklü dilleri yansıtır." -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:27 msgid "Themes" msgstr "Temalar" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:28 msgid "Use _echo cancellation to improve call quality" msgstr "Arama kalitesini yükseltmek için _yankı gidermeyi kullan" -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:29 msgid "Variant:" msgstr "Varyant:" -#: ../src/empathy-preferences.ui.h:32 +#: ../src/empathy-preferences.ui.h:30 msgid "_Automatically connect on startup" msgstr "_Açılışta otomatik bağlan" -#: ../src/empathy-preferences.ui.h:33 +#: ../src/empathy-preferences.ui.h:31 msgid "_Cellphone" msgstr "_Cep Telefonu" -#: ../src/empathy-preferences.ui.h:34 +#: ../src/empathy-preferences.ui.h:32 msgid "_Enable bubble notifications" msgstr "Balon uyarıları _etkinleştir" -#: ../src/empathy-preferences.ui.h:35 +#: ../src/empathy-preferences.ui.h:33 msgid "_Enable sound notifications" msgstr "Ses uyarılarını _etkinleştir" -#: ../src/empathy-preferences.ui.h:36 +#: ../src/empathy-preferences.ui.h:34 msgid "_GPS" msgstr "_GPS" -#: ../src/empathy-preferences.ui.h:37 +#: ../src/empathy-preferences.ui.h:35 msgid "_Network (IP, Wi-Fi)" msgstr "_Ağ (IP, Wi-Fi)" -#: ../src/empathy-preferences.ui.h:38 +#: ../src/empathy-preferences.ui.h:36 msgid "_Open new chats in separate windows" msgstr "Yeni s_ohbetleri ayrı pencerelerde aç" -#: ../src/empathy-preferences.ui.h:39 +#: ../src/empathy-preferences.ui.h:37 msgid "_Publish location to my contacts" msgstr "Bağlantılarıma _konumumu yayınla" #. 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:41 +#: ../src/empathy-preferences.ui.h:39 msgid "_Reduce location accuracy" msgstr "_Konum hassasiyetini indirge" @@ -4548,7 +4484,7 @@ msgstr "Görüntü Açık" msgid "Video Preview" msgstr "Görüntü Önizleme" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "Bağlantı Harita Görünümü" @@ -4615,16 +4551,16 @@ msgid "" msgstr "" "Seçilen bağlantı yöneticisi uzaktan hata ayıklama eklentisini desteklemiyor." -#: ../src/empathy-invite-participant-dialog.c:197 -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Katılımcı Davet Et" -#: ../src/empathy-invite-participant-dialog.c:198 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Görüşmeye davet etmek için bir kişi seçin:" -#: ../src/empathy-invite-participant-dialog.c:221 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Davet et" @@ -4678,39 +4614,39 @@ msgstr "Empathy Hata Ayıklayıcısı" msgid "- Empathy Chat Client" msgstr "- Empati Sohbet Ä°stemcisi" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Yanıtla" -#: ../src/empathy-notifications-approver.c:217 -#: ../src/empathy-call-window.c:1563 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 msgid "Reject" msgstr "Reddet" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 -#: ../src/empathy-call-window.c:1564 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 msgid "Answer" msgstr "Yanıtla" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Görüntülü olarak cevapla" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Reddet" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Kabul Et" #. 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:260 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Sağla" @@ -4721,40 +4657,38 @@ msgstr "%s sizi aramayı denedi, fakat siz başka bir arama ile meşguldünüz." #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196 +#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2880 +#: ../src/empathy-call-window.c:2929 msgid "On hold" msgstr "Beklemede" -#: ../src/empathy-call-window.c:2883 +#: ../src/empathy-call-window.c:2932 msgid "Mute" msgstr "Sessiz" -#: ../src/empathy-call-window.c:2885 +#: ../src/empathy-call-window.c:2934 msgid "Duration" msgstr "Süre" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2888 +#: ../src/empathy-call-window.c:2937 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02ds" -#: ../src/empathy-call-window.c:3158 +#: ../src/empathy-call-window.c:3207 #, c-format msgid "Your current balance is %s." msgstr "Şu andaki bakiyeniz %s." -#: ../src/empathy-call-window.c:3162 -#| msgid "You don't have enough credit in order to place this call" +#: ../src/empathy-call-window.c:3211 msgid "Sorry, you don’t have enough credit for that call." msgstr "Üzgünüm, bu çağrı için yeterli krediniz yok." -#: ../src/empathy-call-window.c:3164 -#| msgid "Top Up..." +#: ../src/empathy-call-window.c:3213 msgid "Top Up" msgstr "Doldur" @@ -4762,6 +4696,54 @@ msgstr "Doldur" msgid "_Match case" msgstr "_BÜYÜK/küçük harf eşleştir" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "Yeni hesap ekleniyor" + +#~ msgid "Call volume" +#~ msgstr "Çağrı ses düzeyi" + +#~ msgid "Call volume, as a percentage." +#~ msgstr "Yüzde olarak çağrı ses düzeyi." + +#~ msgid "Socket type not supported" +#~ msgstr "Soket türü desteklenmiyor" + +#~ msgid "My Web Accounts" +#~ msgstr "Web Hesaplarım" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "%s hesabı, %s aracılığıyla düzenlendi." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "%s hesabı Empathy içinden düzenlenemiyor." + +#~ msgid "Launch My Web Accounts" +#~ msgstr "Web Hesaplarımı Başlat" + +#~ msgid "Edit %s" +#~ msgstr "%s'i Düzenle" + +#~ msgid "Ca_ncel" +#~ msgstr "Va_zgeç" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "Düz_enle" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "Yeni bir hesap oluşturmak üzeresiniz ve bu değişikliklerinizi\n" +#~ "kaybedecek. Devam etmek istediğinize emin misiniz?" + +#~ msgid "Input level:" +#~ msgstr "Giriş düzeyi:" + +#~ msgid "Input volume:" +#~ msgstr "Giriş ses düzeyi:" + #~ msgid "Contact ID:" #~ msgstr "Bağlantı ID:" diff --git a/po/uk.po b/po/uk.po index 4971c796..b16c3ce3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-29 16:12+0300\n" -"PO-Revision-Date: 2011-07-29 19:45+0300\n" +"POT-Creation-Date: 2011-12-11 16:53+0200\n" +"PO-Revision-Date: 2011-12-11 20:56+0300\n" "Last-Translator: Korostil Daniel \n" "Language-Team: translation@linux.org.ua\n" "Language: uk\n" @@ -42,12 +42,12 @@ msgid "Always open a separate chat window for new chats." msgstr "Завжди відкривати нову бесіду у новому вікні." #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "Гучність виклику" +msgid "Camera device" +msgstr "Пристрій камери" #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "Гучність виклику, у відсотках." +msgid "Camera position" +msgstr "Положення камери" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "" @@ -69,8 +69,8 @@ msgstr "Варіант теми вікна бесіди" msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" -"Список мов, що використовуються при перевірянні орфографії, розділених комами " -"(наприклад, «en, ru, uk»)." +"Список мов, що використовуються при перевірянні орфографії, розділених " +"комами (наприклад, «en, ru, uk»)." #: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Compact contact list" @@ -85,22 +85,32 @@ msgid "Contact list sort criterion" msgstr "Критерій упорядкування списку контактів" #: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +msgid "D-Bus object path of the last account selected to join a room." +msgstr "" +"Контур об'єкта D-Bus останнього облікового запису, який вибрано для " +"приєднання до кімнати." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "Типовий пристрій камери для відеовикликів, наприклад, /dev/video0." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Default directory to select an avatar image from" msgstr "Каталог, що використовується для вибору зображень аватарів" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Disable popup notifications when away" msgstr "Вимкнути контекстні сповіщення у стані «відійшов»" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Disable sounds when away" msgstr "Вимкнути звуки у стані «відійшов»" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Display incoming events in the status area" msgstr "Показувати вхідні події в ділянці стану" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "" "Display incoming events in the status area. If false, present them to the " "user immediately." @@ -108,297 +118,305 @@ msgstr "" "Показувати вхідні події в ділянці стану. Якщо ні, то представити їх " "користувачу негайно." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +msgid "Echo cancellation support" +msgstr "Підтримування усунення відлуння" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy can publish the user's location" msgstr "Empathy може публікувати місцевість користувачів" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy може використовувати GPS для визначення місцевості." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy can use the cellular network to guess the location" msgstr "" "Empathy може використовувати стільникову мережу для визначення місцевості" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy can use the network to guess the location" msgstr "Empathy може використовувати мережу для припущень щодо місцевості" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Empathy default download folder" msgstr "Типова тека для звантаження файлів" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 -msgid "Empathy has migrated butterfly logs" -msgstr "Empathy переніс журнал повідомлень MSN" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Empathy should auto-away when idle" msgstr "Empathy слід автоматично переходити в режим очікування" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Empathy should auto-connect on startup" msgstr "З'єднуватися під час запуску" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Empathy should reduce the location's accuracy" msgstr "Empathy має послабити точність визначення місцевості" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "" "Empathy має використовувати аватар контакту, як піктограму вікна із бесідою" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Enable WebKit Developer Tools" msgstr "Увімкнути засіб розроблення WebKit" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Enable popup notifications for new messages" msgstr "Ввімкнути контекстні сповіщення для нових повідомлень" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Enable spell checker" msgstr "Увімкнути перевіряння орфографії" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Hide main window" msgstr "Сховати головне вікно" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Hide the main window." msgstr "Сховати головне вікно." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +msgid "Last account selected in Join Room dialog" +msgstr "Останній обліковий запис, вибраний у вікні приєднання до кімнати" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Nick completed character" msgstr "Символ автоматичне доповнення псевдоніму" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Open new chats in separate windows" msgstr "Відкривати нові бесіди у новому вікні" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Path of the Adium theme to use" msgstr "Шлях до теми Adium" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "Шлях до теми Adium для використання у балачці Adium." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound for incoming messages" msgstr "Відтворити звук при отриманні повідомлення" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for new conversations" msgstr "Відтворити звук для нової розмови" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for outgoing messages" msgstr "Відтворити звук при відправленні повідомлення" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Play a sound when a contact logs in" msgstr "Відтворити звук при появі контакту в мережі" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound when a contact logs out" msgstr "Відтворити звук при від'єднанні контакту" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when we log in" msgstr "Відтворити звук при вході" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound when we log out" msgstr "Відтворити звук при виході" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Pop up notifications if the chat isn't focused" msgstr "Контекстні сповіщення, коли балачка не в фокусі" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Pop up notifications when a contact logs in" msgstr "Контекстні сповіщення, коли контакт увійде" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Pop up notifications when a contact logs out" msgstr "Контекстні сповіщення, коли контакт вийде" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +msgid "Position the camera preview should be during a call." +msgstr "Перегляд положення потрібно здійснювати протягом дзвінка." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "Show Balance in contact list" msgstr "Показувати залишок у списку контактів" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Show avatars" msgstr "Показувати аватари" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Show contact list in rooms" msgstr "Показати список контактів у кімнаті" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Show hint about closing the main window" msgstr "Показувати підтвердження про закриття головного вікна" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Show offline contacts" msgstr "Показувати відсутні контакти" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Show protocols" msgstr "Показати протокол:" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Spell checking languages" msgstr "Перевіряння правопису для мов" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "The default folder to save file transfers in." msgstr "Типова тека для збереження вхідних файлів." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "The last directory that an avatar image was chosen from." msgstr "Останній каталог, з якого брались зображення аватарів." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "The position for the chat window side pane" msgstr "Позиція бокової панелі вікна балачки" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "The stored position (in pixels) of the chat window side pane." msgstr "Збережена позиція (в пікселях) бокової панелі вікна балачки." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "The theme that is used to display the conversation in chat windows." msgstr "Ця тема використовується для вікна бесіди." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "Варіант теми, який використовується для показу розмов у вікні балачки." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "Використовувати графічні емоційки" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Use notification sounds" msgstr "Використовувати звуки" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use theme for chat rooms" msgstr "Використовувати тему для бесід" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "Чи показувати місцевості вашим контактам." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Чи використовувати GPS для визначення місцевості." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "Чи використовувати мобільну мережу для визначення місцевості." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether Empathy can use the network to guess the location." msgstr "Чи використовувати комп'ютерну мережу для визначення місцевості." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "Whether Empathy has migrated butterfly logs." -msgstr "Чи було переміщення журналу MSN." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "Автоматично з'єднувати облікові записи при запуску." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "" "Whether Empathy should go into away mode automatically if the user is idle." msgstr "Чи слід іти в режим очікування, коли користувач бездіяльний." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" "Чи слід зменшити точність визначення місцевості задля конфіденційності." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "Чи використовувати аватари контактів як піктограми вікон із бесідами" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "Чи вмикати такі засоби розроблення WebKit, як Web Inspector." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." msgstr "" -"Чи використовувати менеджер з'єднань для автоматичного встановлення/розривання " -"зв'язку." +"Чи використовувати менеджер з'єднань для автоматичного встановлення/" +"розривання зв'язку." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "" "Whether to check words typed against the languages you want to check with." msgstr "Перевіряти набрані слова за списком мов для перевіряння орфографії." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Whether to convert smileys into graphical images in conversations." msgstr "Перетворювати текстові емоційки у графічні." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "Чи ввімкнути фільтр усунення відлуння Pulseaudio." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "Чи відтворювати звуковий сигнал при вході контакту в мережу." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "Чи відтворювати звуковий сигнал при виході контакту з мережі." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Whether to play a sound to notify of events." msgstr "Чи відтворювати звукові сигнали при подіях." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to play a sound to notify of incoming messages." msgstr "Чи відтворювати звуковий сигнал при надходженні повідомлення." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Whether to play a sound to notify of new conversations." msgstr "Чи відтворювати звуковий сигнал для нової бесіди." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to play a sound to notify of outgoing messages." msgstr "Чи відтворювати звуковий сигнал при надсиланні повідомлення." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Whether to play a sound when logging into a network." msgstr "Чи відтворювати звуковий сигнал при вході у мережу." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to play a sound when logging out of a network." msgstr "Чи відтворювати звуковий сигнал при виході з мережі." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to play sound notifications when away or busy." msgstr "Чи відтворювати звукові сигнали у станах «відійшов» або «зайнятий»." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to show a popup notification when a contact goes offline." msgstr "Чи показувати контекстні сповіщення коли контакт виходить з мережі." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Whether to show a popup notification when a contact goes online." msgstr "Чи показувати контекстні сповіщення коли контакт входить у мережу." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." @@ -406,42 +424,42 @@ msgstr "" "Чи показувати контекстні сповіщення при надходженні нового повідомлення, " "коли балачку вже відкрито, але він не в фокусі." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Whether to show a popup notification when receiving a new message." msgstr "" "Чи показувати контекстні сповіщення при надходженні нового повідомлення." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Whether to show account balances in the contact list." msgstr "Чи показувати залишок облікових записів у списку контактів." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "Чи показувати аватари для контактів у списку та вікні балачки." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Whether to show contacts that are offline in the contact list." msgstr "Чи показувати недоступних у мережі користувачів у списку контактів." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Whether to show popup notifications when away or busy." msgstr "" "Чи показувати контекстні сповіщення у станах «відійшов» або «зайнятий»." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to show protocols for contacts in the contact list." msgstr "Чи показувати аватари для контактів у списку та вікні балачки." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Whether to show the contact list in chat rooms." msgstr "Чи показувати список контактів у кімнаті." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "Whether to show the contact list in compact mode." msgstr "Чи показувати список контактів стисненим." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." @@ -449,19 +467,19 @@ msgstr "" "Чи показувати повідомлення про закриття головного вікна кнопкою «x» у " "заголовку." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether to use the theme for chat rooms." msgstr "Чи використовувати теми для вікон бесід." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's name with the value \"name\". A value of \"state\" will sort " "the contact list by state." msgstr "" -"Критерій для впорядковування списку контактів. Типово впорядковується " -"за псевдонімом контакту — «name». При значенні «state» список буде " -"впорядковано за станом." +"Критерій для впорядковування списку контактів. Типово впорядковується за " +"псевдонімом контакту — «name». При значенні «state» список буде впорядковано " +"за станом." #: ../data/empathy-accounts.desktop.in.in.h:1 msgid "Manage Messaging and VoIP accounts" @@ -469,206 +487,203 @@ msgstr "Керування обліковими записами повідом #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2324 +#: ../src/empathy-accounts-dialog.c:2312 msgid "Messaging and VoIP Accounts" msgstr "Листування й облікові записи VoIP" -#: ../libempathy/empathy-ft-handler.c:825 +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Причину не вказано" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Запит на заміну стану" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Ви скасували передачу файла " + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Інший учасник скасував передавання файла" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Помилка при спробі передати файл" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Інший учасник не може передати файл" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:312 +msgid "Unknown reason" +msgstr "Невідома причина" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "Передавання файла завершено, але файл пошкоджено" -#: ../libempathy/empathy-ft-handler.c:1113 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "Передача файлів не працює для віддалених контактів" -#: ../libempathy/empathy-ft-handler.c:1169 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "Вибраний файл не є звичайним файлом" -#: ../libempathy/empathy-ft-handler.c:1178 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "Вибраний файл порожній" -#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132 +#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131 #, c-format msgid "Missed call from %s" msgstr "Пропущений виклик від %s" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:417 +#: ../libempathy/empathy-message.c:419 #, c-format msgid "Called %s" msgstr "Викликано %s" -#: ../libempathy/empathy-message.c:420 +#: ../libempathy/empathy-message.c:422 #, c-format msgid "Call from %s" msgstr "Виклик від %s" -#: ../libempathy/empathy-tp-file.c:268 -msgid "Socket type not supported" -msgstr "Такий тип гнізда не підтримується" - -#: ../libempathy/empathy-tp-file.c:387 -msgid "No reason was specified" -msgstr "Причину не вказано" - -#: ../libempathy/empathy-tp-file.c:390 -msgid "The change in state was requested" -msgstr "Запит на заміну стану" - -#: ../libempathy/empathy-tp-file.c:393 -msgid "You canceled the file transfer" -msgstr "Ви скасували передачу файла " - -#: ../libempathy/empathy-tp-file.c:396 -msgid "The other participant canceled the file transfer" -msgstr "Інший учасник скасував передавання файла" - -#: ../libempathy/empathy-tp-file.c:399 -msgid "Error while trying to transfer the file" -msgstr "Помилка при спробі передати файл" - -#: ../libempathy/empathy-tp-file.c:402 -msgid "The other participant is unable to transfer the file" -msgstr "Інший учасник не може передати файл" - -#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292 -msgid "Unknown reason" -msgstr "Невідома причина" - -#: ../libempathy/empathy-utils.c:212 +#: ../libempathy/empathy-utils.c:232 msgid "Available" msgstr "Доступний" -#: ../libempathy/empathy-utils.c:214 +#: ../libempathy/empathy-utils.c:234 msgid "Busy" msgstr "Зайнятий" -#: ../libempathy/empathy-utils.c:217 +#: ../libempathy/empathy-utils.c:237 msgid "Away" msgstr "Відійшов" -#: ../libempathy/empathy-utils.c:219 +#: ../libempathy/empathy-utils.c:239 msgid "Invisible" msgstr "Невидимий" -#: ../libempathy/empathy-utils.c:221 +#: ../libempathy/empathy-utils.c:241 msgid "Offline" msgstr "Поза мережею" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:224 +#: ../libempathy/empathy-utils.c:244 msgctxt "presence" msgid "Unknown" msgstr "Невідомо" -#: ../libempathy/empathy-utils.c:264 +#: ../libempathy/empathy-utils.c:284 msgid "No reason specified" msgstr "Причину не вказано" -#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 msgid "Status is set to offline" msgstr "Встановлено стан «поза мережею»" -#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302 -#: ../libempathy-gtk/empathy-call-utils.c:47 +#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-new-message-dialog.c:82 msgid "Network error" msgstr "Помилка мережі" -#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 msgid "Authentication failed" msgstr "Не вдалось аутентифікувати" -#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 msgid "Encryption error" msgstr "Помилка шифрування" -#: ../libempathy/empathy-utils.c:274 +#: ../libempathy/empathy-utils.c:294 msgid "Name in use" msgstr "Псевдонім уже використовується" -#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308 +#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 msgid "Certificate not provided" msgstr "Сертифікат недоступний" -#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 msgid "Certificate untrusted" msgstr "Сертифікат ненадійний" -#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312 +#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 msgid "Certificate expired" msgstr "Сертифіката застарів" -#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314 +#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 msgid "Certificate not activated" msgstr "Сертифікат не активовано" -#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316 +#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 msgid "Certificate hostname mismatch" msgstr "Сертифікат з помилкою у назві вузла" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 msgid "Certificate fingerprint mismatch" msgstr "Відбитки сертифікатів не збігаються" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 msgid "Certificate self-signed" msgstr "Самопідписаний сертифікат" -#: ../libempathy/empathy-utils.c:290 +#: ../libempathy/empathy-utils.c:310 msgid "Certificate error" msgstr "Помилка сертифіката" -#: ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:344 msgid "Encryption is not available" msgstr "Шифрування не доступне" -#: ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:346 msgid "Certificate is invalid" msgstr "Сертифікат недійсний" -#: ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:348 msgid "Connection has been refused" msgstr "У з'єднанні відмовлено" -#: ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:350 msgid "Connection can't be established" msgstr "З'єднання неможливо встановити" -#: ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:352 msgid "Connection has been lost" msgstr "З'єднання втрачено" -#: ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:354 msgid "This resource is already connected to the server" msgstr "Цей ресурс уже з'єднано з сервером" -#: ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:356 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "З'єднання замінено на нове з'єднання через той самий ресурс" -#: ../libempathy/empathy-utils.c:339 +#: ../libempathy/empathy-utils.c:359 msgid "The account already exists on the server" msgstr "Цей обліковий запис уже існує на сервері" -#: ../libempathy/empathy-utils.c:341 +#: ../libempathy/empathy-utils.c:361 msgid "Server is currently too busy to handle the connection" msgstr "Сервер зараз зайнятий, щоб обробити з'єднання" -#: ../libempathy/empathy-utils.c:343 +#: ../libempathy/empathy-utils.c:363 msgid "Certificate has been revoked" msgstr "Сертифікат анульовано" -#: ../libempathy/empathy-utils.c:345 +#: ../libempathy/empathy-utils.c:365 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "Сертифікат використовує небезпечний алгоритм шифрування або криптографічно " "ненадійний." -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:368 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -676,20 +691,23 @@ msgstr "" "Довжина сертифіката сервера або глибина ланцюжка сертифіката сервера " "перевищує обмеження криптографічної бібліотеки" -#: ../libempathy/empathy-utils.c:509 -#: ../libempathy-gtk/empathy-contact-list-store.h:73 +#: ../libempathy/empathy-utils.c:372 +msgid "Your software is too old" +msgstr "Ваша програма надто стара" + +#: ../libempathy/empathy-utils.c:531 msgid "People Nearby" msgstr "Люди поблизу" -#: ../libempathy/empathy-utils.c:514 +#: ../libempathy/empathy-utils.c:536 msgid "Yahoo! Japan" msgstr "Yahoo! Японія" -#: ../libempathy/empathy-utils.c:543 +#: ../libempathy/empathy-utils.c:565 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:544 +#: ../libempathy/empathy-utils.c:566 msgid "Facebook Chat" msgstr "Балачка Facebook" @@ -745,71 +763,81 @@ msgstr[2] "%d місяців тому" msgid "in the future" msgstr "в майбутньому" -#: ../libempathy-gtk/empathy-account-chooser.c:539 +#: ../libempathy-gtk/empathy-account-chooser.c:688 msgid "All accounts" msgstr "Усі облікові записи" -#: ../libempathy-gtk/empathy-account-widget.c:691 +#: ../libempathy-gtk/empathy-account-widget.c:694 #: ../src/empathy-import-widget.c:321 msgid "Account" msgstr "Обліковий запис" -#: ../libempathy-gtk/empathy-account-widget.c:692 +#: ../libempathy-gtk/empathy-account-widget.c:695 msgid "Password" msgstr "Пароль" -#: ../libempathy-gtk/empathy-account-widget.c:693 +#: ../libempathy-gtk/empathy-account-widget.c:696 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Сервер" -#: ../libempathy-gtk/empathy-account-widget.c:694 +#: ../libempathy-gtk/empathy-account-widget.c:697 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Порт" -#: ../libempathy-gtk/empathy-account-widget.c:766 -#: ../libempathy-gtk/empathy-account-widget.c:823 +#: ../libempathy-gtk/empathy-account-widget.c:776 +#: ../libempathy-gtk/empathy-account-widget.c:828 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1164 +#: ../libempathy-gtk/empathy-account-widget.c:1182 +msgid "My Web Accounts" +msgstr "Мої мережеві облікові записи " + +#: ../libempathy-gtk/empathy-account-widget.c:1199 #, c-format -msgid "The account %s is edited via My Web Accounts." -msgstr "Обліковий запис %s — змінено через сайт." +msgid "The account %s is edited via %s." +msgstr "Обліковий запис %s змінено через %s." -#: ../libempathy-gtk/empathy-account-widget.c:1170 +#: ../libempathy-gtk/empathy-account-widget.c:1205 #, c-format msgid "The account %s cannot be edited in Empathy." msgstr "Обліковий запис %s неможливо редагувати в Empathy." -#: ../libempathy-gtk/empathy-account-widget.c:1190 +#: ../libempathy-gtk/empathy-account-widget.c:1224 msgid "Launch My Web Accounts" msgstr "Запустити мій обліковий запис із сайту" -#: ../libempathy-gtk/empathy-account-widget.c:1530 +#. general handler +#: ../libempathy-gtk/empathy-account-widget.c:1232 +#, c-format +msgid "Edit %s" +msgstr "Редагувати %s" + +#: ../libempathy-gtk/empathy-account-widget.c:1582 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "Користувач:" -#: ../libempathy-gtk/empathy-account-widget.c:1848 +#: ../libempathy-gtk/empathy-account-widget.c:1900 msgid "A_pply" msgstr "_Застосувати" -#: ../libempathy-gtk/empathy-account-widget.c:1878 +#: ../libempathy-gtk/empathy-account-widget.c:1930 msgid "L_og in" msgstr "_Увійти" -#: ../libempathy-gtk/empathy-account-widget.c:1952 +#: ../libempathy-gtk/empathy-account-widget.c:2004 msgid "This account already exists on the server" msgstr "Цей обліковий запис вже існує на сервері" -#: ../libempathy-gtk/empathy-account-widget.c:1955 +#: ../libempathy-gtk/empathy-account-widget.c:2007 msgid "Create a new account on the server" msgstr "Створити новий обліковий запис на сервері" -#: ../libempathy-gtk/empathy-account-widget.c:2147 +#: ../libempathy-gtk/empathy-account-widget.c:2201 msgid "Ca_ncel" msgstr "_Скасувати" @@ -818,19 +846,19 @@ msgstr "_Скасувати" #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2425 +#: ../libempathy-gtk/empathy-account-widget.c:2479 #, c-format msgid "%1$s on %2$s" msgstr "%1$s на %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2451 +#: ../libempathy-gtk/empathy-account-widget.c:2505 #, c-format msgid "%s Account" msgstr "Обліковий запис %s" -#: ../libempathy-gtk/empathy-account-widget.c:2455 +#: ../libempathy-gtk/empathy-account-widget.c:2509 msgid "New account" msgstr "Новий обліковий запис" @@ -878,7 +906,7 @@ msgstr "Запам'ятати пароль" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 msgid "Remember password" msgstr "Запам'ятати пароль" @@ -952,36 +980,36 @@ msgstr "Ідентифікатор користувача (UIN) у ICQ?" msgid "What is your ICQ password?" msgstr "Пароль у ICQ?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:184 -#: ../libempathy-gtk/empathy-account-widget-sip.c:217 +#: ../libempathy-gtk/empathy-account-widget-sip.c:206 +#: ../libempathy-gtk/empathy-account-widget-sip.c:239 msgid "Auto" msgstr "Автоматично" -#: ../libempathy-gtk/empathy-account-widget-sip.c:187 +#: ../libempathy-gtk/empathy-account-widget-sip.c:209 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:190 +#: ../libempathy-gtk/empathy-account-widget-sip.c:212 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:193 +#: ../libempathy-gtk/empathy-account-widget-sip.c:215 msgid "TLS" msgstr "TLS" #. translators: this string is very specific to SIP's internal; maybe #. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:222 +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 msgid "Register" msgstr "Register" #. translators: this string is very specific to SIP's internal; maybe #. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:227 +#: ../libempathy-gtk/empathy-account-widget-sip.c:249 msgid "Options" msgstr "Параметри" -#: ../libempathy-gtk/empathy-account-widget-sip.c:230 +#: ../libempathy-gtk/empathy-account-widget-sip.c:252 msgid "None" msgstr "Немає" @@ -1203,7 +1231,7 @@ msgid "STUN Server:" msgstr "Сервер STUN:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contact-widget.c:347 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 msgid "Server:" msgstr "Сервер:" @@ -1212,14 +1240,19 @@ msgid "Transport:" msgstr "Транспорт" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +msgid "Use this account to call _landlines and mobile phones" +msgstr "" +"Скористатись цим обліковим записом для _стаціонарних і мобільних телефонів" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 msgid "What is your SIP account password?" msgstr "Пароль до облікового запису у SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Ідентифікатор облікового запису у SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "_Username:" msgstr "_Користувач:" @@ -1243,36 +1276,36 @@ msgstr "Yahoo! I_D:" msgid "_Room List locale:" msgstr "_Локаль списку бесід:" -#: ../libempathy-gtk/empathy-avatar-chooser.c:474 -#: ../libempathy-gtk/empathy-avatar-chooser.c:559 +#: ../libempathy-gtk/empathy-avatar-chooser.c:471 +#: ../libempathy-gtk/empathy-avatar-chooser.c:556 msgid "Couldn't convert image" msgstr "Неможливо перетворити зображення" -#: ../libempathy-gtk/empathy-avatar-chooser.c:475 +#: ../libempathy-gtk/empathy-avatar-chooser.c:472 msgid "None of the accepted image formats are supported on your system" msgstr "Ваша система не підтримує жодного відомого формату зображень" -#: ../libempathy-gtk/empathy-avatar-chooser.c:822 -msgid "Couldn't save pixbuf to png" -msgstr "Неможливо зберегти pixbuf у png" +#: ../libempathy-gtk/empathy-avatar-chooser.c:819 +msgid "Couldn't save picture to file" +msgstr "Неможливо зберегти малюнок у файл" -#: ../libempathy-gtk/empathy-avatar-chooser.c:938 +#: ../libempathy-gtk/empathy-avatar-chooser.c:939 msgid "Select Your Avatar Image" msgstr "Виберіть зображення вашого аватару" -#: ../libempathy-gtk/empathy-avatar-chooser.c:942 +#: ../libempathy-gtk/empathy-avatar-chooser.c:947 msgid "Take a picture..." msgstr "Зробити знімок…" -#: ../libempathy-gtk/empathy-avatar-chooser.c:945 +#: ../libempathy-gtk/empathy-avatar-chooser.c:960 msgid "No Image" msgstr "Немає зображення" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1005 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1017 msgid "Images" msgstr "Зображення" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1009 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1021 msgid "All Files" msgstr "Усі файли" @@ -1280,84 +1313,88 @@ msgstr "Усі файли" msgid "Click to enlarge" msgstr "Натисніть для збільшення" -#: ../libempathy-gtk/empathy-call-utils.c:42 -#: ../libempathy-gtk/empathy-call-utils.c:58 +#: ../libempathy-gtk/empathy-call-utils.c:44 +#: ../libempathy-gtk/empathy-call-utils.c:62 msgid "There was an error starting the call" msgstr "Помилка виклику" -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "The specified contact doesn't support calls" msgstr "Вказаний контакт не підтримує виклики" -#: ../libempathy-gtk/empathy-call-utils.c:51 +#: ../libempathy-gtk/empathy-call-utils.c:53 msgid "The specified contact is offline" msgstr "Вказаний контакт поза мережею" -#: ../libempathy-gtk/empathy-call-utils.c:53 +#: ../libempathy-gtk/empathy-call-utils.c:55 msgid "The specified contact is not valid" msgstr "Вказаний контакт недійсний" -#: ../libempathy-gtk/empathy-call-utils.c:55 +#: ../libempathy-gtk/empathy-call-utils.c:57 msgid "Emergency calls are not supported on this protocol" msgstr "Екстрені виклики не підтримуються цим протоколом" -#: ../libempathy-gtk/empathy-chat.c:702 +#: ../libempathy-gtk/empathy-call-utils.c:59 +msgid "You don't have enough credit in order to place this call" +msgstr "Ви не має достатньо на рахунку, щоб здійснити цей виклик" + +#: ../libempathy-gtk/empathy-chat.c:706 msgid "Failed to open private chat" msgstr "Не вдалось відкрити приватну кімнату" -#: ../libempathy-gtk/empathy-chat.c:763 +#: ../libempathy-gtk/empathy-chat.c:764 msgid "Topic not supported on this conversation" msgstr "Тема не підтримується у цій бесіді" -#: ../libempathy-gtk/empathy-chat.c:769 +#: ../libempathy-gtk/empathy-chat.c:770 msgid "You are not allowed to change the topic" msgstr "У вас немає прав змінювати тему" -#: ../libempathy-gtk/empathy-chat.c:973 +#: ../libempathy-gtk/empathy-chat.c:971 #, c-format msgid "“%s” is not a valid contact ID" msgstr "«%s» — недійсний ідентифікатор контакту" -#: ../libempathy-gtk/empathy-chat.c:1030 +#: ../libempathy-gtk/empathy-chat.c:1066 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: очистити всі повідомлення з поточної бесіди" -#: ../libempathy-gtk/empathy-chat.c:1033 +#: ../libempathy-gtk/empathy-chat.c:1069 msgid "/topic : set the topic of the current conversation" msgstr "/topic : встановити тему поточної бесіди" -#: ../libempathy-gtk/empathy-chat.c:1036 +#: ../libempathy-gtk/empathy-chat.c:1072 msgid "/join : join a new chat room" msgstr "/join : приєднатися до нової кімнати розмов" -#: ../libempathy-gtk/empathy-chat.c:1039 +#: ../libempathy-gtk/empathy-chat.c:1075 msgid "/j : join a new chat room" msgstr "/j : приєднатися до нової кімнати розмов" -#: ../libempathy-gtk/empathy-chat.c:1043 +#: ../libempathy-gtk/empathy-chat.c:1079 msgid "" "/part [] []: leave the chat room, by default the " "current one" msgstr "" "/part [] []: покинути кімнату бесіди, типово теперішню" -#: ../libempathy-gtk/empathy-chat.c:1047 +#: ../libempathy-gtk/empathy-chat.c:1083 msgid "/query []: open a private chat" msgstr "/query []: відкрити приватну бесіду" -#: ../libempathy-gtk/empathy-chat.c:1050 +#: ../libempathy-gtk/empathy-chat.c:1086 msgid "/msg : open a private chat" msgstr "/msg : відкрити приватну бесіду" -#: ../libempathy-gtk/empathy-chat.c:1053 +#: ../libempathy-gtk/empathy-chat.c:1089 msgid "/nick : change your nickname on the current server" msgstr "/nick : змінити назву на поточному сервері" -#: ../libempathy-gtk/empathy-chat.c:1056 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/me : send an ACTION message to the current conversation" msgstr "/me : надіслати повідомлення ACTION до поточної бесіди" -#: ../libempathy-gtk/empathy-chat.c:1059 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1367,11 +1404,11 @@ msgstr "" "для надсилання нового повідомлення, що починається з '/'. Наприклад: \"/" "скажіть /join для приєднання до нової кімнати розмов\"" -#: ../libempathy-gtk/empathy-chat.c:1064 +#: ../libempathy-gtk/empathy-chat.c:1100 msgid "/whois : display information about a contact" msgstr "/whois : показує інформацію про контакт" -#: ../libempathy-gtk/empathy-chat.c:1067 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1379,113 +1416,121 @@ msgstr "" "/help []: показати довідку. Якщо визначено , показати " "синтаксис команди." -#: ../libempathy-gtk/empathy-chat.c:1077 +#: ../libempathy-gtk/empathy-chat.c:1122 #, c-format msgid "Usage: %s" msgstr "Використання: %s" -#: ../libempathy-gtk/empathy-chat.c:1116 +#: ../libempathy-gtk/empathy-chat.c:1167 msgid "Unknown command" msgstr "Невідома команда" -#: ../libempathy-gtk/empathy-chat.c:1242 +#: ../libempathy-gtk/empathy-chat.c:1293 msgid "Unknown command; see /help for the available commands" msgstr "Невідома команда; для виводу списку доступних команд введіть /help" -#. translators: error used when user doesn't have enough credit on his -#. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1412 +#: ../libempathy-gtk/empathy-chat.c:1457 msgid "insufficient balance to send message" msgstr "недостатній залишок для надсилання повідомлення" -#: ../libempathy-gtk/empathy-chat.c:1414 +#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475 +#: ../libempathy-gtk/empathy-chat.c:1538 +#, c-format +msgid "Error sending message '%s': %s" +msgstr "Помилка при надсиланні повідомлення «%s»: %s" + +#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480 +#: ../libempathy-gtk/empathy-chat.c:1542 +#, c-format +msgid "Error sending message: %s" +msgstr "Помилка надсилання повідомлення: %s" + +#. translators: error used when user doesn't have enough credit on his +#. * account to send the message. +#: ../libempathy-gtk/empathy-chat.c:1469 +#, c-format +msgid "insufficient balance to send message. Top up." +msgstr "" +"недостатній залишок для надсилання повідомлення. Поповнити." + +#: ../libempathy-gtk/empathy-chat.c:1509 msgid "not capable" msgstr "не здатен" -#: ../libempathy-gtk/empathy-chat.c:1421 +#: ../libempathy-gtk/empathy-chat.c:1516 msgid "offline" msgstr "поза мережею" -#: ../libempathy-gtk/empathy-chat.c:1424 +#: ../libempathy-gtk/empathy-chat.c:1519 msgid "invalid contact" msgstr "неправильний контакт" -#: ../libempathy-gtk/empathy-chat.c:1427 +#: ../libempathy-gtk/empathy-chat.c:1522 msgid "permission denied" msgstr "відмовлено у доступі" -#: ../libempathy-gtk/empathy-chat.c:1430 +#: ../libempathy-gtk/empathy-chat.c:1525 msgid "too long message" msgstr "надто довге повідомлення" -#: ../libempathy-gtk/empathy-chat.c:1433 +#: ../libempathy-gtk/empathy-chat.c:1528 msgid "not implemented" msgstr "не реалізовано" -#: ../libempathy-gtk/empathy-chat.c:1437 +#: ../libempathy-gtk/empathy-chat.c:1532 msgid "unknown" msgstr "невідомо" -#: ../libempathy-gtk/empathy-chat.c:1443 -#, c-format -msgid "Error sending message '%s': %s" -msgstr "Помилка при надсиланні повідомлення «%s»: %s" - -#: ../libempathy-gtk/empathy-chat.c:1447 -#, c-format -msgid "Error sending message: %s" -msgstr "Помилка надсилання повідомлення: %s" - -#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760 +#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761 msgid "Topic:" msgstr "Тема:" -#: ../libempathy-gtk/empathy-chat.c:1520 +#: ../libempathy-gtk/empathy-chat.c:1611 #, c-format msgid "Topic set to: %s" msgstr "Тема: %s" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1613 msgid "No topic defined" msgstr "Тему не встановлено" -#: ../libempathy-gtk/empathy-chat.c:2031 +#: ../libempathy-gtk/empathy-chat.c:2126 msgid "(No Suggestions)" msgstr "(Нема пропозицій)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2099 +#: ../libempathy-gtk/empathy-chat.c:2194 #, c-format msgid "Add '%s' to Dictionary" msgstr "Додати «%s» до словника" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2136 +#: ../libempathy-gtk/empathy-chat.c:2231 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Додати «%s» до словника %s" -#: ../libempathy-gtk/empathy-chat.c:2206 +#: ../libempathy-gtk/empathy-chat.c:2301 msgid "Insert Smiley" msgstr "Вставити емоційку" #. send button -#: ../libempathy-gtk/empathy-chat.c:2224 -#: ../libempathy-gtk/empathy-ui-utils.c:1756 +#: ../libempathy-gtk/empathy-chat.c:2319 +#: ../libempathy-gtk/empathy-ui-utils.c:1868 msgid "_Send" msgstr "_Надіслати" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2278 +#: ../libempathy-gtk/empathy-chat.c:2376 msgid "_Spelling Suggestions" msgstr "_Пропозиції з правопису" -#: ../libempathy-gtk/empathy-chat.c:2367 +#: ../libempathy-gtk/empathy-chat.c:2465 msgid "Failed to retrieve recent logs" msgstr "Не вдалось одержати останні журнали" -#: ../libempathy-gtk/empathy-chat.c:2504 +#: ../libempathy-gtk/empathy-chat.c:2602 #, c-format msgid "%s has disconnected" msgstr "%s від'єднано" @@ -1493,12 +1538,12 @@ msgstr "%s від'єднано" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2511 +#: ../libempathy-gtk/empathy-chat.c:2609 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s викинено користувачем %2$s" -#: ../libempathy-gtk/empathy-chat.c:2514 +#: ../libempathy-gtk/empathy-chat.c:2612 #, c-format msgid "%s was kicked" msgstr "%s викинено" @@ -1506,17 +1551,17 @@ msgstr "%s викинено" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2522 +#: ../libempathy-gtk/empathy-chat.c:2620 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s заблоковано користувачем %2$s" -#: ../libempathy-gtk/empathy-chat.c:2525 +#: ../libempathy-gtk/empathy-chat.c:2623 #, c-format msgid "%s was banned" msgstr "%s заблоковано" -#: ../libempathy-gtk/empathy-chat.c:2529 +#: ../libempathy-gtk/empathy-chat.c:2627 #, c-format msgid "%s has left the room" msgstr "%s покинув кімнату" @@ -1526,103 +1571,106 @@ msgstr "%s покинув кімнату" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2538 +#: ../libempathy-gtk/empathy-chat.c:2636 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2563 +#: ../libempathy-gtk/empathy-chat.c:2661 #, c-format msgid "%s has joined the room" msgstr "%s приєднався до бесіди" -#: ../libempathy-gtk/empathy-chat.c:2588 +#: ../libempathy-gtk/empathy-chat.c:2686 #, c-format msgid "%s is now known as %s" msgstr "%s тепер відомий як %s" -#: ../libempathy-gtk/empathy-chat.c:2727 -#: ../src/empathy-streamed-media-window.c:1894 -#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1657 +#. 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:2847 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "Від'єднаний" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3374 +#: ../libempathy-gtk/empathy-chat.c:3493 msgid "Would you like to store this password?" msgstr "Зберегти цей пароль?" -#: ../libempathy-gtk/empathy-chat.c:3380 +#: ../libempathy-gtk/empathy-chat.c:3499 msgid "Remember" msgstr "Запам'ятати" -#: ../libempathy-gtk/empathy-chat.c:3390 +#: ../libempathy-gtk/empathy-chat.c:3509 msgid "Not now" msgstr "Не зараз" -#: ../libempathy-gtk/empathy-chat.c:3434 +#: ../libempathy-gtk/empathy-chat.c:3553 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Повторити" -#: ../libempathy-gtk/empathy-chat.c:3438 +#: ../libempathy-gtk/empathy-chat.c:3557 msgid "Wrong password; please try again:" msgstr "Неправильний пароль; введіть пароль ще раз:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3568 +#: ../libempathy-gtk/empathy-chat.c:3687 msgid "This room is protected by a password:" msgstr "Цю кімнату захищено паролем:" -#: ../libempathy-gtk/empathy-chat.c:3595 +#: ../libempathy-gtk/empathy-chat.c:3714 msgid "Join" msgstr "Увійти" -#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262 -#: ../src/empathy-call-window.c:1905 +#: ../libempathy-gtk/empathy-chat.c:3902 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "З'єднаний" -#: ../libempathy-gtk/empathy-chat.c:3852 +#: ../libempathy-gtk/empathy-chat.c:3957 msgid "Conversation" msgstr "Розмова" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3857 +#: ../libempathy-gtk/empathy-chat.c:3962 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "Невідомий або помилковий ідентифікатор" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "Блокування контакту тимчасово недоступно " -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "Блокування контакту недоступне" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "Відмовлено у доступі" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "Неможливо заблокувати контакт" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "Редагувати заблоковані контакти" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:521 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1495 -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1475 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" @@ -1632,57 +1680,64 @@ msgstr "Обліковий запис:" msgid "Blocked Contacts" msgstr "Заблоковані контакти" +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 +#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-chatrooms-window.ui.h:3 +msgid "Remove" +msgstr "Вилучити" + #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:320 -#: ../libempathy-gtk/empathy-theme-adium.c:1417 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 +#: ../libempathy-gtk/empathy-webkit-utils.c:277 msgid "_Copy Link Address" msgstr "_Копіювати адресу посилання" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:327 -#: ../libempathy-gtk/empathy-theme-adium.c:1424 +#: ../libempathy-gtk/empathy-chat-text-view.c:329 +#: ../libempathy-gtk/empathy-webkit-utils.c:284 msgid "_Open Link" msgstr "_Відкрити посилання" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:417 msgid "%A %B %d %Y" msgstr "%A %B %d %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:299 +#: ../libempathy-gtk/empathy-contact-dialogs.c:287 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 msgid "Edit Contact Information" msgstr "Редагувати інформацію про контакт" -#: ../libempathy-gtk/empathy-contact-dialogs.c:350 +#: ../libempathy-gtk/empathy-contact-dialogs.c:338 msgid "Personal Information" msgstr "Особиста інформація" -#: ../libempathy-gtk/empathy-contact-dialogs.c:459 +#: ../libempathy-gtk/empathy-contact-dialogs.c:439 #: ../libempathy-gtk/empathy-individual-dialogs.c:119 msgid "New Contact" msgstr "Новий контакт" -#: ../libempathy-gtk/empathy-contact-dialogs.c:533 -#: ../libempathy-gtk/empathy-individual-dialogs.c:200 +#: ../libempathy-gtk/empathy-contact-dialogs.c:508 +#: ../libempathy-gtk/empathy-individual-dialogs.c:198 #, c-format msgid "Block %s?" msgstr "Заблокувати %s?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:538 -#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#: ../libempathy-gtk/empathy-contact-dialogs.c:513 +#: ../libempathy-gtk/empathy-individual-dialogs.c:253 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "Блокувати «%s» з контактів знову?" -#: ../libempathy-gtk/empathy-contact-dialogs.c:543 -#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +#: ../libempathy-gtk/empathy-contact-dialogs.c:518 +#: ../libempathy-gtk/empathy-individual-dialogs.c:275 msgid "_Block" msgstr "За_блокувати" -#: ../libempathy-gtk/empathy-contact-dialogs.c:559 -#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +#: ../libempathy-gtk/empathy-contact-dialogs.c:536 +#: ../libempathy-gtk/empathy-individual-dialogs.c:284 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Звинуватити цей контакт в образі" @@ -1701,333 +1756,323 @@ msgstr "Запит на підписку" msgid "_Block User" msgstr "За_блокувати користувача" -#: ../libempathy-gtk/empathy-contact-list-store.h:71 -msgid "Ungrouped" -msgstr "Без групи" - -#: ../libempathy-gtk/empathy-contact-list-store.h:72 -msgid "Favorite People" -msgstr "Улюблені люди" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1983 -#: ../libempathy-gtk/empathy-individual-view.c:2375 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "Вилучити групу «%s»?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1985 -#: ../libempathy-gtk/empathy-individual-view.c:2378 -msgid "Removing group" -msgstr "Вилучення групи" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:2034 -#: ../libempathy-gtk/empathy-contact-list-view.c:2111 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 -msgid "_Remove" -msgstr "В_илучити" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2064 -#: ../libempathy-gtk/empathy-individual-view.c:2500 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "Вилучити контакт «%s» з вашого списку?" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2066 -#: ../libempathy-gtk/empathy-individual-view.c:2521 -msgid "Removing contact" -msgstr "Вилучення контакту" - -#: ../libempathy-gtk/empathy-contact-menu.c:220 -#: ../src/empathy-main-window.ui.h:14 +#: ../libempathy-gtk/empathy-contact-menu.c:207 +#: ../libempathy-gtk/empathy-individual-menu.c:1559 +#: ../src/empathy-main-window-menubar.ui.h:14 msgid "_Add Contact…" msgstr "_Додати контакт…" -#: ../libempathy-gtk/empathy-contact-menu.c:300 +#: ../libempathy-gtk/empathy-contact-menu.c:282 msgid "_Block Contact" msgstr "За_блокувати контакт" -#: ../libempathy-gtk/empathy-contact-menu.c:329 -#: ../libempathy-gtk/empathy-individual-menu.c:548 -#: ../src/empathy-main-window.ui.h:16 +#. add chat button +#: ../libempathy-gtk/empathy-contact-menu.c:311 +#: ../libempathy-gtk/empathy-individual-menu.c:790 +#: ../libempathy-gtk/empathy-new-message-dialog.c:320 +#: ../src/empathy-main-window-menubar.ui.h:16 msgid "_Chat" msgstr "_Балачка" -#: ../libempathy-gtk/empathy-contact-menu.c:361 -#: ../libempathy-gtk/empathy-individual-menu.c:639 +#: ../libempathy-gtk/empathy-contact-menu.c:343 +#: ../libempathy-gtk/empathy-individual-menu.c:882 msgctxt "menu item" msgid "_Audio Call" msgstr "_Аудіовиклик" -#: ../libempathy-gtk/empathy-contact-menu.c:394 -#: ../libempathy-gtk/empathy-individual-menu.c:684 +#: ../libempathy-gtk/empathy-contact-menu.c:376 +#: ../libempathy-gtk/empathy-individual-menu.c:927 msgctxt "menu item" msgid "_Video Call" msgstr "_Відеовиклик" -#: ../libempathy-gtk/empathy-contact-menu.c:440 -#: ../libempathy-gtk/empathy-individual-menu.c:737 -#: ../src/empathy-main-window.ui.h:27 +#: ../libempathy-gtk/empathy-contact-menu.c:422 +#: ../libempathy-gtk/empathy-individual-menu.c:980 +#: ../src/empathy-main-window-menubar.ui.h:27 msgid "_Previous Conversations" msgstr "_Попередні бесіди" -#: ../libempathy-gtk/empathy-contact-menu.c:462 -#: ../libempathy-gtk/empathy-individual-menu.c:778 +#: ../libempathy-gtk/empathy-contact-menu.c:444 +#: ../libempathy-gtk/empathy-individual-menu.c:1021 msgid "Send File" msgstr "Надіслати файл" -#: ../libempathy-gtk/empathy-contact-menu.c:485 -#: ../libempathy-gtk/empathy-individual-menu.c:820 +#: ../libempathy-gtk/empathy-contact-menu.c:467 +#: ../libempathy-gtk/empathy-individual-menu.c:1063 msgid "Share My Desktop" msgstr "Оприлюднити мою стільницю" -#: ../libempathy-gtk/empathy-contact-menu.c:525 -#: ../libempathy-gtk/empathy-contact-widget.c:1890 -#: ../libempathy-gtk/empathy-individual-menu.c:855 -#: ../libempathy-gtk/empathy-individual-widget.c:1386 -msgid "Favorite" -msgstr "Улюблений" - -#: ../libempathy-gtk/empathy-contact-menu.c:554 -#: ../libempathy-gtk/empathy-individual-menu.c:883 +#: ../libempathy-gtk/empathy-contact-menu.c:496 +#: ../libempathy-gtk/empathy-individual-menu.c:1126 msgid "Infor_mation" msgstr "Інфор_мація" -#: ../libempathy-gtk/empathy-contact-menu.c:600 +#: ../libempathy-gtk/empathy-contact-menu.c:536 msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "З_міни" -#: ../libempathy-gtk/empathy-contact-menu.c:654 -#: ../libempathy-gtk/empathy-individual-menu.c:1070 -#: ../src/empathy-chat-window.c:1010 +#: ../libempathy-gtk/empathy-contact-menu.c:590 +#: ../libempathy-gtk/empathy-individual-menu.c:1317 +#: ../src/empathy-chat-window.c:1011 msgid "Inviting you to this room" msgstr "Запрошення до цієї кімнати" -#: ../libempathy-gtk/empathy-contact-menu.c:685 -#: ../libempathy-gtk/empathy-individual-menu.c:1116 +#: ../libempathy-gtk/empathy-contact-menu.c:621 +#: ../libempathy-gtk/empathy-individual-menu.c:1363 msgid "_Invite to Chat Room" msgstr "_Запросити до кімнати" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:514 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 msgid "Search contacts" msgstr "Пошук контактів" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:544 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 msgid "Search: " msgstr "Пошук:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:602 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 msgid "_Add Contact" msgstr "_Додати контакт" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:620 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 msgid "No contacts found" msgstr "Не знайдено жодного контакту" -#: ../libempathy-gtk/empathy-contact-selector.c:129 -msgid "Select a contact" -msgstr "Вибрати контакт" - -#: ../libempathy-gtk/empathy-contact-widget.c:336 -#: ../libempathy-gtk/empathy-individual-widget.c:153 -msgid "Full name:" -msgstr "Повне ім'я:" - -#: ../libempathy-gtk/empathy-contact-widget.c:337 -#: ../libempathy-gtk/empathy-individual-widget.c:154 -msgid "Phone number:" -msgstr "Номер телефону:" - -#: ../libempathy-gtk/empathy-contact-widget.c:338 -#: ../libempathy-gtk/empathy-individual-widget.c:155 -msgid "E-mail address:" -msgstr "Адреса електронної пошти:" - -#: ../libempathy-gtk/empathy-contact-widget.c:339 -#: ../libempathy-gtk/empathy-individual-widget.c:156 -msgid "Website:" -msgstr "Сайт:" +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 +msgid "Your message introducing yourself:" +msgstr "Повідомлення, яке представляє вас: " -#: ../libempathy-gtk/empathy-contact-widget.c:340 -#: ../libempathy-gtk/empathy-individual-widget.c:157 -msgid "Birthday:" -msgstr "День народження:" +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 +msgid "Please let me see when you're online. Thanks!" +msgstr "Будь ласка, повідомте мене, коли ви буде в мережі. Дякую!" -#. Note to translators: this is the caption for a string of the form "5 -#. * minutes ago", and refers to the time since the contact last interacted -#. * with their IM client. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:346 -msgid "Last seen:" -msgstr "Востаннє помічений:" - -#: ../libempathy-gtk/empathy-contact-widget.c:348 -msgid "Connected from:" -msgstr "На зв'язку вже:" - -#. FIXME: once Idle implements SimplePresence using this information, we can -#. * and should bin this. -#. -#: ../libempathy-gtk/empathy-contact-widget.c:353 -msgid "Away message:" -msgstr "Повідомлення за відсутності:" - -#: ../libempathy-gtk/empathy-contact-widget.c:606 +#: ../libempathy-gtk/empathy-contact-widget.c:571 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Канали:" -#: ../libempathy-gtk/empathy-contact-widget.c:901 -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "Код ISO країни:" -#: ../libempathy-gtk/empathy-contact-widget.c:903 -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Країна:" -#: ../libempathy-gtk/empathy-contact-widget.c:905 -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Регіон:" -#: ../libempathy-gtk/empathy-contact-widget.c:907 -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Місто:" -#: ../libempathy-gtk/empathy-contact-widget.c:909 -#: ../libempathy-gtk/empathy-individual-widget.c:503 +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Район:" -#: ../libempathy-gtk/empathy-contact-widget.c:911 -#: ../libempathy-gtk/empathy-individual-widget.c:505 +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Поштовий індекс:" -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:507 +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Вулиця:" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:509 +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Дім:" -#: ../libempathy-gtk/empathy-contact-widget.c:917 -#: ../libempathy-gtk/empathy-individual-widget.c:511 +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Квартира:" -#: ../libempathy-gtk/empathy-contact-widget.c:919 -#: ../libempathy-gtk/empathy-individual-widget.c:513 +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Кімната:" -#: ../libempathy-gtk/empathy-contact-widget.c:921 -#: ../libempathy-gtk/empathy-individual-widget.c:515 +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Текст:" -#: ../libempathy-gtk/empathy-contact-widget.c:923 -#: ../libempathy-gtk/empathy-individual-widget.c:517 +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Опис:" -#: ../libempathy-gtk/empathy-contact-widget.c:925 -#: ../libempathy-gtk/empathy-individual-widget.c:519 +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "Адреса (URI):" -#: ../libempathy-gtk/empathy-contact-widget.c:927 -#: ../libempathy-gtk/empathy-individual-widget.c:521 +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Рівень точності:" -#: ../libempathy-gtk/empathy-contact-widget.c:929 -#: ../libempathy-gtk/empathy-individual-widget.c:523 +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Помилка:" -#: ../libempathy-gtk/empathy-contact-widget.c:931 -#: ../libempathy-gtk/empathy-individual-widget.c:525 +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Вертикальна помилка (метри):" -#: ../libempathy-gtk/empathy-contact-widget.c:933 -#: ../libempathy-gtk/empathy-individual-widget.c:527 +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Горизонтальна помилка (метри):" -#: ../libempathy-gtk/empathy-contact-widget.c:935 -#: ../libempathy-gtk/empathy-individual-widget.c:529 +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Швидкість:" -#: ../libempathy-gtk/empathy-contact-widget.c:937 -#: ../libempathy-gtk/empathy-individual-widget.c:531 +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Азимут:" -#: ../libempathy-gtk/empathy-contact-widget.c:939 -#: ../libempathy-gtk/empathy-individual-widget.c:533 +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Швидкість підйому:" -#: ../libempathy-gtk/empathy-contact-widget.c:941 -#: ../libempathy-gtk/empathy-individual-widget.c:535 +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Останнє оновлення о:" -#: ../libempathy-gtk/empathy-contact-widget.c:943 -#: ../libempathy-gtk/empathy-individual-widget.c:537 +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Довгота:" -#: ../libempathy-gtk/empathy-contact-widget.c:945 -#: ../libempathy-gtk/empathy-individual-widget.c:539 +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Широта:" -#: ../libempathy-gtk/empathy-contact-widget.c:947 -#: ../libempathy-gtk/empathy-individual-widget.c:541 -msgid "Altitude:" -msgstr "Висота:" +#: ../libempathy-gtk/empathy-contact-widget.c:797 +#: ../libempathy-gtk/empathy-individual-widget.c:501 +msgid "Altitude:" +msgstr "Висота:" + +#: ../libempathy-gtk/empathy-contact-widget.c:850 +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:15 +msgid "Location" +msgstr "Місцевість" + +#. translators: format is "Location, $date" +#: ../libempathy-gtk/empathy-contact-widget.c:867 +#: ../libempathy-gtk/empathy-individual-widget.c:610 +#, c-format +msgid "%s, %s" +msgstr "%s, %s" + +#: ../libempathy-gtk/empathy-contact-widget.c:919 +#: ../libempathy-gtk/empathy-individual-widget.c:659 +msgid "%B %e, %Y at %R UTC" +msgstr "%B %e, %Y у %R UTC" + +#: ../libempathy-gtk/empathy-contact-widget.c:1001 +#: ../libempathy-gtk/empathy-individual-widget.c:901 +msgid "Save Avatar" +msgstr "Зберегти аватар" + +#: ../libempathy-gtk/empathy-contact-widget.c:1057 +#: ../libempathy-gtk/empathy-individual-widget.c:959 +msgid "Unable to save avatar" +msgstr "Неможливо зберегти аватар" + +#: ../libempathy-gtk/empathy-contact-widget.c:1745 +#: ../libempathy-gtk/empathy-individual-menu.c:1098 +#: ../libempathy-gtk/empathy-individual-widget.c:1358 +msgid "Favorite" +msgstr "Улюблений" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +msgid "Full name" +msgstr "Повне ім'я" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "Номер телефону" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "Адреса електронної пошти" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +msgid "Website" +msgstr "Сайт" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +msgid "Birthday" +msgstr "День народження" + +#. Note to translators: this is the caption for a string of the form "5 +#. * minutes ago", and refers to the time since the contact last interacted +#. * with their IM client. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +msgid "Last seen:" +msgstr "Востаннє помічений:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +msgid "Connected from:" +msgstr "На зв'язку вже:" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +msgid "Away message:" +msgstr "Повідомлення за відсутності:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +msgid "work" +msgstr "робочий" -#: ../libempathy-gtk/empathy-contact-widget.c:1000 -#: ../libempathy-gtk/empathy-contact-widget.c:1015 -#: ../libempathy-gtk/empathy-individual-widget.c:629 -#: ../libempathy-gtk/empathy-individual-widget.c:644 -#: ../src/empathy-preferences.ui.h:16 -msgid "Location" -msgstr "Місцевість" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +msgid "home" +msgstr "домашній" -#. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:1017 -#: ../libempathy-gtk/empathy-individual-widget.c:646 -#, c-format -msgid "%s, %s" -msgstr "%s, %s" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +msgid "mobile" +msgstr "мобільний" -#: ../libempathy-gtk/empathy-contact-widget.c:1069 -#: ../libempathy-gtk/empathy-individual-widget.c:695 -msgid "%B %e, %Y at %R UTC" -msgstr "%B %e, %Y у %R UTC" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +msgid "voice" +msgstr "голосовий" -#: ../libempathy-gtk/empathy-contact-widget.c:1151 -#: ../libempathy-gtk/empathy-individual-widget.c:931 -msgid "Save Avatar" -msgstr "Зберегти аватар" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +msgid "preferred" +msgstr "переважний" -#: ../libempathy-gtk/empathy-contact-widget.c:1207 -#: ../libempathy-gtk/empathy-individual-widget.c:989 -msgid "Unable to save avatar" -msgstr "Неможливо зберегти аватар" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "поштовий" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +msgid "parcel" +msgstr "посилковий" #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 msgid "Location at (date)\t" @@ -2035,7 +2080,7 @@ msgstr "Місцевість у (дата)\t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1321 +#: ../libempathy-gtk/empathy-individual-widget.c:1294 msgid "Alias:" msgstr "Псевдонім:" @@ -2055,7 +2100,7 @@ msgstr "Подробиці про контакт" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1525 +#: ../libempathy-gtk/empathy-individual-widget.c:1503 msgid "Identifier:" msgstr "Ідентифікатор:" @@ -2094,18 +2139,18 @@ msgid "Select" msgstr "Вибрати" #: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1835 +#: ../src/empathy-main-window.c:1952 msgid "Group" msgstr "Група" -#: ../libempathy-gtk/empathy-individual-dialogs.c:257 +#: ../libempathy-gtk/empathy-individual-dialogs.c:258 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Такий ідентифікатор буде заблоковано:" msgstr[1] "Такі ідентифікатори буде заборонено:" msgstr[2] "Такі ідентифікатори буде заборонено:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:264 +#: ../libempathy-gtk/empathy-individual-dialogs.c:265 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Такий ідентифікатор неможливо заборонити:" @@ -2117,49 +2162,94 @@ msgstr[2] "Такі ідентифікатори неможливо заборо msgid "Linked Contacts" msgstr "Пов'язані контакти" -#: ../libempathy-gtk/empathy-individual-linker.c:370 +#: ../libempathy-gtk/empathy-individual-linker.c:372 msgid "Select contacts to link" msgstr "Вибрати контакт для посилання" -#: ../libempathy-gtk/empathy-individual-linker.c:444 +#: ../libempathy-gtk/empathy-individual-linker.c:447 msgid "New contact preview" msgstr "Перегляд нового контакту" -#: ../libempathy-gtk/empathy-individual-linker.c:488 +#: ../libempathy-gtk/empathy-individual-linker.c:491 msgid "Contacts selected in the list on the left will be linked together." msgstr "Контакти вибрані в списку зліва буде сполучено разом." #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:138 +#: ../libempathy-gtk/empathy-individual-menu.c:149 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:594 -#: ../libempathy-gtk/empathy-new-message-dialog.c:248 +#: ../libempathy-gtk/empathy-individual-menu.c:313 +msgid "Select account to use to place the call" +msgstr "Вибрати обліковий запис для місця виклику" + +#. translators: Call is a noun. This string is used in the window +#. * title +#: ../libempathy-gtk/empathy-individual-menu.c:317 +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:2 +msgid "Call" +msgstr "Виклик" + +#: ../libempathy-gtk/empathy-individual-menu.c:382 +msgid "Mobile" +msgstr "Мобільний" + +#: ../libempathy-gtk/empathy-individual-menu.c:384 +msgid "Work" +msgstr "Робота" + +#: ../libempathy-gtk/empathy-individual-menu.c:386 +msgid "HOME" +msgstr "Дім" + +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:837 +#: ../libempathy-gtk/empathy-new-message-dialog.c:314 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:931 +#: ../libempathy-gtk/empathy-individual-menu.c:1175 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Редагувати" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:957 +#: ../libempathy-gtk/empathy-individual-menu.c:1201 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "_Сполучити контакт…" -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-view.c:2355 msgid "Delete and _Block" msgstr "Вилучити і за_блокувати" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +#: ../libempathy-gtk/empathy-individual-view.c:2390 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Вилучити групу «%s»?" + +#: ../libempathy-gtk/empathy-individual-view.c:2393 +msgid "Removing group" +msgstr "Вилучення групи" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2448 +#: ../libempathy-gtk/empathy-individual-view.c:2665 +msgid "_Remove" +msgstr "В_илучити" + +#: ../libempathy-gtk/empathy-individual-view.c:2525 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Вилучити контакт «%s» з вашого списку?" + +#: ../libempathy-gtk/empathy-individual-view.c:2534 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2168,7 +2258,11 @@ msgstr "" "Вилучити сполучений контакт «%s»? Зауважте, це вилучить усі контакти, які " "складають список цього сполученого контакту." -#: ../libempathy-gtk/empathy-individual-widget.c:1672 +#: ../libempathy-gtk/empathy-individual-view.c:2546 +msgid "Removing contact" +msgstr "Вилучення контакту" + +#: ../libempathy-gtk/empathy-individual-widget.c:1642 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2252,128 +2346,137 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "_Роз'єднати" -#: ../libempathy-gtk/empathy-log-window.c:458 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "Історія" -#: ../libempathy-gtk/empathy-log-window.c:510 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "Показати" -#: ../libempathy-gtk/empathy-log-window.c:532 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "Пошук" -#: ../libempathy-gtk/empathy-log-window.c:946 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "Балачка в %s" -#: ../libempathy-gtk/empathy-log-window.c:948 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "Балачка з %s" -#: ../libempathy-gtk/empathy-log-window.c:998 -#: ../libempathy-gtk/empathy-log-window.c:1176 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e %B %Y, %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1118 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1124 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../libempathy-gtk/empathy-log-window.c:1195 -#: ../libempathy-gtk/empathy-log-window.c:1197 -#: ../src/empathy-ft-manager.c:1026 -msgid "%" -msgstr "%" +#: ../libempathy-gtk/empathy-log-window.c:1373 +#, c-format +msgid "%s second" +msgid_plural "%s seconds" +msgstr[0] "%s секунду" +msgstr[1] "%s секунди" +msgstr[2] "%s секунд" -#: ../libempathy-gtk/empathy-log-window.c:1204 +#: ../libempathy-gtk/empathy-log-window.c:1380 +#, c-format +msgid "%s minute" +msgid_plural "%s minutes" +msgstr[0] "%s хвилину" +msgstr[1] "%s хвилини" +msgstr[2] "%s хвилин" + +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "Виклик прийнято в %s, закінчено о %s" -#: ../libempathy-gtk/empathy-log-window.c:1536 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "Сьогодні" -#: ../libempathy-gtk/empathy-log-window.c:1540 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "Вчора" -#: ../libempathy-gtk/empathy-log-window.c:1556 -msgctxt "" -"A date such as '23 May 2010', %e is the day, %B the month and %Y the year" +#. Translators: A date such as '23 May 2010' (strftime format) +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%e %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1637 -#: ../libempathy-gtk/empathy-log-window.c:3203 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "Будь-коли" -#: ../libempathy-gtk/empathy-log-window.c:1717 -#: ../libempathy-gtk/empathy-log-window.c:2154 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "Будь-хто" -#: ../libempathy-gtk/empathy-log-window.c:2451 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "Хто" -#: ../libempathy-gtk/empathy-log-window.c:2655 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "Коли" -#: ../libempathy-gtk/empathy-log-window.c:2771 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "Будь-що" -#: ../libempathy-gtk/empathy-log-window.c:2773 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "Текстова балачка" -#: ../libempathy-gtk/empathy-log-window.c:2775 +#: ../libempathy-gtk/empathy-log-window.c:3044 #: ../src/empathy-preferences.ui.h:4 msgid "Calls" msgstr "Виклики" -#: ../libempathy-gtk/empathy-log-window.c:2780 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "Вхідні виклики" -#: ../libempathy-gtk/empathy-log-window.c:2781 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "Вихідні виклики" -#: ../libempathy-gtk/empathy-log-window.c:2782 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "Пропущені виклики" -#: ../libempathy-gtk/empathy-log-window.c:2804 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "Що" -#: ../libempathy-gtk/empathy-log-window.c:3506 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Вилучити всі журнали з попередньої розмови?" -#: ../libempathy-gtk/empathy-log-window.c:3510 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "Очистити все" -#: ../libempathy-gtk/empathy-log-window.c:3517 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "Вилучити з:" @@ -2381,14 +2484,6 @@ msgstr "Вилучити з:" msgid "Loading..." msgstr "Завантаження…" -#. translators: Call is a noun. This string is used in the window -#. * title -#: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1299 -#: ../src/empathy-call-window.ui.h:2 -msgid "Call" -msgstr "Виклик" - #: ../libempathy-gtk/empathy-log-window.ui.h:3 #: ../src/empathy-chat-window.ui.h:3 msgid "Chat" @@ -2403,13 +2498,14 @@ msgid "Profile" msgstr "Профіль" #: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-call-window.ui.h:21 +#: ../src/empathy-call-window.ui.h:22 #: ../src/empathy-streamed-media-window.ui.h:20 msgid "Video" msgstr "Відео" #: ../libempathy-gtk/empathy-log-window.ui.h:7 -#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20 +#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 +#: ../src/empathy-main-window-menubar.ui.h:20 msgid "_Edit" msgstr "З_міни" @@ -2421,36 +2517,82 @@ msgstr "_Файл" msgid "page 2" msgstr "сторінка 2" -#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 -msgid "Contact ID:" -msgstr "Ідентифікатор контакту:" +#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +msgid "The contact is offline" +msgstr "Контакт поза мережею" -#. add chat button -#: ../libempathy-gtk/empathy-new-message-dialog.c:258 -msgid "C_hat" -msgstr "_Балачка" +#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +msgid "The specified contact is either invalid or unknown" +msgstr "Вказаний контакт недійсний або невідомий" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +msgid "The contact does not support this kind of conversation" +msgstr "Контакт не підтримує такого роду розмову" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +msgid "The requested functionality is not implemented for this protocol" +msgstr "Потрібну функціональність не впроваджено для цього протоколу" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +msgid "Could not start a conversation with the given contact" +msgstr "Неможливо почати розмову із заданих контактом" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +msgid "You are banned from this channel" +msgstr "Ви заблоковані на цьому каналі" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +msgid "This channel is full" +msgstr "Цей канал переповнений" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +msgid "You must be invited to join this channel" +msgstr "Щоб приєднатись до цього каналу, потрібно бути запрошеним" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +msgid "Can't proceed while disconnected" +msgstr "Неможливо продовжувати протягом від'єднання" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +msgid "Permission denied" +msgstr "Відмовлено в доступі" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +msgid "There was an error starting the conversation" +msgstr "Помилка започаткування розмови" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:291 +#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +msgid "Enter a contact identifier or phone number:" +msgstr "Введіть ідентифікатор контакту або номер телефону:" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:277 +#: ../libempathy-gtk/empathy-new-message-dialog.c:334 msgid "New Conversation" msgstr "Нова розмова" -#. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:231 -msgid "Send _Video" -msgstr "Надіслати _відео" +#. add video button +#: ../libempathy-gtk/empathy-new-call-dialog.c:226 +msgid "_Video Call" +msgstr "_Відеовиклик" -#. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:242 -msgid "C_all" -msgstr "_Виклик" +#. add audio button +#: ../libempathy-gtk/empathy-new-call-dialog.c:236 +msgid "_Audio Call" +msgstr "_Аудіовиклик" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:252 +#: ../libempathy-gtk/empathy-new-call-dialog.c:246 msgid "New Call" -msgstr "Новий Виклик" +msgstr "Створити виклик" + +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "Не вдалось автентифікувати обліковий запис %s" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2487,12 +2629,8 @@ msgstr "Клацніть, щоб встановити стан «улюблен msgid "Set status" msgstr "Встановити стан" -#: ../libempathy-gtk/empathy-presence-chooser.c:943 -msgid "Set your presence and current status" -msgstr "Встановіть вашу присутність та поточний стан" - #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1131 +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 msgid "Custom messages…" msgstr "Власні повідомлення…" @@ -2506,24 +2644,24 @@ msgid "New %s account" msgstr "Новий обліковий запис %s" #: ../libempathy-gtk/empathy-search-bar.ui.h:1 -msgid "Find Next" -msgstr "Знайти наступне" +msgid "Find:" +msgstr "Знайти:" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -msgid "Find Previous" -msgstr "Знайти попереднє" +msgid "Mat_ch case" +msgstr "З _урахуванням регістру" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Find:" -msgstr "Знайти:" +msgid "Phrase not found" +msgstr "Фразу не знайдено" #: ../libempathy-gtk/empathy-search-bar.ui.h:4 -msgid "Match case" -msgstr "З урахуванням регістру" +msgid "_Next" +msgstr "_Далі" #: ../libempathy-gtk/empathy-search-bar.ui.h:5 -msgid "Phrase not found" -msgstr "Фразу не знайдено" +msgid "_Previous" +msgstr "_Назад" #: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" @@ -2569,34 +2707,28 @@ msgstr "Голосовий виклик закінчено" msgid "Edit Custom Messages" msgstr "Редагувати власні повідомлення" -#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:5 -#: ../src/empathy-chatrooms-window.ui.h:3 -msgid "Remove" -msgstr "Вилучити" - -#: ../libempathy-gtk/empathy-theme-adium.c:1121 +#: ../libempathy-gtk/empathy-theme-adium.c:1047 #, c-format msgid "Message edited at %s" msgstr "Повідомлення змінено в %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1943 +#: ../libempathy-gtk/empathy-theme-adium.c:1752 msgid "Normal" msgstr "Звичайна" -#: ../libempathy-gtk/empathy-theme-manager.c:75 +#: ../libempathy-gtk/empathy-theme-manager.c:70 msgid "Classic" msgstr "Класична" -#: ../libempathy-gtk/empathy-theme-manager.c:76 +#: ../libempathy-gtk/empathy-theme-manager.c:71 msgid "Simple" msgstr "Проста" -#: ../libempathy-gtk/empathy-theme-manager.c:77 +#: ../libempathy-gtk/empathy-theme-manager.c:72 msgid "Clean" msgstr "Ясна" -#: ../libempathy-gtk/empathy-theme-manager.c:78 +#: ../libempathy-gtk/empathy-theme-manager.c:73 msgid "Blue" msgstr "Блакитна" @@ -2671,19 +2803,19 @@ msgstr "Запам'ятати вибір для подальших з'єднан msgid "Certificate Details" msgstr "Подробиці про сертифікат" -#: ../libempathy-gtk/empathy-ui-utils.c:1653 +#: ../libempathy-gtk/empathy-ui-utils.c:1742 msgid "Unable to open URI" msgstr "Неможливо відкрити URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1748 +#: ../libempathy-gtk/empathy-ui-utils.c:1860 msgid "Select a file" msgstr "Вибрати файл" -#: ../libempathy-gtk/empathy-ui-utils.c:1820 +#: ../libempathy-gtk/empathy-ui-utils.c:1935 msgid "Insufficient free space to save file" msgstr "Недостатньо вільного місця для збереження файла" -#: ../libempathy-gtk/empathy-ui-utils.c:1828 +#: ../libempathy-gtk/empathy-ui-utils.c:1943 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2692,7 +2824,7 @@ msgstr "" "Потрібно %s вільного місця для збереження цього файла, проте доступно лише " "%s. Будь ласка, виберіть інакше місце." -#: ../libempathy-gtk/empathy-ui-utils.c:1872 +#: ../libempathy-gtk/empathy-ui-utils.c:1987 #, c-format msgid "Incoming file from %s" msgstr "Вхідний файл з %s" @@ -2864,39 +2996,31 @@ msgstr "Західна" msgid "Vietnamese" msgstr "В'єтнамська" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 -msgid "The selected contact cannot receive files." -msgstr "Вибраний контакт не може одержувати файли." - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 -msgid "The selected contact is offline." -msgstr "Вибраний контакт поза мережею" - -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "Немає повідомлення про помилку" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "Миттєві повідомлення (Empathy)" -#: ../src/empathy.c:309 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "Не з'єднуватися під час запуску" -#: ../src/empathy.c:313 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Не показувати список контактів чи інші вікна під час запуску" -#: ../src/empathy.c:321 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "— клієнт обміну миттєвими повідомленнями Empathy" -#: ../src/empathy.c:500 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "Помилка менеджера облікових записів" -#: ../src/empathy.c:502 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -2916,10 +3040,10 @@ msgid "" "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" -"Empathy — вільна програма, ви можете розповсюджувати та/або змінювати її " -"на умовах Універсальної Публічної Ліцензії GNU, що опублікована Фондом " -"вільних програмних засобів, або версії 2 Ліцензії, або (на ваш " -"розсуд) будь-якої старшої версії." +"Empathy — вільна програма, ви можете розповсюджувати та/або змінювати її на " +"умовах Універсальної Публічної Ліцензії GNU, що опублікована Фондом вільних " +"програмних засобів, або версії 2 Ліцензії, або (на ваш розсуд) будь-якої " +"старшої версії." #: ../src/empathy-about-dialog.c:85 msgid "" @@ -2942,11 +3066,11 @@ msgstr "" "якщо це не так, напишіть до Free Software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "Програма швидкого обміну повідомленнями для GNOME" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Сергій Довгополов \n" @@ -2985,7 +3109,7 @@ msgstr "" "«Зміни»." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1272 msgid "An error occurred" msgstr "Виникла помилка" @@ -3029,37 +3153,37 @@ msgstr "" msgid "Do you have an account you've been using with another chat program?" msgstr "У вас є обліковий запис, який ви використовувати з іншою програмою?" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:653 msgid "Yes, import my account details from " msgstr "Так, імпортувати параметри облікового запису з " -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:674 msgid "Yes, I'll enter my account details now" msgstr "Так, я введу параметри облікового запису вручну" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:696 msgid "No, I want a new account" msgstr "Ні, я бажаю створити новий обліковий запис" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:706 msgid "No, I just want to see people online nearby for now" msgstr "Ні, я просто бажаю бачити людей, які у мережі й поблизу" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:727 msgid "Select the accounts you want to import:" msgstr "Виберіть обліковий запис для імпортування:" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-account-assistant.c:814 +#: ../src/empathy-new-chatroom-dialog.c:625 +#: ../src/empathy-new-chatroom-dialog.c:626 msgid "Yes" msgstr "Так" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:821 msgid "No, that's all for now" msgstr "Ні, наразі досить" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1086 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 " @@ -3071,16 +3195,16 @@ msgstr "" "інформація є коректною. Ви можете змінити цю інформацію пізніше або вимкнути " "цю можливість, використовуючи вікно «Облікові записи»." -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1092 +#: ../src/empathy-account-assistant.c:1148 msgid "Edit->Accounts" msgstr "Зміни->Облікові записи" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1108 msgid "I do _not want to enable this feature for now" msgstr "Ні, я _не бажаю зараз вмикати цю функцію" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1144 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3092,23 +3216,23 @@ msgstr "" "встановіть пакет telepathy-salut та створіть обліковий запис «Люди поблизу» " "у вікні «Облікові записи»" -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1150 msgid "telepathy-salut not installed" msgstr "Не встановлено telepathy-salut" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1196 msgid "Messaging and VoIP Accounts Assistant" msgstr "Листування та облікові записи VoIP" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1230 msgid "Welcome to Empathy" msgstr "Ласкаво просило до Empathy" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1239 msgid "Import your existing accounts" msgstr "Імпортувати наявні облікові записи" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1257 msgid "Please enter personal details" msgstr "Введіть персональну інформацію" @@ -3126,7 +3250,8 @@ msgid "Your new account has not been saved yet." msgstr "Новий обліковий запис ще не збережено." #: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:649 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "З'єднання…" @@ -3215,18 +3340,18 @@ msgid "" "To add a new account, you first have to install a backend for each protocol " "you want to use." msgstr "" -"Щоб додати новий обліковий запис, встановіть підтримування кожного потрібного " -"протоколу." +"Щоб додати новий обліковий запис, встановіть підтримування кожного " +"потрібного протоколу." #: ../src/empathy-accounts-dialog.ui.h:7 msgid "_Import…" msgstr "_Імпортувати…" -#: ../src/empathy-auth-client.c:249 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr " — клієнт автентифікації Empathy" -#: ../src/empathy-auth-client.c:265 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Клієнт аутентифікація Empathy" @@ -3234,136 +3359,122 @@ msgstr "Клієнт аутентифікація Empathy" msgid "People nearby" msgstr "Люди поблизу" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:124 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:193 msgid "- Empathy Audio/Video Client" msgstr "— аудіо- та відеоклієнт Empathy" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:145 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:218 msgid "Empathy Audio/Video Client" msgstr "Аудіо- та відеоклієнт Empathy" -#: ../src/empathy-streamed-media-window.c:431 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "Контраст" -#: ../src/empathy-streamed-media-window.c:434 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "Яскравість" -#: ../src/empathy-streamed-media-window.c:437 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Гамма" -#: ../src/empathy-streamed-media-window.c:542 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "Гучність" -#: ../src/empathy-streamed-media-window.c:1110 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "_Бічна панель" -#: ../src/empathy-streamed-media-window.c:1130 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "Звуковий вхід" -#: ../src/empathy-streamed-media-window.c:1134 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "Відеовхід" -#: ../src/empathy-streamed-media-window.c:1140 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "Панель набору" -#: ../src/empathy-streamed-media-window.c:1151 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "Подробиці" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1220 -#: ../src/empathy-call-window.c:998 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format msgid "Call with %s" msgstr "Виклик з %s" -#: ../src/empathy-streamed-media-window.c:1453 -#: ../src/empathy-call-window.c:1242 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 msgid "The IP address as seen by the machine" msgstr "Адреса IP, яку показано на машині" -#: ../src/empathy-streamed-media-window.c:1455 -#: ../src/empathy-call-window.c:1244 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 msgid "The IP address as seen by a server on the Internet" msgstr "Адреса IP, яку показано на сервері через інтернет" -#: ../src/empathy-streamed-media-window.c:1457 -#: ../src/empathy-call-window.c:1246 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 msgid "The IP address of the peer as seen by the other side" msgstr "Адреса IP вузла, яку показано по ту сторону" -#: ../src/empathy-streamed-media-window.c:1459 -#: ../src/empathy-call-window.c:1248 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 msgid "The IP address of a relay server" msgstr "Адреса IP сервера ретрансляції" -#: ../src/empathy-streamed-media-window.c:1461 -#: ../src/empathy-call-window.c:1250 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 msgid "The IP address of the multicast group" msgstr "Адреса IP групової трансляції" -#: ../src/empathy-streamed-media-window.c:1843 -msgctxt "encoding video codec" -msgid "Unknown" -msgstr "Невідомо" - -#: ../src/empathy-streamed-media-window.c:1846 -msgctxt "encoding audio codec" -msgid "Unknown" -msgstr "Невідомо" - -#: ../src/empathy-streamed-media-window.c:1849 -msgctxt "decoding video codec" -msgid "Unknown" -msgstr "Невідомо" - -#: ../src/empathy-streamed-media-window.c:1852 -msgctxt "decoding audio codec" +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 +msgctxt "codec" msgid "Unknown" msgstr "Невідомо" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2144 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "З'єднання — %d:%02dm " -#: ../src/empathy-streamed-media-window.c:2205 -#: ../src/empathy-call-window.c:1967 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 msgid "Technical Details" msgstr "Технічні подробиці" -#: ../src/empathy-streamed-media-window.c:2243 -#: ../src/empathy-call-window.c:2005 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " "computer" msgstr "" -"Програма %s не розпізнає аудіоформати, що підтримуються вашим " -"комп'ютером" +"Програма %s не розпізнає аудіоформати, що підтримуються вашим комп'ютером" -#: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:2010 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " "computer" msgstr "" -"Програма %s не розпізнає відеоформати, що підтримуються вашим " -"комп'ютером" +"Програма %s не розпізнає відеоформати, що підтримуються вашим комп'ютером" -#: ../src/empathy-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:2016 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3372,29 +3483,29 @@ msgstr "" "Не вдалось встановити з'єднання з %s. Один з вас може знаходитися у мережі, " "яка не підтримує прямі з'єднання." -#: ../src/empathy-streamed-media-window.c:2260 -#: ../src/empathy-call-window.c:2022 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 msgid "There was a failure on the network" msgstr "Помилка мережі" -#: ../src/empathy-streamed-media-window.c:2264 -#: ../src/empathy-call-window.c:2026 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "Аудіоформати, що потрібні для цього виклику, не встановлено на вашому " "комп'ютері" -#: ../src/empathy-streamed-media-window.c:2267 -#: ../src/empathy-call-window.c:2029 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Відеоформати, що потрібні для цього виклику, не встановлено на вашому " "комп'ютері" -#: ../src/empathy-streamed-media-window.c:2277 -#: ../src/empathy-call-window.c:2041 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please та прикріпіть журнали, зібрані з вікна зневадження у меню " "«Довідка»." -#: ../src/empathy-streamed-media-window.c:2285 -#: ../src/empathy-call-window.c:2050 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 msgid "There was a failure in the call engine" msgstr "Помилка у рушії виклику" -#: ../src/empathy-streamed-media-window.c:2288 -#: ../src/empathy-call-window.c:2053 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 msgid "The end of the stream was reached" msgstr "Досягнуто кінця потоку" -#: ../src/empathy-streamed-media-window.c:2328 -#: ../src/empathy-call-window.c:2093 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 msgid "Can't establish audio stream" msgstr "Не вдалось встановити аудіопотік" -#: ../src/empathy-streamed-media-window.c:2338 -#: ../src/empathy-call-window.c:2103 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 msgid "Can't establish video stream" msgstr "Не вдалось встановити відеопотік" @@ -3498,36 +3609,68 @@ msgid "Start an audio call" msgstr "Зробити аудіовиклик" #: ../src/empathy-call-window.ui.h:18 +msgid "Swap camera" +msgstr "Замінити камеру" + +#: ../src/empathy-call-window.ui.h:19 #: ../src/empathy-streamed-media-window.ui.h:17 msgid "Toggle audio transmission" msgstr "Перемкнути передавання звуку" -#: ../src/empathy-call-window.ui.h:19 +#: ../src/empathy-call-window.ui.h:20 msgid "Toggle video transmission" msgstr "Перемкнути передавання відео" -#: ../src/empathy-call-window.ui.h:20 +#: ../src/empathy-call-window.ui.h:21 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:1612 ../src/empathy-call-window.c:1613 -#: ../src/empathy-call-window.c:1614 ../src/empathy-call-window.c:1615 +#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 msgid "Unknown" msgstr "Невідомо" -#: ../src/empathy-call-window.ui.h:22 +#: ../src/empathy-call-window.ui.h:23 msgid "Video call" msgstr "Відеовиклик" -#: ../src/empathy-call-window.ui.h:23 +#: ../src/empathy-call-window.ui.h:24 #: ../src/empathy-streamed-media-window.ui.h:24 msgid "_Call" msgstr "_Виклик" -#: ../src/empathy-call-window.ui.h:24 ../src/empathy-main-window.ui.h:30 +#: ../src/empathy-call-window.ui.h:25 +msgid "_Camera" +msgstr "_Камера" + +#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-main-window-menubar.ui.h:18 +msgid "_Contents" +msgstr "_Зміст" + +#: ../src/empathy-call-window.ui.h:27 +#: ../src/empathy-main-window-menubar.ui.h:19 +msgid "_Debug" +msgstr "Зневад_ження" + +#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 +#: ../src/empathy-main-window-menubar.ui.h:22 +msgid "_Help" +msgstr "_Довідка" + +#: ../src/empathy-call-window.ui.h:30 +msgid "_Microphone" +msgstr "_Мікрофон" + +#: ../src/empathy-call-window.ui.h:31 +msgid "_Settings" +msgstr "_Параметри" + +#: ../src/empathy-call-window.ui.h:32 +#: ../src/empathy-main-window-menubar.ui.h:30 #: ../src/empathy-streamed-media-window.ui.h:25 msgid "_View" msgstr "П_ерегляд" -#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500 +#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -3535,7 +3678,7 @@ msgstr[0] "%s (%d непрочитане)" msgstr[1] "%s (%d непрочитаних)" msgstr[2] "%s (%d непрочитані)" -#: ../src/empathy-chat-window.c:492 +#: ../src/empathy-chat-window.c:493 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -3543,7 +3686,7 @@ msgstr[0] "%s (та %u інше)" msgstr[1] "%s (та %u інших)" msgstr[2] "%s (та %u інших)" -#: ../src/empathy-chat-window.c:508 +#: ../src/empathy-chat-window.c:509 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -3551,7 +3694,7 @@ msgstr[0] "%s (%d непрочитане від інших)" msgstr[1] "%s (%d непрочитаних від інших)" msgstr[2] "%s (%d непрочитаний від інших)" -#: ../src/empathy-chat-window.c:517 +#: ../src/empathy-chat-window.c:518 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -3559,11 +3702,11 @@ msgstr[0] "%s (%d непрочитане від усіх)" msgstr[1] "%s (%d непрочитаних від усіх)" msgstr[2] "%s (%d непрочитаний від усіх)" -#: ../src/empathy-chat-window.c:732 +#: ../src/empathy-chat-window.c:733 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:742 +#: ../src/empathy-chat-window.c:743 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3571,7 +3714,7 @@ msgstr[0] "Надсилання %d повідомлення" msgstr[1] "Надсилання %d повідомлень" msgstr[2] "Надсилання %d повідомлень" -#: ../src/empathy-chat-window.c:764 +#: ../src/empathy-chat-window.c:765 msgid "Typing a message." msgstr "Набирає повідомлення." @@ -3603,10 +3746,6 @@ msgstr "Перемістити вкладку _праворуч" msgid "Notify for All Messages" msgstr "Сповіщати про всі повідомлення" -#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18 -msgid "_Contents" -msgstr "_Зміст" - #: ../src/empathy-chat-window.ui.h:10 msgid "_Conversation" msgstr "_Розмова" @@ -3619,10 +3758,6 @@ msgstr "_Відокремити вкладку" msgid "_Favorite Chat Room" msgstr "_Улюблена кімната" -#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22 -msgid "_Help" -msgstr "_Довідка" - #: ../src/empathy-chat-window.ui.h:15 msgid "_Next Tab" msgstr "_Наступна закладка" @@ -3659,95 +3794,96 @@ msgstr "Автоматичне з'єднання" msgid "Manage Favorite Rooms" msgstr "Керування улюбленими кімнатами" -#: ../src/empathy-event-manager.c:522 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "Вхідний відеовиклик" -#: ../src/empathy-event-manager.c:522 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "Вхідний виклик" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "Відеовиклик від %s, відповісти?" -#: ../src/empathy-event-manager.c:527 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "Виклик від %s, відповісти?" -#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731 -#: ../src/empathy-event-manager.c:764 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "Вхідний виклик від %s" -#: ../src/empathy-event-manager.c:555 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "Від_хилити" -#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "_Відповісти" -#: ../src/empathy-event-manager.c:571 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "_Відповісти через відео" -#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" msgstr "Вхідний відеовиклик від %s" -#: ../src/empathy-event-manager.c:837 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "Кімната запрошення" -#: ../src/empathy-event-manager.c:839 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "Запрошення приєднатись до %s" -#: ../src/empathy-event-manager.c:846 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s запрошує вас увійти у %s" -#: ../src/empathy-event-manager.c:854 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "Від_хилити" -#: ../src/empathy-event-manager.c:859 +#: ../src/empathy-event-manager.c:860 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Увійти" -#: ../src/empathy-event-manager.c:886 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s запросив вас увійти у %s" -#: ../src/empathy-event-manager.c:892 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "Вас запрошено приєднатись до %s" -#: ../src/empathy-event-manager.c:943 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "Вхідне передавання файла від %s" -#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:377 msgid "Password required" msgstr "Потрібно пароль" -#: ../src/empathy-event-manager.c:1191 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s потребує дозволу, щоб знати, коли ви в мережі" -#: ../src/empathy-event-manager.c:1195 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3757,101 +3893,105 @@ msgstr "" "Повідомлення: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Невідомо" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s з %s у %s/с" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s з %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Одержується «%s» від %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Надсилається «%s» до %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Помилка одержання «%s» від %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Помилка одержання файла" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Помилка надсилання «%s» до %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Помилка надсилання файла" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "«%s» одержано від %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "«%s» надіслано до %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "Передавання файла завершено" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "Очікування на відповідь від іншого учасника" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Перевіряння цілісності \"%s\"" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Хешування «%s»" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1025 +msgid "%" +msgstr "%" + +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "Файл" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "Залишилось" @@ -3868,8 +4008,8 @@ msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." msgstr "" -"Не знайдено облікових записів для імпортування. Empathy на цей момент підтримує " -"імпортування контактів лише з Pidgin." +"Не знайдено облікових записів для імпортування. Empathy на цей момент " +"підтримує імпортування контактів лише з Pidgin." #: ../src/empathy-import-dialog.c:199 msgid "Import Accounts" @@ -3888,161 +4028,165 @@ msgstr "Протокол:" msgid "Source" msgstr "Джерело" -#: ../src/empathy-main-window.c:392 +#: ../src/empathy-main-window.c:394 msgid "Provide Password" msgstr "Вкажіть пароль" -#: ../src/empathy-main-window.c:398 +#: ../src/empathy-main-window.c:400 msgid "Disconnect" msgstr "Від'єднати" -#: ../src/empathy-main-window.c:622 +#: ../src/empathy-main-window.c:637 msgid "No match found" msgstr "Збігів не знайдено" -#: ../src/empathy-main-window.c:777 +#: ../src/empathy-main-window.c:745 +#, c-format +msgid "Sorry, %s accounts can’t be used until your %s software is updated." +msgstr "" +"Вибачте, обліковий запис %s неможливо використовувати, поки програму %s не буде " +"оновлено." + +#: ../src/empathy-main-window.c:813 +msgid "Update software..." +msgstr "Оновити програму…" + +#: ../src/empathy-main-window.c:819 ../src/empathy-main-window.c:940 +msgid "Close" +msgstr "Закрити" + +#: ../src/empathy-main-window.c:928 msgid "Reconnect" msgstr "Перез'єднати" -#: ../src/empathy-main-window.c:783 +#: ../src/empathy-main-window.c:934 msgid "Edit Account" msgstr "Редагування облікового запису" -#: ../src/empathy-main-window.c:789 -msgid "Close" -msgstr "Закрити" - #. Translators: this string will be something like: #. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:928 +#: ../src/empathy-main-window.c:1073 #, c-format msgid "Top up %s (%s)..." msgstr "Поповнити %s (%s)…" -#: ../src/empathy-main-window.c:975 +#: ../src/empathy-main-window.c:1120 msgid "Top up account credit" msgstr "Поповнити рахунок" #. top up button -#: ../src/empathy-main-window.c:1050 +#: ../src/empathy-main-window.c:1191 msgid "Top Up..." msgstr "Поповнити…" -#: ../src/empathy-main-window.c:1817 +#: ../src/empathy-main-window.c:1934 msgid "Contact" msgstr "Контакт" -#: ../src/empathy-main-window.c:2169 +#: ../src/empathy-main-window.c:2309 msgid "Contact List" msgstr "Список контактів" -#: ../src/empathy-main-window.c:2287 -msgid "Show and edit accounts" -msgstr "Показати та редагувати облікові записи" - -#: ../src/empathy-main-window.ui.h:1 +#: ../src/empathy-main-window-menubar.ui.h:1 msgid "Contacts on a _Map" msgstr "Контакти на _карті" -#: ../src/empathy-main-window.ui.h:2 +#: ../src/empathy-main-window-menubar.ui.h:2 msgid "Credit Balance" msgstr "Залишок" -#: ../src/empathy-main-window.ui.h:3 +#: ../src/empathy-main-window-menubar.ui.h:3 msgid "Find in Contact _List" msgstr "Знайти у _списку контактів" -#: ../src/empathy-main-window.ui.h:4 +#: ../src/empathy-main-window-menubar.ui.h:4 msgid "Join _Favorites" msgstr "Залучити _улюблених" -#: ../src/empathy-main-window.ui.h:5 +#: ../src/empathy-main-window-menubar.ui.h:5 msgid "Manage Favorites" msgstr "Налаштувати _улюблених" -#: ../src/empathy-main-window.ui.h:6 +#: ../src/empathy-main-window-menubar.ui.h:6 msgid "N_ormal Size" msgstr "З_вичайний розмір" -#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1 +#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 msgid "New _Call…" msgstr "Новий _виклик…" -#: ../src/empathy-main-window.ui.h:8 +#: ../src/empathy-main-window-menubar.ui.h:8 msgid "Normal Size With _Avatars" msgstr "Звичайний розмір _аватарів" -#: ../src/empathy-main-window.ui.h:9 +#: ../src/empathy-main-window-menubar.ui.h:9 msgid "P_references" msgstr "_Параметри" -#: ../src/empathy-main-window.ui.h:10 +#: ../src/empathy-main-window-menubar.ui.h:10 msgid "Show P_rotocols" msgstr "Показати _протокол:" -#: ../src/empathy-main-window.ui.h:11 +#: ../src/empathy-main-window-menubar.ui.h:11 msgid "Sort by _Name" msgstr "Впорядкувати за _псевдонімом" -#: ../src/empathy-main-window.ui.h:12 +#: ../src/empathy-main-window-menubar.ui.h:12 msgid "Sort by _Status" msgstr "Впорядкувати за с_таном" -#: ../src/empathy-main-window.ui.h:13 +#: ../src/empathy-main-window-menubar.ui.h:13 msgid "_Accounts" msgstr "_Облікові записи" -#: ../src/empathy-main-window.ui.h:15 +#: ../src/empathy-main-window-menubar.ui.h:15 msgid "_Blocked Contacts" msgstr "За_блоковані контакти" -#: ../src/empathy-main-window.ui.h:17 +#: ../src/empathy-main-window-menubar.ui.h:17 msgid "_Compact Size" msgstr "_Компактний розмір" -#: ../src/empathy-main-window.ui.h:19 -msgid "_Debug" -msgstr "Зневад_ження" - -#: ../src/empathy-main-window.ui.h:21 +#: ../src/empathy-main-window-menubar.ui.h:21 msgid "_File Transfers" msgstr "Передавання _файлів" -#: ../src/empathy-main-window.ui.h:23 +#: ../src/empathy-main-window-menubar.ui.h:23 msgid "_Join…" msgstr "_Увійти…" -#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3 +#: ../src/empathy-main-window-menubar.ui.h:24 +#: ../src/empathy-status-icon.ui.h:3 msgid "_New Conversation…" msgstr "_Нова розмова…" -#: ../src/empathy-main-window.ui.h:25 +#: ../src/empathy-main-window-menubar.ui.h:25 msgid "_Offline Contacts" msgstr "_Показувати відсутніх" -#: ../src/empathy-main-window.ui.h:26 +#: ../src/empathy-main-window-menubar.ui.h:26 msgid "_Personal Information" msgstr "_Особиста інформація" -#: ../src/empathy-main-window.ui.h:28 +#: ../src/empathy-main-window-menubar.ui.h:28 msgid "_Room" msgstr "_Кімната" -#: ../src/empathy-main-window.ui.h:29 +#: ../src/empathy-main-window-menubar.ui.h:29 msgid "_Search for Contacts…" msgstr "_Пошук для контактів…" -#: ../src/empathy-new-chatroom-dialog.c:337 +#: ../src/empathy-new-chatroom-dialog.c:369 msgid "Chat Room" msgstr "Кімната спілкування" -#: ../src/empathy-new-chatroom-dialog.c:353 +#: ../src/empathy-new-chatroom-dialog.c:385 msgid "Members" msgstr "Учасники" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:553 +#: ../src/empathy-new-chatroom-dialog.c:623 #, c-format msgid "" "%s\n" @@ -4055,16 +4199,16 @@ msgstr "" "Вимога паролю: %s\n" "Учасники: %s" -#: ../src/empathy-new-chatroom-dialog.c:555 -#: ../src/empathy-new-chatroom-dialog.c:556 +#: ../src/empathy-new-chatroom-dialog.c:625 +#: ../src/empathy-new-chatroom-dialog.c:626 msgid "No" msgstr "Ні" -#: ../src/empathy-new-chatroom-dialog.c:584 +#: ../src/empathy-new-chatroom-dialog.c:654 msgid "Could not start room listing" msgstr "Неможливо перелічити кімнати" -#: ../src/empathy-new-chatroom-dialog.c:594 +#: ../src/empathy-new-chatroom-dialog.c:664 msgid "Could not stop room listing" msgstr "Неможливо зупинити перелічування кімнат" @@ -4099,79 +4243,79 @@ msgstr "Список бесід" msgid "_Room:" msgstr "_Кімната:" -#: ../src/empathy-preferences.c:160 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "Надійшло повідомлення" -#: ../src/empathy-preferences.c:161 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "Повідомлення надіслано" -#: ../src/empathy-preferences.c:162 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "Нова розмова" -#: ../src/empathy-preferences.c:163 +#: ../src/empathy-preferences.c:169 msgid "Contact goes online" msgstr "Контакт входить у мережу" -#: ../src/empathy-preferences.c:164 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "Контакт виходить з мережі" -#: ../src/empathy-preferences.c:165 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "Обліковий запис під'єднано" -#: ../src/empathy-preferences.c:166 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "Обліковий запис від'єднано" -#: ../src/empathy-preferences.c:469 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "Мова" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:719 +#: ../src/empathy-preferences.c:725 msgid "Juliet" msgstr "Джульєтта" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:726 +#: ../src/empathy-preferences.c:732 msgid "Romeo" msgstr "Ромео" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:732 +#: ../src/empathy-preferences.c:738 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Ромео! О, навіщо ти Ромео?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:735 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "Зміни своє ім'я, зречися батька;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:738 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "Як ні, то присягни мені в коханні," #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "І більше я не буду Капулетті." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:744 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "Послухать — чи відповісти відразу?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "Джульєтта від'єдналась." -#: ../src/empathy-preferences.c:1153 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "Параметри" @@ -4200,54 +4344,58 @@ msgid "Display incoming events in the notification area" msgstr "Показувати вхідні події в ділянці сповіщень" #: ../src/empathy-preferences.ui.h:9 +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 "" +"Усунення відлуння допоможе зробити ваш голос чистішим для інших, але може " +"викликати певні проблеми на деяких комп'ютерах. Якщо ви або інша особа чує " +"дивні звуки або дефекти протягом дзвінка, спробуйте вимкнути усунення " +"відлуння і передзвонити." + +#: ../src/empathy-preferences.ui.h:10 msgid "Enable notifications when a contact comes online" msgstr "Показувати сповіщення, коли контакт входить в мережу" -#: ../src/empathy-preferences.ui.h:10 +#: ../src/empathy-preferences.ui.h:11 msgid "Enable notifications when a contact goes offline" msgstr "Показувати сповіщення, коли контакт залишає мережу" -#: ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-preferences.ui.h:12 msgid "Enable notifications when the _chat is not focused" msgstr "Показувати сповіщення, коли вікно _чату не активне" -#: ../src/empathy-preferences.ui.h:12 +#: ../src/empathy-preferences.ui.h:13 msgid "Enable spell checking for languages:" msgstr "Увімкнути перевіряння орфографії для мов:" -#: ../src/empathy-preferences.ui.h:13 +#: ../src/empathy-preferences.ui.h:14 msgid "General" msgstr "Загальне" -#: ../src/empathy-preferences.ui.h:14 -msgid "Input level" -msgstr "Вхідний рівень" - -#: ../src/empathy-preferences.ui.h:15 -msgid "Input volume" -msgstr "Вхідна гучність" - -#: ../src/empathy-preferences.ui.h:17 +#: ../src/empathy-preferences.ui.h:16 msgid "Location sources:" msgstr "Джерела місцевості:" -#: ../src/empathy-preferences.ui.h:18 +#: ../src/empathy-preferences.ui.h:17 msgid "Log conversations" msgstr "Журнал розмов" -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:18 msgid "Notifications" msgstr "Сповіщення" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:19 msgid "Play sound for events" msgstr "Звукові сигнали при подіях" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:20 msgid "Privacy" msgstr "Приватність" -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:21 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 " @@ -4256,23 +4404,23 @@ msgstr "" "Зниження точності визначення місцевості дозволяє публікувати лише місто," "регіон та країну. Точність GPS координат визначається 1 десятковою позицією." -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:22 msgid "Show _smileys as images" msgstr "Показувати _емоційки графічно" -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:23 msgid "Show contact _list in rooms" msgstr "Показати _список контактів у кімнаті" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:24 msgid "Sounds" msgstr "Звуки" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:25 msgid "Spell Checking" msgstr "Перевіряння орфографії" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:26 msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." @@ -4280,10 +4428,14 @@ msgstr "" "У цьому списку показані лише мови, для яких встановлено словники." -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:27 msgid "Themes" msgstr "Теми" +#: ../src/empathy-preferences.ui.h:28 +msgid "Use _echo cancellation to improve call quality" +msgstr "Скористатись усуненням від_луння для покращення якості викликів" + #: ../src/empathy-preferences.ui.h:29 msgid "Variant:" msgstr "Варіант:" @@ -4381,91 +4533,90 @@ msgstr "Увімкнути відео" msgid "Video Preview" msgstr "Перегляд відео" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:458 msgid "Contact Map View" msgstr "Карта контактів" -#: ../src/empathy-debug-window.c:1218 +#: ../src/empathy-debug-window.c:1228 msgid "Save" msgstr "Зберегти" -#: ../src/empathy-debug-window.c:1394 +#: ../src/empathy-debug-window.c:1435 msgid "Debug Window" msgstr "Вікно зневадження" -#: ../src/empathy-debug-window.c:1476 +#: ../src/empathy-debug-window.c:1517 msgid "Pause" msgstr "Пауза" -#: ../src/empathy-debug-window.c:1488 +#: ../src/empathy-debug-window.c:1529 msgid "Level " msgstr "Рівень" -#: ../src/empathy-debug-window.c:1508 +#: ../src/empathy-debug-window.c:1549 msgid "Debug" msgstr "Зневадження" -#: ../src/empathy-debug-window.c:1514 +#: ../src/empathy-debug-window.c:1555 msgid "Info" msgstr "Інформація" -#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569 +#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610 msgid "Message" msgstr "Повідомлення" -#: ../src/empathy-debug-window.c:1526 +#: ../src/empathy-debug-window.c:1567 msgid "Warning" msgstr "Попередження" -#: ../src/empathy-debug-window.c:1532 +#: ../src/empathy-debug-window.c:1573 msgid "Critical" msgstr "Критична" -#: ../src/empathy-debug-window.c:1538 +#: ../src/empathy-debug-window.c:1579 msgid "Error" msgstr "Помилка" -#: ../src/empathy-debug-window.c:1557 +#: ../src/empathy-debug-window.c:1598 msgid "Time" msgstr "Час" -#: ../src/empathy-debug-window.c:1560 +#: ../src/empathy-debug-window.c:1601 msgid "Domain" msgstr "Домен" -#: ../src/empathy-debug-window.c:1562 +#: ../src/empathy-debug-window.c:1603 msgid "Category" msgstr "Категорія" -#: ../src/empathy-debug-window.c:1564 +#: ../src/empathy-debug-window.c:1605 msgid "Level" msgstr "Рівень" -#: ../src/empathy-debug-window.c:1601 +#: ../src/empathy-debug-window.c:1642 msgid "" "The selected connection manager does not support the remote debugging " "extension." msgstr "" "Вибраний менеджер з'єднань не підтримує розширення віддаленого зневадження " -#: ../src/empathy-invite-participant-dialog.c:429 -#: ../src/empathy-invite-participant-dialog.c:477 +#: ../src/empathy-invite-participant-dialog.c:198 +#: ../src/empathy-invite-participant-dialog.c:226 msgid "Invite Participant" msgstr "Запросити учасника" -#: ../src/empathy-invite-participant-dialog.c:430 +#: ../src/empathy-invite-participant-dialog.c:199 msgid "Choose a contact to invite into the conversation:" msgstr "Виберіть контакт для запрошення до бесіди:" -#: ../src/empathy-invite-participant-dialog.c:473 +#: ../src/empathy-invite-participant-dialog.c:222 msgid "Invite" msgstr "Запросити" #: ../src/empathy-accounts.c:183 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "" -"Не показувати вікна; виконати роботу (наприклад, імпортування) та " -"вийти" +"Не показувати вікна; виконати роботу (наприклад, імпортування) та вийти" #: ../src/empathy-accounts.c:187 msgid "" @@ -4483,15 +4634,27 @@ msgstr "" msgid "" msgstr "" -#: ../src/empathy-accounts.c:198 +#: ../src/empathy-accounts.c:196 +msgid "Show account assistant" +msgstr "Показувати помічника облікових записів" + +#: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" msgstr "— облікові записи Empathy" -#: ../src/empathy-accounts.c:237 +#: ../src/empathy-accounts.c:238 msgid "Empathy Accounts" msgstr "Облікові записи Empathy" -#: ../src/empathy-debugger.c:66 +#: ../src/empathy-debugger.c:69 +msgid "Show a particular service" +msgstr "Показувати певною службою" + +#: ../src/empathy-debugger.c:74 +msgid "- Empathy Debugger" +msgstr "— зневадження Empathy" + +#: ../src/empathy-debugger.c:113 msgid "Empathy Debugger" msgstr "Зневадження Empathy" @@ -4499,67 +4662,167 @@ msgstr "Зневадження Empathy" msgid "- Empathy Chat Client" msgstr "— клієнт балачок Empathy" -#: ../src/empathy-notifications-approver.c:203 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Відгукнутись" -#: ../src/empathy-notifications-approver.c:217 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 msgid "Reject" msgstr "Відкинути" -#: ../src/empathy-notifications-approver.c:222 -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 msgid "Answer" msgstr "Відповісти" -#: ../src/empathy-notifications-approver.c:227 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Відповісти через відео" -#: ../src/empathy-notifications-approver.c:235 -#: ../src/empathy-notifications-approver.c:245 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Відхилити" -#: ../src/empathy-notifications-approver.c:239 -#: ../src/empathy-notifications-approver.c:250 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Прийняти" -#: ../src/empathy-notifications-approver.c:260 +#. 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:247 msgid "Provide" msgstr "Надати" -#: ../src/empathy-call-observer.c:135 +#: ../src/empathy-call-observer.c:134 #, c-format msgid "%s just tried to call you, but you were in another call." msgstr "%s намагався зв'язатись з вами, але втой час ви мали розмову з іншим." #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:556 ../src/empathy-call-window.c:570 +#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 msgid "i" msgstr "і" -#: ../src/empathy-call-window.c:1005 -#, c-format -msgid "Call with %d participants" -msgstr "Виклик з %d учасниками " +#: ../src/empathy-call-window.c:2929 +msgid "On hold" +msgstr "В очікуванні" + +#: ../src/empathy-call-window.c:2932 +msgid "Mute" +msgstr "Приглушити" + +#: ../src/empathy-call-window.c:2934 +msgid "Duration" +msgstr "Тривалість" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:1904 +#: ../src/empathy-call-window.c:2937 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:1905 -msgid "On hold" -msgstr "В очікуванні" +#: ../src/empathy-call-window.c:3207 +#, c-format +msgid "Your current balance is %s." +msgstr "Ваш поточний залишок становить %s." + +#: ../src/empathy-call-window.c:3211 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "Вибачте, але у вас недостатньо залишку, щоб здійснити виклик." + +#: ../src/empathy-call-window.c:3213 +msgid "Top Up" +msgstr "Поповнити" #: ../libempathy-gtk/empathy-search-bar.c:243 msgid "_Match case" msgstr "_З урахуванням регістру" +#~ msgid "Call volume" +#~ msgstr "Гучність виклику" + +#~ msgid "Call volume, as a percentage." +#~ msgstr "Гучність виклику, у відсотках." + +#~ msgid "Socket type not supported" +#~ msgstr "Такий тип гнізда не підтримується" + +#~ msgid "Ungrouped" +#~ msgstr "Без групи" + +#~ msgid "Favorite People" +#~ msgstr "Улюблені люди" + +#~ msgid "Select a contact" +#~ msgstr "Вибрати контакт" + +#~ msgid "Contact ID:" +#~ msgstr "Ідентифікатор контакту:" + +#~ msgid "C_hat" +#~ msgstr "_Балачка" + +#~ msgid "Send _Video" +#~ msgstr "Надіслати _відео" + +#~ msgid "C_all" +#~ msgstr "_Виклик" + +#~ msgid "Set your presence and current status" +#~ msgstr "Встановіть вашу присутність та поточний стан" + +#~ msgid "The selected contact cannot receive files." +#~ msgstr "Вибраний контакт не може одержувати файли." + +#~ msgid "The selected contact is offline." +#~ msgstr "Вибраний контакт поза мережею" + +#~ msgid "Input level:" +#~ msgstr "Вхідний рівень:" + +#~ msgid "Input volume:" +#~ msgstr "Вхідна гучність:" + +#~ msgid "Empathy has migrated butterfly logs" +#~ msgstr "Empathy переніс журнал повідомлень MSN" + +#~ msgid "Whether Empathy has migrated butterfly logs." +#~ msgstr "Чи було переміщення журналу MSN." + +#~ msgid "Find Next" +#~ msgstr "Знайти наступне" + +#~ msgid "Find Previous" +#~ msgstr "Знайти попереднє" + +#~ msgctxt "encoding video codec" +#~ msgid "Unknown" +#~ msgstr "Невідомо" + +#~ msgctxt "encoding audio codec" +#~ msgid "Unknown" +#~ msgstr "Невідомо" + +#~ msgctxt "decoding video codec" +#~ msgid "Unknown" +#~ msgstr "Невідомо" + +#~ msgctxt "decoding audio codec" +#~ msgid "Unknown" +#~ msgstr "Невідомо" + +#~ msgid "Show and edit accounts" +#~ msgstr "Показати та редагувати облікові записи" + +#~ msgid "Call with %d participants" +#~ msgstr "Виклик з %d учасниками " + #~ msgid "All" #~ msgstr "Усі" diff --git a/po/xh.po b/po/xh.po new file mode 100644 index 00000000..28a20a1b --- /dev/null +++ b/po/xh.po @@ -0,0 +1,4793 @@ +# Xhosa translation for empathy. +# Copyright (C) 2011 empathy's COPYRIGHT HOLDER +# This file is distributed under the same license as the empathy package. +# Andiswa Mvanyashe , 2011. +msgid "" +msgstr "" +"Project-Id-Version: empathy master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath" +"y&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2011-12-22 15:25+0000\n" +"PO-Revision-Date: 2011-12-23 13:48+0200\n" +"Last-Translator: Andiswa Mvanyashe \n" +"Language-Team: translate-discuss-af@lists.sourceforge.net\n" +"Language: xh\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Virtaal 0.7.0\n" +"X-DamnedLies-Scope: partial\n" +"X-Project-Style: gnome\n" + +#: ../data/empathy.desktop.in.in.h:1 +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "" +"Xa ngo-Google Talk, Facebook, MSN kunye nezinye ezininzi indawo zokuxoxa" + +#: ../data/empathy.desktop.in.in.h:2 +msgid "Empathy" +msgstr "I-Empathy" + +#: ../data/empathy.desktop.in.in.h:3 +msgid "Empathy Internet Messaging" +msgstr "Umyalezo ka-Empathy kwi-inthanethi" + +#: ../data/empathy.desktop.in.in.h:4 +msgid "IM Client" +msgstr "Umxhasi we-IRC" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:1 +msgid "Always open a separate chat window for new chats." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:2 +#, fuzzy +#| msgid "Camera On" +msgid "Camera device" +msgstr "Ikhamera ivuliwe" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 +#, fuzzy +#| msgid "Camera On" +msgid "Camera position" +msgstr "Ikhamera ivuliwe" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +#, fuzzy +#| msgid "Chat with %s" +msgid "Chat window theme" +msgstr "Xoxa nge-%s" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +msgid "Chat window theme variant" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +msgid "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 +#, fuzzy +#| msgid "Contact List" +msgid "Compact contact list" +msgstr "Uluhlu loqhagamshelana nabo" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#, fuzzy +#| msgid "Connection has been refused" +msgid "Connection managers should be used" +msgstr "Udibaniso aluvunywanga" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +msgid "Contact list sort criterion" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +msgid "D-Bus object path of the last account selected to join a room." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +msgid "Default directory to select an avatar image from" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#, fuzzy +#| msgid "Disable notifications when _away or busy" +msgid "Disable popup notifications when away" +msgstr "Simise isazisi xa uha_mbile okanye uxakekile" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#, fuzzy +#| msgid "Disable sounds when _away or busy" +msgid "Disable sounds when away" +msgstr "Simise isandi xa u_hambile okanye uxakekile" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#, fuzzy +#| msgid "Display incoming events in the notification area" +msgid "Display incoming events in the status area" +msgstr "Bonisa into eiziza kwenzeka kwindawo yesazisi" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +msgid "Echo cancellation support" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +msgid "Empathy can publish the user's location" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +msgid "Empathy can use the GPS to guess the location" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +msgid "Empathy can use the cellular network to guess the location" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +msgid "Empathy can use the network to guess the location" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +msgid "Empathy default download folder" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +msgid "Empathy should auto-away when idle" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#, fuzzy +#| msgid "_Automatically connect on startup" +msgid "Empathy should auto-connect on startup" +msgstr "_Ngokuzenzekela qhakamshelana nesiqalo" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#, fuzzy +#| msgid "_Reduce location accuracy" +msgid "Empathy should reduce the location's accuracy" +msgstr "_Yehlisa ukulunga kwendawo" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +msgid "Enable WebKit Developer Tools" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#, fuzzy +#| msgid "_Enable sound notifications" +msgid "Enable popup notifications for new messages" +msgstr "_Cima isandi esazisayo" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#, fuzzy +#| msgid "Enable spell checking for languages:" +msgid "Enable spell checker" +msgstr "Misa ukujunga impazamo zolwimi:" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +msgid "Hide main window" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +msgid "Hide the main window." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +msgid "Last account selected in Join Room dialog" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +msgid "Nick completed character" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#, fuzzy +#| msgid "_Open new chats in separate windows" +msgid "Open new chats in separate windows" +msgstr "_Vula ingxoxo entsha kwifestile esecaleni" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +msgid "Path of the Adium theme to use" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#, fuzzy +#| msgid "Play sound for events" +msgid "Play a sound for incoming messages" +msgstr "Dlala izandi kwizehlo" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#, fuzzy +#| msgid "Play sound for events" +msgid "Play a sound for new conversations" +msgstr "Dlala izandi kwizehlo" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#, fuzzy +#| msgid "Play sound for events" +msgid "Play a sound for outgoing messages" +msgstr "Dlala izandi kwizehlo" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#, fuzzy +#| msgid "Enable notifications when a contact comes online" +msgid "Play a sound when a contact logs in" +msgstr "Simise isazisi xa umqhakashelwa engena elayinini" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +msgid "Play a sound when a contact logs out" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +msgid "Play a sound when we log in" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +msgid "Play a sound when we log out" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#, fuzzy +#| msgid "Enable notifications when the _chat is not focused" +msgid "Pop up notifications if the chat isn't focused" +msgstr "Misa isazisi xa i_ngxoxo inganakwanga" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#, fuzzy +#| msgid "Enable notifications when a contact comes online" +msgid "Pop up notifications when a contact logs in" +msgstr "Simise isazisi xa umqhakashelwa engena elayinini" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#, fuzzy +#| msgid "Enable notifications when a contact comes online" +msgid "Pop up notifications when a contact logs out" +msgstr "Simise isazisi xa umqhakashelwa engena elayinini" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +msgid "Position the camera preview should be during a call." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#, fuzzy +#| msgid "_Show Contact List" +msgid "Show Balance in contact list" +msgstr "_Bonisa uluhlu lwabaqhagamshelana nabo" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#, fuzzy +#| msgid "Save Avatar" +msgid "Show avatars" +msgstr "Gcina u-avatar" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#, fuzzy +#| msgid "Show contact _list in rooms" +msgid "Show contact list in rooms" +msgstr "Bonisa u_luhlu labaqhakamshelwa kumagumbi" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +msgid "Show hint about closing the main window" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#, fuzzy +#| msgid "_Offline Contacts" +msgid "Show offline contacts" +msgstr "_Umqhakamshelanisi uphumile" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#, fuzzy +#| msgid "Show P_rotocols" +msgid "Show protocols" +msgstr "Bonisa i-P_rotokoli" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#, fuzzy +#| msgid "Enable spell checking for languages:" +msgid "Spell checking languages" +msgstr "Misa ukujunga impazamo zolwimi:" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +msgid "The default folder to save file transfers in." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +msgid "The last directory that an avatar image was chosen from." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +msgid "The position for the chat window side pane" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +msgid "The theme that is used to display the conversation in chat windows." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +msgid "" +"The theme variant that is used to display the conversation in chat windows." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +msgid "Use graphical smileys" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#, fuzzy +#| msgid "Notifications" +msgid "Use notification sounds" +msgstr "Izaziso" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +msgid "Use theme for chat rooms" +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +msgid "Whether Empathy can use the network to guess the location." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +msgid "" +"Whether Empathy should go into away mode automatically if the user is idle." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +msgid "" +"Whether Empathy should reduce the location's accuracy for privacy reasons." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +msgid "" +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +msgid "" +"Whether to check words typed against the languages you want to check with." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +msgid "Whether to play a sound to notify of events." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +msgid "Whether to play a sound to notify of incoming messages." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +msgid "Whether to play a sound to notify of new conversations." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +msgid "Whether to play a sound when logging into a network." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +msgid "Whether to play a sound when logging out of a network." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#, fuzzy +#| msgid "Disable notifications when _away or busy" +msgid "Whether to play sound notifications when away or busy." +msgstr "Simise isazisi xa uha_mbile okanye uxakekile" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#, fuzzy +#| msgid "Enable notifications when a contact goes offline" +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "Simise isazisi xa umqhakashelwa ephuma elayinini" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#, fuzzy +#| msgid "Enable notifications when a contact comes online" +msgid "Whether to show a popup notification when a contact goes online." +msgstr "Simise isazisi xa umqhakashelwa engena elayinini" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +msgid "Whether to show a popup notification when receiving a new message." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +msgid "Whether to show account balances in the contact list." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +msgid "Whether to show contacts that are offline in the contact list." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#, fuzzy +#| msgid "Disable notifications when _away or busy" +msgid "Whether to show popup notifications when away or busy." +msgstr "Simise isazisi xa uha_mbile okanye uxakekile" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +msgid "Whether to show protocols for contacts in the contact list." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#, fuzzy +#| msgid "Show contact _list in rooms" +msgid "Whether to show the contact list in chat rooms." +msgstr "Bonisa u_luhlu labaqhakamshelwa kumagumbi" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +msgid "Whether to show the contact list in compact mode." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +msgid "" +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +msgid "Whether to use the theme for chat rooms." +msgstr "" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's name with the value \"name\". A value of \"state\" will sort " +"the contact list by state." +msgstr "" + +#: ../data/empathy-accounts.desktop.in.in.h:1 +msgid "Manage Messaging and VoIP accounts" +msgstr "Miyalezo kunye nee-akhawunti za VoIp" + +#. Tweak the dialog +#: ../data/empathy-accounts.desktop.in.in.h:2 +#: ../src/empathy-accounts-dialog.c:2406 +msgid "Messaging and VoIP Accounts" +msgstr "Imiyalezo kunye nee-akhawunti za VoIp" + +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "Akukho sizathu esichaziwe" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "Utshintsho kwingingqi yokuhlala kuceliwe" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "Ulumisile udluliso lwefayile" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "Omnye wabathathi nxaxheba uluyekisilo udluliso lwefayile" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "Ingxaku ivelile xa uza ukudlulisa ifayile" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "Abanye abathathi nxaxheba abakwazi kudlulisa ifayile" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311 +msgid "Unknown reason" +msgstr "Isizathu esingaziwa" + +#: ../libempathy/empathy-ft-handler.c:917 +msgid "File transfer completed, but the file was corrupted" +msgstr "Udluliso lwefayile lugqityiwe, kodwa ifayile ibimoshakele" + +#: ../libempathy/empathy-ft-handler.c:1203 +msgid "File transfer not supported by remote contact" +msgstr "Udluliso lwefayile aluxhaswa ngumqhakamshelanisi onguwo" + +#: ../libempathy/empathy-ft-handler.c:1259 +msgid "The selected file is not a regular file" +msgstr "Ifayile ekhethiwe ayofuyile yesiqhelo" + +#: ../libempathy/empathy-ft-handler.c:1268 +msgid "The selected file is empty" +msgstr "Ifayile ejhethiwe ayinanto" + +#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131 +#, c-format +msgid "Missed call from %s" +msgstr "Uphose umnxeba osuka ku-%s" + +#. Translators: this is an outgoing call, e.g. 'Called Alice' +#: ../libempathy/empathy-message.c:419 +#, c-format +msgid "Called %s" +msgstr "Ufownile u-%s" + +#: ../libempathy/empathy-message.c:422 +#, c-format +msgid "Call from %s" +msgstr "umxeba osuka ku-%s" + +#: ../libempathy/empathy-utils.c:231 +msgid "Available" +msgstr "Ndikhona" + +#: ../libempathy/empathy-utils.c:233 +msgid "Busy" +msgstr "Uxakekile" + +#: ../libempathy/empathy-utils.c:236 +msgid "Away" +msgstr "Kude" + +#: ../libempathy/empathy-utils.c:238 +msgid "Invisible" +msgstr "Ayibonakali" + +#: ../libempathy/empathy-utils.c:240 +msgid "Offline" +msgstr "Imo engeyo yakusebenza" + +#. translators: presence type is unknown +#: ../libempathy/empathy-utils.c:243 +msgctxt "presence" +msgid "Unknown" +msgstr "Okungaziwayo" + +#: ../libempathy/empathy-utils.c:283 +msgid "No reason specified" +msgstr "Akukho sizathu esichaziwe" + +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341 +msgid "Status is set to offline" +msgstr "Umgangatho ubonisa ukuba uphumile" + +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321 +#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 +msgid "Network error" +msgstr "Impazamo kuthungelwano" + +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 +msgid "Authentication failed" +msgstr "Uqinisekiso aluphumelelanga" + +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 +msgid "Encryption error" +msgstr "Ingxaki kuguqulelo 0luntsonkothileyo" + +#: ../libempathy/empathy-utils.c:293 +msgid "Name in use" +msgstr "Igama elisetyenzisiwe" + +#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327 +msgid "Certificate not provided" +msgstr "Isetifiketi asinikezwanga" + +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 +msgid "Certificate untrusted" +msgstr "Isatifiketi asithembekanga" + +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 +msgid "Certificate expired" +msgstr "Esi satifiketi siphelelwe lixesha" + +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 +msgid "Certificate not activated" +msgstr "Isetifiketi asivuselelwanga" + +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 +msgid "Certificate hostname mismatch" +msgstr "Isatifiketi hostname mismatch" + +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 +msgid "Certificate fingerprint mismatch" +msgstr "Isetifiketi sonyathliso minwe aludibani" + +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 +msgid "Certificate self-signed" +msgstr "Isetifiketi azi sayineleyo" + +#: ../libempathy/empathy-utils.c:309 +msgid "Certificate error" +msgstr "Kukho ingxaki keisatifiketi" + +#: ../libempathy/empathy-utils.c:343 +msgid "Encryption is not available" +msgstr "Uguqulelo eluntsokothile alufumaneki" + +#: ../libempathy/empathy-utils.c:345 +msgid "Certificate is invalid" +msgstr "Isatifiketi ayisiso" + +#: ../libempathy/empathy-utils.c:347 +msgid "Connection has been refused" +msgstr "Udibaniso aluvunywanga" + +#: ../libempathy/empathy-utils.c:349 +msgid "Connection can't be established" +msgstr "Udibaniso alunokwenziwa" + +#: ../libempathy/empathy-utils.c:351 +msgid "Connection has been lost" +msgstr "Udibaniso lulahlekile" + +#: ../libempathy/empathy-utils.c:353 +msgid "This resource is already connected to the server" +msgstr "Lo mnikezi sele eqhakamshelene neseva" + +#: ../libempathy/empathy-utils.c:355 +msgid "" +"Connection has been replaced by a new connection using the same resource" +msgstr "Unxibelelwano lutshintshwe ngolutsha kusetyenziswa umnikezi omnye" + +#: ../libempathy/empathy-utils.c:358 +msgid "The account already exists on the server" +msgstr "Le akhawunti sele ikhona kwiseva" + +#: ../libempathy/empathy-utils.c:360 +msgid "Server is currently too busy to handle the connection" +msgstr "Iseva ixakeke kakhulu ukwazi ukudibana" + +#: ../libempathy/empathy-utils.c:362 +msgid "Certificate has been revoked" +msgstr "Esi satifiketi asivunywanga" + +#: ../libempathy/empathy-utils.c:364 +msgid "" +"Certificate uses an insecure cipher algorithm or is cryptographically weak" +msgstr "" +"Isetifiketi sisbenzisa i-chipher algorith okanye ithambe crypotographically " +"engakhuselekanga" + +#: ../libempathy/empathy-utils.c:367 +#, fuzzy +msgid "" +"The length of the server certificate, or the depth of the server certificate " +"chain, exceed the limits imposed by the cryptography library" +msgstr "" +"Ubude besetifiketi seseva, okanye ubunzulu itsheyini yesatifiketi seseva, " +"siyedlula kummiselo obekwe yilayibri ye-crypotography" + +#: ../libempathy/empathy-utils.c:371 +msgid "Your software is too old" +msgstr "I-software yakho indala" + +#: ../libempathy/empathy-utils.c:530 +msgid "People Nearby" +msgstr "Abantu abakufutshane" + +#: ../libempathy/empathy-utils.c:535 +msgid "Yahoo! Japan" +msgstr "U-Yahoo! Japan" + +#: ../libempathy/empathy-utils.c:564 +msgid "Google Talk" +msgstr "U-Google Talk" + +#: ../libempathy/empathy-utils.c:565 +msgid "Facebook Chat" +msgstr "U-Facebook Chat" + +#: ../libempathy/empathy-time.c:88 +#, c-format +msgid "%d second ago" +msgid_plural "%d seconds ago" +msgstr[0] "kumzuzu oyi-%d odlulileyo" +msgstr[1] "kwimizuzu eyi-%d odlulileyo" + +#: ../libempathy/empathy-time.c:93 +#, c-format +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "kumzuzu oyi-%d odlulileyo" +msgstr[1] "kwimizuzu eyi-%d odlulileyo" + +#: ../libempathy/empathy-time.c:98 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "kwiyure eyi-%d edlulileyo" +msgstr[1] "kwiiyure eziyi-%d ezadlulayo" + +#: ../libempathy/empathy-time.c:103 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "kusuku oluyi-%d oludlulile" +msgstr[1] "kwiintsuku eziyi-%d ezadlulayo" + +#: ../libempathy/empathy-time.c:108 +#, c-format +msgid "%d week ago" +msgid_plural "%d weeks ago" +msgstr[0] "kwiveki eyi-%d edlulile" +msgstr[1] "kwiiveki eziyi-%d ezidlulileyo" + +#: ../libempathy/empathy-time.c:113 +#, c-format +msgid "%d month ago" +msgid_plural "%d months ago" +msgstr[0] "inyanga eyi-%d edlulileyo" +msgstr[1] "kwiinyanga eziyi-%d ezidlulileyo" + +#: ../libempathy/empathy-time.c:136 +msgid "in the future" +msgstr "kwingomso" + +#: ../libempathy-gtk/empathy-account-chooser.c:688 +msgid "All accounts" +msgstr "Zonke ii-akhawunti" + +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 +msgid "Account" +msgstr "I-akhawunti" + +#: ../libempathy-gtk/empathy-account-widget.c:683 +msgid "Password" +msgstr "Igama lokuthela" + +#: ../libempathy-gtk/empathy-account-widget.c:684 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:507 +msgid "Server" +msgstr "Iseva" + +#: ../libempathy-gtk/empathy-account-widget.c:685 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:522 +msgid "Port" +msgstr "Izibuko" + +#: ../libempathy-gtk/empathy-account-widget.c:763 +#: ../libempathy-gtk/empathy-account-widget.c:815 +#, c-format +msgid "%s:" +msgstr "%s:" + +#: ../libempathy-gtk/empathy-account-widget.c:1396 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +msgid "Username:" +msgstr "Igama lomsebenzisi:" + +#: ../libempathy-gtk/empathy-account-widget.c:1708 +msgid "A_pply" +msgstr "_Faka isicelo" + +#: ../libempathy-gtk/empathy-account-widget.c:1737 +msgid "L_og in" +msgstr "_Loga ngaphakathi" + +#: ../libempathy-gtk/empathy-account-widget.c:1810 +msgid "This account already exists on the server" +msgstr "Le akhawunti sele ikhona kwiseva" + +#: ../libempathy-gtk/empathy-account-widget.c:1814 +msgid "Create a new account on the server" +msgstr "Dala i-akhawunti entsha kwiseva" + +#. To translators: The first parameter is the login id and the +#. * second one is the network. The resulting string will be something +#. * like: "MyUserName on freenode". +#. * You should reverse the order of these arguments if the +#. * server should come before the login id in your locale. +#: ../libempathy-gtk/empathy-account-widget.c:2239 +#, c-format +msgid "%1$s on %2$s" +msgstr "%1$s ku %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:2265 +#, c-format +msgid "%s Account" +msgstr "i-Akhawunti ka-%s" + +#: ../libempathy-gtk/empathy-account-widget.c:2269 +msgid "New account" +msgstr "Akhawunti entsha" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 +msgid "Example: MyScreenName" +msgstr "Umzekelo: igamalamlesikrini" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Advanced" +msgstr "Kwinqanaba eseliphambili" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 +msgid "Pass_word:" +msgstr "I_gama lokuthela:" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Remember Password" +msgstr "Khumbula igama lokuthela" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "Khumbula igama lokuthela" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 +msgid "Screen _Name:" +msgstr "I_gama lesikrini:" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 +msgid "What is your AIM password?" +msgstr "Lithini agama lokuthela ku-AIM?" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 +msgid "What is your AIM screen name?" +msgstr "Lithini igama lakho lesikrini sika-AIM?" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 +msgid "_Port:" +msgstr "_Isiqhagamsheli:" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 +msgid "_Server:" +msgstr "I_seva:" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Example: username" +msgstr "Umzekelo: umsebenzisi" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +msgid "Login I_D:" +msgstr "Indlela yokungena ye I_D:" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +msgid "What is your GroupWise User ID?" +msgstr "Lithini agama lokuthela le-GroupWise?" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +msgid "What is your GroupWise password?" +msgstr "Lithini agama lokuthela le-GroupWise?" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +msgid "Example: 123456789" +msgstr "Umzekelo: 123456789" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Ch_aracter set:" +msgstr "Ummiselo wo_mbhalo onjengonobumba:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +msgid "ICQ _UIN:" +msgstr "ICQ _UIN:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +msgid "What is your ICQ UIN?" +msgstr "Ithini i-ICQ UIN?" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +msgid "What is your ICQ password?" +msgstr "Lithini agama lokuthela ku-ICQ?" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:206 +#: ../libempathy-gtk/empathy-account-widget-sip.c:239 +msgid "Auto" +msgstr "Okuzenzekelayo" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:209 +msgid "UDP" +msgstr "UDP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:212 +msgid "TCP" +msgstr "TCP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:215 +msgid "TLS" +msgstr "TLS" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 +msgid "Register" +msgstr "Bhalisa" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:249 +msgid "Options" +msgstr "Okukhethwayo" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:252 +msgid "None" +msgstr "Akukho nanye" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +msgid "Character set:" +msgstr "Ummiselo wo~mbhalo onjengonobumba:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +msgid "" +"Most IRC servers don't need a password, so if you're not sure, don't enter a " +"password." +msgstr "" +"I-IRC seva ezininzi azilifuni igama lokuthela, ngoko xa ungaqinisekanga, " +"sukulifaka igama lokuthela." + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +msgid "Network" +msgstr "Umsebenzi wothungelwano" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 +msgid "Network:" +msgstr "Uthungelwano:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 +msgid "Nickname:" +msgstr "Igama lesiteketiso:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 +msgid "Password:" +msgstr "Igama lokuthelela:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +msgid "Quit message:" +msgstr "Phuma kumyalezo:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +msgid "Real name:" +msgstr "Igama lokwenyani:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 +msgid "Servers" +msgstr "Iiseva" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 +msgid "What is your IRC nickname?" +msgstr "Sithini isiteketiso sakho se-IRC?" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "Which IRC network?" +msgstr "Loluphi uthungelwano lwe-IRC?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "Example: user@gmail.com" +msgstr "Umzekelo: user@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 +msgid "Example: user@jabber.org" +msgstr "Umzekelo: user@jabber.org" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 +msgid "Encr_yption required (TLS/SSL)" +msgstr "I-Encr_yption iyafuneka (TLS/SSL)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 +msgid "I_gnore SSL certificate errors" +msgstr "_Zizibe impazamo zesatifiketi se-SSL" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 +msgid "Override server settings" +msgstr "Zegqume izicwangciso zeseva" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Priori_ty:" +msgstr "E_zibalulekile:" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 +msgid "Reso_urce:" +msgstr "U_mnikezi:" + +#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#, fuzzy +msgid "" +"This is your username, not your normal Facebook login.\n" +"If you are facebook.com/badger, enter badger.\n" +"Use this page to choose a " +"Facebook username if you don't have one." +msgstr "" +"Eli ligama lakho lokulisebenzisa, hayi u-Facebook login oqhelekile.\n" +"If you are facebook.com/badger, faka badger.\n" +"Use this page to choose a " +"Facebook username if you don't have one." + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +msgid "Use old SS_L" +msgstr "Sebenzisa i-SS_L endala" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "What is your Facebook password?" +msgstr "Lithini agama lokuthela ku-Facebook?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "What is your Facebook username?" +msgstr "Lithini agama lokuthela ku-Facebook?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +msgid "What is your Google ID?" +msgstr "Ithini i-ID yakho ku-Google?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +msgid "What is your Google password?" +msgstr "Lithini agama lokuthela ku-Google?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "What is your Jabber ID?" +msgstr "Ithini i-ID yakho kaJabber?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +msgid "What is your Jabber password?" +msgstr "Lithini agama lokuthela ku-Jabber?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +msgid "What is your desired Jabber ID?" +msgstr "Ithini i-ID yakho kaJabber oyinqwnelayo?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +msgid "What is your desired Jabber password?" +msgstr "Lithini igama lokuthela lika-Jabber olinqwnelayo?" + +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +msgid "Example: user@hotmail.com" +msgstr "Umzekelo: user@hotmail.com" + +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +msgid "What is your Windows Live ID?" +msgstr "Ithini iID yakho yeFestile eohikayo?" + +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +msgid "What is your Windows Live password?" +msgstr "Lithini agama lokuthela lika-Windows Live?" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "E-_mail address:" +msgstr "Idilesi ye-i_meyile:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +msgid "Nic_kname:" +msgstr "I_gama lesiteketiso:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +msgid "_First Name:" +msgstr "Igama _Lokuqala:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 +msgid "_Jabber ID:" +msgstr "I-_Jabber ID:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 +msgid "_Last Name:" +msgstr "Igama _Lokugqibela:" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +msgid "_Published Name:" +msgstr "I_gama elipapashiwe:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +msgid "Example: user@my.sip.server" +msgstr "Umzekelo: user@my.sip.server" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 +msgid "Authentication username:" +msgstr "Ubungqina begama lokusebenzisa:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +msgid "Discover Binding" +msgstr "Fumanisa ngokubopha" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 +msgid "Discover the STUN server automatically" +msgstr "Fumana iseva ye-STUN ngokwayo" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 +msgid "Ignore TLS Errors" +msgstr "Suzinaka iimpazamo zeTLS" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 +msgid "Interval (seconds)" +msgstr "Ikhefu lesandi (imizuzwana)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +msgid "Keep-Alive Options" +msgstr "Gcina ukhetho oluphilayo" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 +msgid "Loose Routing" +msgstr "Lahla i-routing" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +msgid "Mechanism:" +msgstr "I-Mechanism:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 +msgid "Miscellaneous Options" +msgstr "Ezinokukhethwa eziziintlobo ngeentlobo" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 +msgid "NAT Traversal Options" +msgstr "Okukhethwayo kwe-NAT Traversal" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 +msgid "Port:" +msgstr "Izibuko:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 +msgid "Proxy Options" +msgstr "Shicilela okukhethwayo" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 +msgid "STUN Server:" +msgstr "I-STUN Seva:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "Iseva:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 +msgid "Transport:" +msgstr "Uthutho:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +msgid "Use this account to call _landlines and mobile phones" +msgstr "Sebenzisa le-akhawunti ukufownela i_mfonomfono zendlu kunye neselula" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +msgid "What is your SIP account password?" +msgstr "Lithini agama lokuthela le-akhawunti ye-SIP?" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP login ID?" +msgstr "Ithini i-ID yakho yokungena kuSIP?" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "_Username:" +msgstr "_Igama lomsebenzisi:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +msgid "I_gnore conference and chat room invitations" +msgstr "Su_zinaka ikhonferensi kunye namagumbi okuxoxa" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +msgid "What is your Yahoo! ID?" +msgstr "Ithini i-ID ka-Yahoo! Yakho?" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "What is your Yahoo! password?" +msgstr "Lithini agama lokuthela ku-Yahoo?" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Yahoo! I_D:" +msgstr "I-Yahoo! I_D:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 +msgid "_Room List locale:" +msgstr "Uluhlu le_gumbi lendawo:" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:471 +#: ../libempathy-gtk/empathy-avatar-chooser.c:556 +msgid "Couldn't convert image" +msgstr "Ayikwazanga ukujika umyalezo" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:472 +msgid "None of the accepted image formats are supported on your system" +msgstr "Akukho namnye umfanekiso oxhaswayo yinkqubo oyisebenzisayo" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:819 +msgid "Couldn't save picture to file" +msgstr "Ayikwazanga ukugcina umfanekiso kwifayile" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:939 +msgid "Select Your Avatar Image" +msgstr "Khetha umyalezo wakho we-Avatar" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:947 +msgid "Take a picture..." +msgstr "Thatha umfanekiso..." + +#: ../libempathy-gtk/empathy-avatar-chooser.c:960 +msgid "No Image" +msgstr "Akukho mfanekiso" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:1017 +msgid "Images" +msgstr "Imifanekiso" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:1021 +msgid "All Files" +msgstr "Zonke iifayili" + +#: ../libempathy-gtk/empathy-avatar-image.c:322 +msgid "Click to enlarge" +msgstr "Cofa ukwandisa" + +#: ../libempathy-gtk/empathy-call-utils.c:44 +#: ../libempathy-gtk/empathy-call-utils.c:62 +msgid "There was an error starting the call" +msgstr "Kubekho impazamo yokuqalisaeni umnxeba wefowni" + +#: ../libempathy-gtk/empathy-call-utils.c:51 +msgid "The specified contact doesn't support calls" +msgstr "Umqhakashelani uchaziwe akazixhasi imfonomfono" + +#: ../libempathy-gtk/empathy-call-utils.c:53 +msgid "The specified contact is offline" +msgstr "Umqhakashelani ochaziwe uphumile" + +#: ../libempathy-gtk/empathy-call-utils.c:55 +msgid "The specified contact is not valid" +msgstr "Umqhakashelani ochaziwe akunguwo" + +#: ../libempathy-gtk/empathy-call-utils.c:57 +msgid "Emergency calls are not supported on this protocol" +msgstr "Imfonomfono zexesha lengxaki azixhaswa kule-protocol" + +#: ../libempathy-gtk/empathy-call-utils.c:59 +msgid "You don't have enough credit in order to place this call" +msgstr "Awunamali eyanele ukuze utsale umnxeba" + +#: ../libempathy-gtk/empathy-chat.c:705 +msgid "Failed to open private chat" +msgstr "Ayikwazanga ukuvula ingxoxo yabucala" + +#: ../libempathy-gtk/empathy-chat.c:763 +msgid "Topic not supported on this conversation" +msgstr "Isihloko asixhaswa kule ngxoxo" + +#: ../libempathy-gtk/empathy-chat.c:769 +msgid "You are not allowed to change the topic" +msgstr "Awuvumelekanga ukutshintsha isihloko" + +#: ../libempathy-gtk/empathy-chat.c:970 +#, c-format +msgid "“%s” is not a valid contact ID" +msgstr "u-“%s” akayiyo i-ID yoqhakamshelwano eyiyo" + +#: ../libempathy-gtk/empathy-chat.c:1065 +msgid "/clear: clear all messages from the current conversation" +msgstr "/clear: cima yonke imiyalezo kule ngxoxo yangoku" + +#: ../libempathy-gtk/empathy-chat.c:1068 +msgid "/topic : set the topic of the current conversation" +msgstr "/topic : beka isihloko sale ngxoxo eqhubekayo" + +#: ../libempathy-gtk/empathy-chat.c:1071 +msgid "/join : join a new chat room" +msgstr "/join : ngenga kwindlu yokuxoxo" + +#: ../libempathy-gtk/empathy-chat.c:1074 +msgid "/j : join a new chat room" +msgstr "/j : ngenga kwindlu yokuxoxo" + +#: ../libempathy-gtk/empathy-chat.c:1078 +msgid "" +"/part [] []: leave the chat room, by default the " +"current one" +msgstr "" +"/part [] []: shiya igumbi lokuxoxa, ngokwalo " +"lo wangoku" + +#: ../libempathy-gtk/empathy-chat.c:1082 +msgid "/query []: open a private chat" +msgstr "/query []: vula ingxoxo yabucala" + +#: ../libempathy-gtk/empathy-chat.c:1085 +msgid "/msg : open a private chat" +msgstr "/msg : vula ingxoxo yabucala" + +#: ../libempathy-gtk/empathy-chat.c:1088 +msgid "/nick : change your nickname on the current server" +msgstr "/nick : tshintsha igama lakho lesiteketiso kule seva" + +#: ../libempathy-gtk/empathy-chat.c:1091 +msgid "/me : send an ACTION message to the current conversation" +msgstr "/me : thumela umyalezo oshukumayo kule ngxoxo eqhubekayo" + +#: ../libempathy-gtk/empathy-chat.c:1094 +msgid "" +"/say : send 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 : thumela kule ngxoxo yagoku. Le iqhele ukuthumela " +"umyalezo oqala ngo a '/'. Umzekelo: \"/yithi /ukungena kusetyenziswa " +"ukungena kwingxoxo entsha\"" + +#: ../libempathy-gtk/empathy-chat.c:1099 +msgid "/whois : display information about a contact" +msgstr "/whois : bonisa iinkcukacha ngomqhakamshelwa" + +#: ../libempathy-gtk/empathy-chat.c:1102 +msgid "" +"/help []: show all supported commands. If is defined, " +"show its usage." +msgstr "" +"/help []: ibonisa yonke imiyalelo exhaswayo. Ukuba " +"icacisiwe, ibonisa intebenzo yayo." + +#: ../libempathy-gtk/empathy-chat.c:1121 +#, c-format +msgid "Usage: %s" +msgstr "Usetyenziso: %s" + +#: ../libempathy-gtk/empathy-chat.c:1166 +msgid "Unknown command" +msgstr "Umyalelo ongaziwa" + +#: ../libempathy-gtk/empathy-chat.c:1292 +msgid "Unknown command; see /help for the available commands" +msgstr "Umyalelo ongaziwa; bona/help kwimiyalelo ekhona" + +#: ../libempathy-gtk/empathy-chat.c:1456 +msgid "insufficient balance to send message" +msgstr "akukho mali yanele ukuthumela umyalezo" + +#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474 +#: ../libempathy-gtk/empathy-chat.c:1537 +#, c-format +msgid "Error sending message '%s': %s" +msgstr "Kubekho ingxaki ekuthumeleni umyalezo '%s': %s" + +#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479 +#: ../libempathy-gtk/empathy-chat.c:1541 +#, c-format +msgid "Error sending message: %s" +msgstr "Kubekho ingxaki ekuthumeleni umyalezo: %s" + +#. translators: error used when user doesn't have enough credit on his +#. * account to send the message. +#: ../libempathy-gtk/empathy-chat.c:1468 +#, c-format +msgid "insufficient balance to send message. Top up." +msgstr "akukho mali eyanele ukuthumela umyalezo. Gcwalisa." + +#: ../libempathy-gtk/empathy-chat.c:1508 +msgid "not capable" +msgstr "ayikwazi" + +#: ../libempathy-gtk/empathy-chat.c:1515 +msgid "offline" +msgstr "imo engeyo yakusebenza" + +#: ../libempathy-gtk/empathy-chat.c:1518 +msgid "invalid contact" +msgstr "uqhagamshelwano olungavumelekanga" + +#: ../libempathy-gtk/empathy-chat.c:1521 +msgid "permission denied" +msgstr "umvume ayivunywanga" + +#: ../libempathy-gtk/empathy-chat.c:1524 +msgid "too long message" +msgstr "umyalezo mde kakhulu" + +#: ../libempathy-gtk/empathy-chat.c:1527 +msgid "not implemented" +msgstr "ayiphunyezwanga" + +#: ../libempathy-gtk/empathy-chat.c:1531 +msgid "unknown" +msgstr "ayaziwa" + +#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761 +msgid "Topic:" +msgstr "Isihloko:" + +#: ../libempathy-gtk/empathy-chat.c:1610 +#, c-format +msgid "Topic set to: %s" +msgstr "Isihloko silungiselelwe uku: %s" + +#: ../libempathy-gtk/empathy-chat.c:1612 +msgid "No topic defined" +msgstr "Akukho sihloko esicacisiwe" + +#: ../libempathy-gtk/empathy-chat.c:2125 +msgid "(No Suggestions)" +msgstr "(Akukho ngcebiso)" + +#. translators: %s is the selected word +#: ../libempathy-gtk/empathy-chat.c:2193 +#, c-format +msgid "Add '%s' to Dictionary" +msgstr "Faka i-'%s' kwidikshinari" + +#. translators: first %s is the selected word, +#. * second %s is the language name of the target dictionary +#: ../libempathy-gtk/empathy-chat.c:2230 +#, c-format +msgid "Add '%s' to %s Dictionary" +msgstr "Yongeza '%s' kwi %s kwisiChazi magama" + +#: ../libempathy-gtk/empathy-chat.c:2300 +msgid "Insert Smiley" +msgstr "Faka uncumo" + +#. send button +#: ../libempathy-gtk/empathy-chat.c:2318 +#: ../libempathy-gtk/empathy-ui-utils.c:1868 +msgid "_Send" +msgstr "_Thumela" + +#. Spelling suggestions +#: ../libempathy-gtk/empathy-chat.c:2375 +msgid "_Spelling Suggestions" +msgstr "_Iingcebiso ngopelo magama" + +#: ../libempathy-gtk/empathy-chat.c:2464 +msgid "Failed to retrieve recent logs" +msgstr "Ayiphumelelanga ukufumana ababesanda kungena" + +#: ../libempathy-gtk/empathy-chat.c:2601 +#, c-format +msgid "%s has disconnected" +msgstr "%s iqhawukile" + +#. translators: reverse the order of these arguments +#. * if the kicked should come before the kicker in your locale. +#. +#: ../libempathy-gtk/empathy-chat.c:2608 +#, c-format +msgid "%1$s was kicked by %2$s" +msgstr "%1$s ikhatywe ngu-%2$s" + +#: ../libempathy-gtk/empathy-chat.c:2611 +#, c-format +msgid "%s was kicked" +msgstr "i-%s iye yakhatywa" + +#. translators: reverse the order of these arguments +#. * if the banned should come before the banner in your locale. +#. +#: ../libempathy-gtk/empathy-chat.c:2619 +#, c-format +msgid "%1$s was banned by %2$s" +msgstr "%1$s itshiswe ngu-%2$s" + +#: ../libempathy-gtk/empathy-chat.c:2622 +#, c-format +msgid "%s was banned" +msgstr "i-%s iyeyatshiswa" + +#: ../libempathy-gtk/empathy-chat.c:2626 +#, c-format +msgid "%s has left the room" +msgstr "u-%s umkile egumbini" + +#. Note to translators: this string is appended to +#. * notifications like "foo has left the room", with the message +#. * given by the user living the room. If this poses a problem, +#. * please let us know. :-) +#. +#: ../libempathy-gtk/empathy-chat.c:2635 +#, c-format +msgid " (%s)" +msgstr " (%s)" + +#: ../libempathy-gtk/empathy-chat.c:2660 +#, c-format +msgid "%s has joined the room" +msgstr "u-%s ungenile endlini" + +#: ../libempathy-gtk/empathy-chat.c:2685 +#, c-format +msgid "%s is now known as %s" +msgstr "u-%s ngoku waziwa njengo- %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:2846 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 +msgid "Disconnected" +msgstr "Uqhawukile" + +#. Add message +#: ../libempathy-gtk/empathy-chat.c:3492 +msgid "Would you like to store this password?" +msgstr "Ungathanda ukugcina igama lokuthela?" + +#: ../libempathy-gtk/empathy-chat.c:3498 +msgid "Remember" +msgstr "Khumbula" + +#: ../libempathy-gtk/empathy-chat.c:3508 +msgid "Not now" +msgstr "Hayi ngoku" + +#: ../libempathy-gtk/empathy-chat.c:3552 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 +msgid "Retry" +msgstr "Zama kwakhona" + +#: ../libempathy-gtk/empathy-chat.c:3556 +msgid "Wrong password; please try again:" +msgstr "Igama lokuthela; nceda uzame kwakhona:" + +#. Add message +#: ../libempathy-gtk/empathy-chat.c:3686 +msgid "This room is protected by a password:" +msgstr "Eli gumbi likhuselwe ngegama lokuthela:" + +#: ../libempathy-gtk/empathy-chat.c:3713 +msgid "Join" +msgstr "Dibanisa" + +#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301 +msgid "Connected" +msgstr "Unxulumene" + +#: ../libempathy-gtk/empathy-chat.c:3956 +msgid "Conversation" +msgstr "Ingxoxo" + +#. Translators: this string is a something like +#. * "Escher Cat (SMS)" +#: ../libempathy-gtk/empathy-chat.c:3961 +#, c-format +msgid "%s (SMS)" +msgstr "%s (SMS)" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +msgid "Unknown or invalid identifier" +msgstr "Ayaziwa okanye yimbonisi engekho" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +msgid "Contact blocking temporarily unavailable" +msgstr "Isinqandi sabaqhakamshelani asikho okwexeshana" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +msgid "Contact blocking unavailable" +msgstr "Isinqandi sabaqhakamshelani asikho" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 +msgid "Permission Denied" +msgstr "Imvume ayinikelwanga" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 +msgid "Could not block contact" +msgstr "Ayikwazanga ukunqanda umqhakashelani" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 +msgid "Edit Blocked Contacts" +msgstr "Lungisa uqhakamshelwano olunqandiwe" + +#. Account and Identifier +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:1 +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Account:" +msgstr "I-akhawunti:" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2 +msgid "Blocked Contacts" +msgstr "Uqhakamshelwano olunqandiwe" + +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 +#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-chatrooms-window.ui.h:3 +msgid "Remove" +msgstr "Susa" + +#. Copy Link Address menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:322 +#: ../libempathy-gtk/empathy-webkit-utils.c:277 +msgid "_Copy Link Address" +msgstr "_Kopa idilesi yonxulumaniso" + +#. Open Link menu item +#: ../libempathy-gtk/empathy-chat-text-view.c:329 +#: ../libempathy-gtk/empathy-webkit-utils.c:284 +msgid "_Open Link" +msgstr "_Vula uNxulumaniso" + +#. Translators: timestamp displayed between conversations in +#. * chat windows (strftime format string) +#: ../libempathy-gtk/empathy-chat-text-view.c:417 +msgid "%A %B %d %Y" +msgstr "%A %B %d %Y" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:278 +msgid "Personal Information" +msgstr "Iinkcukacha ngam" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:379 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +msgid "New Contact" +msgstr "Abatsha oqhagamshelana nabo" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:448 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 +#, c-format +msgid "Block %s?" +msgstr "Nqanda u-%s?" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:453 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#, c-format +msgid "Are you sure you want to block '%s' from contacting you again?" +msgstr "Uqinisekile ufuna ukumnqanda u-'%s' ekuqhakamshelaneni nawe kwakhona?" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:458 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +msgid "_Block" +msgstr "_Nqanda" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:476 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +msgid "_Report this contact as abusive" +msgid_plural "_Report these contacts as abusive" +msgstr[0] "_Xela lo mqhakashelani njengohlukumezayo" +msgstr[1] "_Xela aba baqhakamshelani njengabahlukumezayo" + +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 +msgid "Decide _Later" +msgstr "Tha_tha isigqibo nelinye ixesha" + +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 +msgid "Subscription Request" +msgstr "Isicelo sokungena" + +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "_Block User" +msgstr "_Vala umsebenzisi" + +#. Title +#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 +msgid "Search contacts" +msgstr "Khangela abaqhakamshelani" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 +msgid "Search: " +msgstr "Khangela: " + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 +msgid "_Add Contact" +msgstr "_Faka unxibelelwano" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 +msgid "No contacts found" +msgstr "Akukho nxibelelwano olufunyenwe" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 +msgid "Your message introducing yourself:" +msgstr "Umyalezo owazisa wena:" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 +msgid "Please let me see when you're online. Thanks!" +msgstr "Ndicela undibonise xa ungenile. Ekosi!" + +#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-individual-widget.c:304 +msgid "Channels:" +msgstr "Imijelo:" + +#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-individual-widget.c:455 +msgid "Country ISO Code:" +msgstr "I-ISO khowudi yelizwe:" + +#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-individual-widget.c:457 +msgid "Country:" +msgstr "Ilizwe:" + +#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-individual-widget.c:459 +msgid "State:" +msgstr "Isigqeba selizwe:" + +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:461 +msgid "City:" +msgstr "Isixeko:" + +#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-individual-widget.c:463 +msgid "Area:" +msgstr "Indawo:" + +#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-individual-widget.c:465 +msgid "Postal Code:" +msgstr "Ikhowudi yokuposa:" + +#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-individual-widget.c:467 +msgid "Street:" +msgstr "Isitalato:" + +#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-individual-widget.c:469 +msgid "Building:" +msgstr "Kuyakhiwa:" + +#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-individual-widget.c:471 +msgid "Floor:" +msgstr "Umgangatho:" + +#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-individual-widget.c:473 +msgid "Room:" +msgstr "Igumbi:" + +#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-individual-widget.c:475 +msgid "Text:" +msgstr "Isiqendu:" + +#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-individual-widget.c:477 +msgid "Description:" +msgstr "Inkcazelo:" + +#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-individual-widget.c:479 +msgid "URI:" +msgstr "URI:" + +#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-individual-widget.c:481 +msgid "Accuracy Level:" +msgstr "Umgangatho olungile:" + +#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-individual-widget.c:483 +msgid "Error:" +msgstr "Imposiso:" + +#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-individual-widget.c:485 +msgid "Vertical Error (meters):" +msgstr "Impazamo esuka phezulu (ii-meter):" + +#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-individual-widget.c:487 +msgid "Horizontal Error (meters):" +msgstr "Impazamo ebubanzi (ii-meter):" + +#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-individual-widget.c:489 +msgid "Speed:" +msgstr "Isantya:" + +#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-individual-widget.c:491 +msgid "Bearing:" +msgstr "Unyamezelo:" + +#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-individual-widget.c:493 +msgid "Climb Speed:" +msgstr "Khwela isantya:" + +#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-individual-widget.c:495 +msgid "Last Updated on:" +msgstr "Yagqityelwa ukuvuselelwa ngo:" + +#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-individual-widget.c:497 +msgid "Longitude:" +msgstr "Ubude:" + +#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-individual-widget.c:499 +msgid "Latitude:" +msgstr "Ubukhulu:" + +#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-individual-widget.c:501 +msgid "Altitude:" +msgstr "Umgama phakathi kwezinto ezimbini:" + +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:15 +msgid "Location" +msgstr "Indawo okukuyo okuthile" + +#. translators: format is "Location, $date" +#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-individual-widget.c:610 +#, c-format +msgid "%s, %s" +msgstr "%s, %s" + +#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-individual-widget.c:659 +#, fuzzy +msgid "%B %e, %Y at %R UTC" +msgstr "%B %e, %Y at %R UTC" + +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 +msgid "Save Avatar" +msgstr "Gcina u-avatar" + +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 +msgid "Unable to save avatar" +msgstr "Ayikwazanga ukugcina i-avatar" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +msgid "Full name" +msgstr "Igama elipheleleyo" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +msgid "Phone number" +msgstr "Umnxeba weselula" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +msgid "E-mail address" +msgstr "Idilesi ye-imeyile" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 +msgid "Website" +msgstr "I-Website" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 +msgid "Birthday" +msgstr "Usuku lokuzalwa" + +#. 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:113 +msgid "Last seen:" +msgstr "Yagqityelwa ukubonwa:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 +msgid "Connected from:" +msgstr "Uqhakamshele uphi:" + +#. FIXME: once Idle implements SimplePresence using this information, we can +#. * and should bin this. +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 +msgid "Away message:" +msgstr "Umyalezo wokubakude:" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +msgid "work" +msgstr "umsebenzi" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +msgid "home" +msgstr "ekhaya" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +msgid "mobile" +msgstr "iselula" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +msgid "voice" +msgstr "ilizwi" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +msgid "preferred" +msgstr "okukhethwayo" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 +msgid "postal" +msgstr "malunga nokuposa" + +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 +msgid "parcel" +msgstr "ipasile" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +msgid "Location at (date)\t" +msgstr "Indawo e (usuku)\t" + +#. Alias +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 +msgid "Alias:" +msgstr "Igama elisisiqhulo:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +msgid "Client Information" +msgstr "Ulwazi lomxhasi" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Client:" +msgstr "Umxhasi:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 +msgid "Contact Details" +msgstr "Inkcukacha zoqhakamshelwano" + +#. Identifier to connect to Instant Messaging network +#. Translators: Identifier to connect to Instant Messaging network +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 +msgid "Identifier:" +msgstr "Umqwalaseli:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +msgid "Information requested…" +msgstr "Iinkcukacha eziceliwe…" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +msgid "OS:" +msgstr "OS:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Version:" +msgstr "Uhlobo:" + +#: ../libempathy-gtk/empathy-groups-widget.c:333 +msgid "Groups" +msgstr "Amaqela" + +#: ../libempathy-gtk/empathy-groups-widget.c:345 +msgid "" +"Select the groups you want this contact to appear in. Note that you can " +"select more than one group or no groups." +msgstr "" +"Khetha iqela olifunayo olu qhakamshelwano eliza kuvela khona. Qaphela " +"ungakhetha ngaphezulu kweqembu elinye okanye ungakhethi qela." + +#: ../libempathy-gtk/empathy-groups-widget.c:364 +msgid "_Add Group" +msgstr "_Dibanisa Iqela" + +#: ../libempathy-gtk/empathy-groups-widget.c:399 +msgctxt "verb in a column header displaying group names" +msgid "Select" +msgstr "Khetha" + +#: ../libempathy-gtk/empathy-groups-widget.c:409 +#: ../src/empathy-main-window.c:1949 +msgid "Group" +msgstr "Yenza iqela" + +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 +msgid "The following identity will be blocked:" +msgid_plural "The following identities will be blocked:" +msgstr[0] "Esi sazisi silandelayo siza kunqandwa:" +msgstr[1] "Ezi zazisi zilandelayo ziza kunqandwa:" + +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 +msgid "The following identity can not be blocked:" +msgid_plural "The following identities can not be blocked:" +msgstr[0] "Esi sazisi silandelayo siza sinqandwa:" +msgstr[1] "Ezi zazisi zilandelayo zinganqandwa:" + +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "Hlela ulwazi lonxibelelwano" + +#. Translators: the heading at the top of the Information dialogue +#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 +msgid "Linked Contacts" +msgstr "Uqhakamshelwano oludityanisiwe" + +#: ../libempathy-gtk/empathy-individual-linker.c:372 +msgid "Select contacts to link" +msgstr "Khetha abaqhakamshelani ozakubadibanisa" + +#: ../libempathy-gtk/empathy-individual-linker.c:447 +msgid "New contact preview" +msgstr "Abaqhakamshelani abathathi jonga" + +#: ../libempathy-gtk/empathy-individual-linker.c:491 +msgid "Contacts selected in the list on the left will be linked together." +msgstr "Uqhakamshelwano olukhethwe kuluhlu enxele luza kudityaniswa kunye." + +#. 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:181 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../libempathy-gtk/empathy-individual-menu.c:363 +msgid "Select account to use to place the call" +msgstr "Khetha i-akhawunti oza kuyisebenzisa ukutsala umnxeba" + +#. translators: Call is a noun. This string is used in the window +#. * title +#: ../libempathy-gtk/empathy-individual-menu.c:367 +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-call-window.ui.h:2 +msgid "Call" +msgstr "Biza" + +#: ../libempathy-gtk/empathy-individual-menu.c:432 +msgid "Mobile" +msgstr "Iselula" + +#: ../libempathy-gtk/empathy-individual-menu.c:434 +msgid "Work" +msgstr "Umsebenzi" + +#: ../libempathy-gtk/empathy-individual-menu.c:436 +msgid "HOME" +msgstr "EKHAYA" + +#: ../libempathy-gtk/empathy-individual-menu.c:677 +msgid "_Block Contact" +msgstr "U_qhakamshelwano olunqandiwe" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-main-window-menubar.ui.h:16 +msgid "_Chat" +msgstr "U_thetho" + +#. add SMS button +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 +msgid "_SMS" +msgstr "I-_SMS" + +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "Umnxeba weleli_zwi" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +msgctxt "menu item" +msgid "_Video Call" +msgstr "Incoko ye_vidiyo" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-main-window-menubar.ui.h:27 +msgid "_Previous Conversations" +msgstr "I_Ngxoxo ephelileyo" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +msgid "Send File" +msgstr "Thumela ifayile" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "Yabelana nge-desktop" + +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "Okuthandwa kakhulu" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "Ii_nkcukacha" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 +msgctxt "Edit individual (contextual menu)" +msgid "_Edit" +msgstr "Hl_ela" + +#. Translators: this is a verb meaning "to connect two contacts together +#. * to form a meta-contact". +#: ../libempathy-gtk/empathy-individual-menu.c:1385 +msgctxt "Link individual (contextual menu)" +msgid "_Link Contacts…" +msgstr "_Dibanisa uqhakamshelwano…" + +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1011 +msgid "Inviting you to this room" +msgstr "Ndiyakumema kwindlu" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +msgid "_Invite to Chat Room" +msgstr "_Memele endlini yokuxoxa" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-main-window-menubar.ui.h:14 +msgid "_Add Contact…" +msgstr "_Faka unxibelelwano…" + +#: ../libempathy-gtk/empathy-individual-view.c:2355 +msgid "Delete and _Block" +msgstr "Sasa kwaye u_nqande" + +#: ../libempathy-gtk/empathy-individual-view.c:2390 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "Ingaba ufuna nyani ukususa iqela eliyi-'%s'?" + +#: ../libempathy-gtk/empathy-individual-view.c:2393 +msgid "Removing group" +msgstr "Susa iqela" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2448 +#: ../libempathy-gtk/empathy-individual-view.c:2665 +msgid "_Remove" +msgstr "_Susa" + +#: ../libempathy-gtk/empathy-individual-view.c:2525 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "Uyafuna ngenene ukususa umbhexeshi uqhakamshelwano '%s'?" + +#: ../libempathy-gtk/empathy-individual-view.c:2534 +#, 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 "" +"Ingaba uyafuna nyhani ukusasa uqhakamshelwano oluqhakamshelwe '%s'? Qaphela " +"ukuba le nto iza kusuza lonke uqhakamshelwano olenza oluqhakamshelwano " +"ludibeneyo." + +#: ../libempathy-gtk/empathy-individual-view.c:2546 +msgid "Removing contact" +msgstr "Susa uqhakamshelwano" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 +#, c-format +msgid "Linked contact containing %u contact" +msgid_plural "Linked contacts containing %u contacts" +msgstr[0] "Uqhakamshelwano oludityanisiwe lune-%u qhakamshelwano" +msgstr[1] "Uqhakamshelwano oludityanisiwe lune-%u qhakamshelwano" + +#: ../libempathy-gtk/empathy-individual-widget.ui.h:1 +msgid "Location at (date)" +msgstr "Indawo e (usuku)" + +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +msgid "Online from a phone or mobile device" +msgstr "Ungene ngemfonomfono okanye ngolunye uhlobo lweselula" + +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +msgid "New Network" +msgstr "Uthungelwano olutsha" + +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +msgid "Choose an IRC network" +msgstr "Khatha uthungelwano olutsha lwe-IRC" + +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +msgid "Reset _Networks List" +msgstr "Phinda ulungise uluhlu _lothungelwano olutsha" + +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +msgctxt "verb displayed on a button to select an IRC network" +msgid "Select" +msgstr "Khetha" + +#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +msgid "new server" +msgstr "iseva entsha" + +#: ../libempathy-gtk/empathy-irc-network-dialog.c:535 +msgid "SSL" +msgstr "I-SSL" + +#. Translators: this is the title of the linking dialogue (reached by +#. * right-clicking on a contact and selecting "Link…"). "Link" in this title +#. * is a verb. +#: ../libempathy-gtk/empathy-linking-dialog.c:115 +msgid "Link Contacts" +msgstr "Dibanisa abaqhakamshelwano" + +#: ../libempathy-gtk/empathy-linking-dialog.c:120 +msgctxt "Unlink individual (button)" +msgid "_Unlink…" +msgstr "_Qhawula unxulumaniso…" + +#: ../libempathy-gtk/empathy-linking-dialog.c:121 +msgid "" +"Completely split the displayed linked contacts into the separate contacts." +msgstr "" +"Lohlulwe ngokupheleleyo imboniso yoqhakamshelwano oludityanisiwe ukuya " +"kuqhakamshelana olahwluliwe loqhakamshelwano." + +#. Add button +#. Translators: this is an action button in the linking dialogue. "Link" is +#. * used here as a verb meaning "to connect two contacts to form a +#. * meta-contact". +#: ../libempathy-gtk/empathy-linking-dialog.c:136 +msgid "_Link" +msgstr "_Unxulumaniso" + +#: ../libempathy-gtk/empathy-linking-dialog.c:183 +#, c-format +msgid "Unlink linked contacts '%s'?" +msgstr "Ziluqhawula unxulumaniso lwabaqhakamshelaniswa '%s'?" + +#: ../libempathy-gtk/empathy-linking-dialog.c:186 +msgid "" +"Are you sure you want to unlink these linked contacts? This will completely " +"split the linked contacts into separate contacts." +msgstr "" +"Uqinisekile ufuna ukulwehlula olu qhakamshelwano ludityanisiwe? Le nto iza " +"kwehlula uqhakamshelwano olwehlulwe tu zibeluqhakamshelwano olwahlukene." + +#: ../libempathy-gtk/empathy-linking-dialog.c:190 +msgctxt "Unlink individual (button)" +msgid "_Unlink" +msgstr "_Qhawula unxulumaniso" + +#: ../libempathy-gtk/empathy-log-window.c:622 +msgid "History" +msgstr "Imbali" + +#: ../libempathy-gtk/empathy-log-window.c:677 +msgid "Show" +msgstr "Bonisa" + +#: ../libempathy-gtk/empathy-log-window.c:699 +msgid "Search" +msgstr "Khangela" + +#: ../libempathy-gtk/empathy-log-window.c:1150 +#, c-format +msgid "Chat in %s" +msgstr "Xoxa kwi-%s" + +#: ../libempathy-gtk/empathy-log-window.c:1152 +#, c-format +msgid "Chat with %s" +msgstr "Xoxa nge-%s" + +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 +msgctxt "A date with the time" +msgid "%A, %e %B %Y %X" +msgstr "%A, %e %B %Y %X" + +#. Translators: this is an emote: '* Danielle waves' +#: ../libempathy-gtk/empathy-log-window.c:1291 +#, c-format, fuzzy +msgid "* %s %s" +msgstr "ngu-* %s %s" + +#. Translators: this is a message: 'Danielle: hello' +#. * The string in bold is the sender's name +#: ../libempathy-gtk/empathy-log-window.c:1297 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: ../libempathy-gtk/empathy-log-window.c:1373 +#, c-format +msgid "%s second" +msgid_plural "%s seconds" +msgstr[0] "umzuzwana oyi-%s" +msgstr[1] "imizuzwana eyi-%s" + +#: ../libempathy-gtk/empathy-log-window.c:1380 +#, c-format +msgid "%s minute" +msgid_plural "%s minutes" +msgstr[0] "umzuzu oyi-%s " +msgstr[1] "imizuzu eyi-%s " + +#: ../libempathy-gtk/empathy-log-window.c:1388 +#, c-format +msgid "Call took %s, ended at %s" +msgstr "Umnxeba uthathe %s waphela ngo-%s" + +#: ../libempathy-gtk/empathy-log-window.c:1722 +msgid "Today" +msgstr "Namhlanje" + +#: ../libempathy-gtk/empathy-log-window.c:1726 +msgid "Yesterday" +msgstr "Izolo" + +#. Translators: A date such as '23 May 2010' (strftime format) +#: ../libempathy-gtk/empathy-log-window.c:1741 +msgid "%e %B %Y" +msgstr "yi-%e ka-%B ngo-%Y" + +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 +msgid "Anytime" +msgstr "Nanini" + +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 +msgid "Anyone" +msgstr "Nabani" + +#: ../libempathy-gtk/empathy-log-window.c:2715 +msgid "Who" +msgstr "Ubani" + +#: ../libempathy-gtk/empathy-log-window.c:2924 +msgid "When" +msgstr "Phi" + +#: ../libempathy-gtk/empathy-log-window.c:3040 +msgid "Anything" +msgstr "Nantoni na" + +#: ../libempathy-gtk/empathy-log-window.c:3042 +msgid "Text chats" +msgstr "Incoko yombhalo" + +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:4 +msgid "Calls" +msgstr "Amaxa okubiza" + +#: ../libempathy-gtk/empathy-log-window.c:3049 +msgid "Incoming calls" +msgstr "Umnxeba ongenayo" + +#: ../libempathy-gtk/empathy-log-window.c:3050 +msgid "Outgoing calls" +msgstr "Umnxeba ophumela ngaphandle" + +#: ../libempathy-gtk/empathy-log-window.c:3051 +msgid "Missed calls" +msgstr "Unxulumano oluphosiweyo" + +#: ../libempathy-gtk/empathy-log-window.c:3073 +msgid "What" +msgstr "Intoni" + +#: ../libempathy-gtk/empathy-log-window.c:3782 +msgid "Are you sure you want to delete all logs of previous conversations?" +msgstr "Uqinisekile ufuna ukuzicima zonke ii-logs zeengxoxo ezidlulileyo?" + +#: ../libempathy-gtk/empathy-log-window.c:3786 +msgid "Clear All" +msgstr "Cima zonke" + +#: ../libempathy-gtk/empathy-log-window.c:3793 +msgid "Delete from:" +msgstr "Cima okusuka:" + +#: ../libempathy-gtk/empathy-log-window.ui.h:1 +msgid "Loading..." +msgstr "Iyafaka..." + +#: ../libempathy-gtk/empathy-log-window.ui.h:3 +#: ../src/empathy-chat-window.ui.h:3 +msgid "Chat" +msgstr "Uthetho" + +#: ../libempathy-gtk/empathy-log-window.ui.h:4 +msgid "Delete All History..." +msgstr "Cima yonke imbali..." + +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +msgid "Profile" +msgstr "Inkangeleko" + +#: ../libempathy-gtk/empathy-log-window.ui.h:6 +#: ../src/empathy-call-window.ui.h:22 +#: ../src/empathy-streamed-media-window.ui.h:20 +msgid "Video" +msgstr "Ividiyo" + +#: ../libempathy-gtk/empathy-log-window.ui.h:7 +#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 +#: ../src/empathy-main-window-menubar.ui.h:20 +msgid "_Edit" +msgstr "Hl_ela" + +#: ../libempathy-gtk/empathy-log-window.ui.h:8 +msgid "_File" +msgstr "I_fayile" + +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "page 2" +msgstr "iphepha lesi-2" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 +msgid "The contact is offline" +msgstr "Umqhakashelani akafumaneki" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 +msgid "The specified contact is either invalid or unknown" +msgstr "Olu qhakamshelwano lucahziwe ingaba alikho okanye alaziwa" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 +msgid "The contact does not support this kind of conversation" +msgstr "Uqhakamshelwano aluluxhasi olu hlobo lwengxoxo" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 +msgid "The requested functionality is not implemented for this protocol" +msgstr "Intsebenzo eceliwe ayenziwa kule-protocol" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 +msgid "Could not start a conversation with the given contact" +msgstr "Andikwazanga ukuqala ingxoxo ngoqhakamshelwano endilunikiwe" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 +msgid "You are banned from this channel" +msgstr "Ukhutshiwe kule nkqubo" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 +msgid "This channel is full" +msgstr "Le nkqubo igcwele" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 +msgid "You must be invited to join this channel" +msgstr "Kufuneka umenywe ukungena kule nkqubo" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 +msgid "Can't proceed while disconnected" +msgstr "Awunawkwazi ukuqhubeka ungadityaniswanga" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 +msgid "Permission denied" +msgstr "Imvume ikhatyiwe" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 +msgid "There was an error starting the conversation" +msgstr "Kubekho ingxaki ekuqaleni ingxoxo" + +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 +msgid "Enter a contact identifier or phone number:" +msgstr "Faka into eqaphela uqhakamshelwano okanye inombolo yefowni:" + +#. Tweak the dialog +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 +msgid "New Conversation" +msgstr "Ingxoxo entsha" + +#. add video button +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +msgid "_Video Call" +msgstr "Umnxeba we_vidiyo" + +#. add audio button +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 +msgid "_Audio Call" +msgstr "Umnxeba weleli_zwi" + +#. Tweak the dialog +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 +msgid "New Call" +msgstr "Umnxeba omtsha" + +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, fuzzy, c-format +#| msgid "Authentication failed" +msgid "Authentification failed for account %s" +msgstr "Uqinisekiso aluphumelelanga" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 +#, c-format +msgid "" +"Enter your password for account\n" +"%s" +msgstr "" +"Faka igama lokuthela yakho ye-akhawunti\n" +"%s" + +#. COL_STATUS_TEXT +#. COL_STATE_ICON_NAME +#. COL_STATE +#. COL_DISPLAY_MARKUP +#. COL_STATUS_CUSTOMISABLE +#. COL_TYPE +#: ../libempathy-gtk/empathy-presence-chooser.c:167 +#: ../libempathy-gtk/empathy-presence-chooser.c:203 +msgid "Custom Message…" +msgstr "Umyalezo omile…" + +#: ../libempathy-gtk/empathy-presence-chooser.c:220 +#: ../libempathy-gtk/empathy-presence-chooser.c:222 +msgid "Edit Custom Messages…" +msgstr "Lungisa umyalezo omile…" + +#: ../libempathy-gtk/empathy-presence-chooser.c:345 +msgid "Click to remove this status as a favorite" +msgstr "Cofa ukususa esi-status njengosithanda kakhulu" + +#: ../libempathy-gtk/empathy-presence-chooser.c:354 +msgid "Click to make this status a favorite" +msgstr "Cofa ukwenza esi-status njengosithanda kakhulu" + +#: ../libempathy-gtk/empathy-presence-chooser.c:388 +msgid "Set status" +msgstr "Ummiselo wobume" + +#. Custom messages +#: ../libempathy-gtk/empathy-presence-chooser.c:1135 +msgid "Custom messages…" +msgstr "Umyalezo omile…" + +#. Create account +#. To translator: %s is the name of the protocol, such as "Google Talk" or +#. * "Yahoo!" +#. +#: ../libempathy-gtk/empathy-protocol-chooser.c:584 +#, c-format +msgid "New %s account" +msgstr "Akhawunti entsha ka-%s" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:1 +msgid "Find:" +msgstr "Fumanisa:" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:2 +msgid "Mat_ch case" +msgstr "Ngqa_manisa unobumba" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:3 +msgid "Phrase not found" +msgstr "Ibinzana lamagama alifunyenwanga" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "_Next" +msgstr "_Landelayo" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:5 +msgid "_Previous" +msgstr "_Engaphambili" + +#: ../libempathy-gtk/empathy-sound-manager.c:51 +msgid "Received an instant message" +msgstr "Ufumene umyalezo okhawulezayo" + +#: ../libempathy-gtk/empathy-sound-manager.c:53 +msgid "Sent an instant message" +msgstr "Thumela umyalezo okhawulezayo" + +#: ../libempathy-gtk/empathy-sound-manager.c:55 +msgid "Incoming chat request" +msgstr "Kukhona isicelo sengxoxo esigenayo" + +#: ../libempathy-gtk/empathy-sound-manager.c:57 +msgid "Contact connected" +msgstr "Unxibelelwano alunxulunyaniswanga" + +#: ../libempathy-gtk/empathy-sound-manager.c:59 +msgid "Contact disconnected" +msgstr "Unxibelelwano alunxulunyaniswanga" + +#: ../libempathy-gtk/empathy-sound-manager.c:61 +msgid "Connected to server" +msgstr "Qhagamshela kwiseva" + +#: ../libempathy-gtk/empathy-sound-manager.c:63 +msgid "Disconnected from server" +msgstr "Qhagamshela kwiseva" + +#: ../libempathy-gtk/empathy-sound-manager.c:65 +msgid "Incoming voice call" +msgstr "Umxeba ongenayo" + +#: ../libempathy-gtk/empathy-sound-manager.c:67 +msgid "Outgoing voice call" +msgstr "Umxeba ophumayo" + +#: ../libempathy-gtk/empathy-sound-manager.c:69 +msgid "Voice call ended" +msgstr "Umnxeba welizwi uphelile" + +#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +msgid "Edit Custom Messages" +msgstr "Lungisa umyalezo omile" + +#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#, c-format +msgid "Message edited at %s" +msgstr "Umyalezo ulungiswe ngo-%s" + +#: ../libempathy-gtk/empathy-theme-adium.c:1752 +msgid "Normal" +msgstr "Okuqhelekileyo" + +#: ../libempathy-gtk/empathy-theme-manager.c:70 +msgid "Classic" +msgstr "Udidi" + +#: ../libempathy-gtk/empathy-theme-manager.c:71 +msgid "Simple" +msgstr "Ngendlela elula" + +#: ../libempathy-gtk/empathy-theme-manager.c:72 +msgid "Clean" +msgstr "Coca" + +#: ../libempathy-gtk/empathy-theme-manager.c:73 +msgid "Blue" +msgstr "Luhlaza" + +#: ../libempathy-gtk/empathy-tls-dialog.c:150 +msgid "The identity provided by the chat server cannot be verified." +msgstr "Isazisi esinikwe yiseva yokuxoxa ayinakunqinwa." + +#: ../libempathy-gtk/empathy-tls-dialog.c:157 +msgid "The certificate is not signed by a Certification Authority." +msgstr "Isetifiketi asisayinwanga nguMphathi ovumela izatifiketi." + +#: ../libempathy-gtk/empathy-tls-dialog.c:161 +msgid "The certificate has expired." +msgstr "Esi satifiketi sele siphelelwe lixesha." + +#: ../libempathy-gtk/empathy-tls-dialog.c:164 +msgid "The certificate hasn't yet been activated." +msgstr "Esi satifiketi asikavuselelwa." + +#: ../libempathy-gtk/empathy-tls-dialog.c:167 +msgid "The certificate does not have the expected fingerprint." +msgstr "Isatifiketi asinawo umnwe ogximfisiwe olindelwa." + +#: ../libempathy-gtk/empathy-tls-dialog.c:170 +msgid "The hostname verified by the certificate doesn't match the server name." +msgstr "I-hostname ephindiweyo sisatifiketi ayidibani negama leseva." + +#: ../libempathy-gtk/empathy-tls-dialog.c:174 +msgid "The certificate is self-signed." +msgstr "Isetifiketi usisayine ngokwakhe." + +#: ../libempathy-gtk/empathy-tls-dialog.c:177 +msgid "" +"The certificate has been revoked by the issuing Certification Authority." +msgstr "Isatifiketi saliwe ngabaNegunya lokukhupha izatifiketi." + +#: ../libempathy-gtk/empathy-tls-dialog.c:181 +msgid "The certificate is cryptographically weak." +msgstr "Isatifiketi sithambe crypotographically." + +#: ../libempathy-gtk/empathy-tls-dialog.c:184 +msgid "The certificate length exceeds verifiable limits." +msgstr "Ubude besatifiketi buyedlula kumda ongaphinde ujongeke." + +#: ../libempathy-gtk/empathy-tls-dialog.c:188 +msgid "The certificate is malformed." +msgstr "Isiqinisekiso siyasebenza." + +#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#, c-format +msgid "Expected hostname: %s" +msgstr "I-hostname elindelekileyo: %s" + +#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#, c-format +msgid "Certificate hostname: %s" +msgstr "Isatifiketi se-hostname: %s" + +#: ../libempathy-gtk/empathy-tls-dialog.c:281 +msgid "Continue" +msgstr "Qhubekeka" + +#: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "This connection is untrusted. Would you like to continue anyway?" +msgstr "Uqhakamshelwano aluthenjwa. Ungathanda ukuqhubeka kunjalo?" + +#: ../libempathy-gtk/empathy-tls-dialog.c:297 +msgid "Remember this choice for future connections" +msgstr "Khumbula olu khetho ukwenzela unxibelelwano oluzayo" + +#: ../libempathy-gtk/empathy-tls-dialog.c:303 +msgid "Certificate Details" +msgstr "Iinkcukacha zesatifiketi" + +#: ../libempathy-gtk/empathy-ui-utils.c:1742 +msgid "Unable to open URI" +msgstr "Ayikwazi ukuvula URI" + +#: ../libempathy-gtk/empathy-ui-utils.c:1860 +msgid "Select a file" +msgstr "Khetha ifayile" + +#: ../libempathy-gtk/empathy-ui-utils.c:1935 +msgid "Insufficient free space to save file" +msgstr "Akukho ndawo yokugcina ifayile" + +#: ../libempathy-gtk/empathy-ui-utils.c:1943 +#, c-format +msgid "" +"%s of free space are required to save this file, but only %s is available. " +"Please choose another location." +msgstr "" +"%s zesithuba esingasebezanga siyafuneka ukugcina lefayile, kodwa kuphela %s " +"iyafumaneka. Nceda ukhethe enye indawo." + +#: ../libempathy-gtk/empathy-ui-utils.c:1987 +#, c-format +msgid "Incoming file from %s" +msgstr "Ifayile engenayo osuka ku-%s" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +msgid "Current Locale" +msgstr "I-Locale yaNgoku" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:161 +#: ../libempathy-gtk/totem-subtitle-encoding.c:163 +#: ../libempathy-gtk/totem-subtitle-encoding.c:165 +#: ../libempathy-gtk/totem-subtitle-encoding.c:167 +msgid "Arabic" +msgstr "isiArab" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +msgid "Armenian" +msgstr "isiArmenian" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:173 +#: ../libempathy-gtk/totem-subtitle-encoding.c:175 +#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +msgid "Baltic" +msgstr "isiBaltic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +msgid "Celtic" +msgstr "isiCeltic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:183 +#: ../libempathy-gtk/totem-subtitle-encoding.c:185 +#: ../libempathy-gtk/totem-subtitle-encoding.c:187 +#: ../libempathy-gtk/totem-subtitle-encoding.c:189 +msgid "Central European" +msgstr "iYurophu eseMbindini" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:192 +#: ../libempathy-gtk/totem-subtitle-encoding.c:194 +#: ../libempathy-gtk/totem-subtitle-encoding.c:196 +#: ../libempathy-gtk/totem-subtitle-encoding.c:198 +msgid "Chinese Simplified" +msgstr "Ummi waseChina wokwenene" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:201 +#: ../libempathy-gtk/totem-subtitle-encoding.c:203 +#: ../libempathy-gtk/totem-subtitle-encoding.c:205 +msgid "Chinese Traditional" +msgstr "Isiko lwamaChina" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +msgid "Croatian" +msgstr "isiCroatian" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:211 +#: ../libempathy-gtk/totem-subtitle-encoding.c:213 +#: ../libempathy-gtk/totem-subtitle-encoding.c:215 +#: ../libempathy-gtk/totem-subtitle-encoding.c:217 +#: ../libempathy-gtk/totem-subtitle-encoding.c:219 +#: ../libempathy-gtk/totem-subtitle-encoding.c:221 +msgid "Cyrillic" +msgstr "isiCyrillic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +msgid "Cyrillic/Russian" +msgstr "isiCyria/isiRussia" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:227 +#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +msgid "Cyrillic/Ukrainian" +msgstr "isiCyria isi-Ukraine" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +msgid "Georgian" +msgstr "isiGeorgia" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:235 +#: ../libempathy-gtk/totem-subtitle-encoding.c:237 +#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +msgid "Greek" +msgstr "isiGrike" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +msgid "Gujarati" +msgstr "isiGujarati" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +msgid "Gurmukhi" +msgstr "isiGurmukhi" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:248 +#: ../libempathy-gtk/totem-subtitle-encoding.c:250 +#: ../libempathy-gtk/totem-subtitle-encoding.c:252 +#: ../libempathy-gtk/totem-subtitle-encoding.c:254 +msgid "Hebrew" +msgstr "isiHebheru" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +msgid "Hebrew Visual" +msgstr "Umfanekiso wesiHebhere" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +msgid "Hindi" +msgstr "isiHindi" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +msgid "Icelandic" +msgstr "isiIcelandic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:266 +#: ../libempathy-gtk/totem-subtitle-encoding.c:268 +#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +msgid "Japanese" +msgstr "isiJapanese" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:273 +#: ../libempathy-gtk/totem-subtitle-encoding.c:275 +#: ../libempathy-gtk/totem-subtitle-encoding.c:277 +#: ../libempathy-gtk/totem-subtitle-encoding.c:279 +msgid "Korean" +msgstr "isiKorea" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +msgid "Nordic" +msgstr "isiNordic" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +msgid "Persian" +msgstr "umPersia" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:288 +#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +msgid "Romanian" +msgstr "isiRomanian" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +msgid "South European" +msgstr "Ummi wakuMzantsi Yurophu" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +msgid "Thai" +msgstr "isiThai" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:299 +#: ../libempathy-gtk/totem-subtitle-encoding.c:301 +#: ../libempathy-gtk/totem-subtitle-encoding.c:303 +#: ../libempathy-gtk/totem-subtitle-encoding.c:305 +msgid "Turkish" +msgstr "isiTurkish" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:308 +#: ../libempathy-gtk/totem-subtitle-encoding.c:310 +#: ../libempathy-gtk/totem-subtitle-encoding.c:312 +#: ../libempathy-gtk/totem-subtitle-encoding.c:314 +#: ../libempathy-gtk/totem-subtitle-encoding.c:316 +msgid "Unicode" +msgstr "I-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 +msgid "Western" +msgstr "isiNtshona" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:330 +#: ../libempathy-gtk/totem-subtitle-encoding.c:332 +#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +msgid "Vietnamese" +msgstr "isiVietnamese" + +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 +msgid "No error message" +msgstr "Ukukho myalezo wempazamo" + +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 +msgid "Instant Message (Empathy)" +msgstr "Umyalezo wangoku (u-Empathy)" + +#: ../src/empathy.c:437 +msgid "Don't connect on startup" +msgstr "Sudibanisa ekuqaleni" + +#: ../src/empathy.c:441 +msgid "Don't display the contact list or any other dialogs on startup" +msgstr "Sulibonisa uluhlu labaqhakamshelwayo okanye naziphi iingxoxo ekuqaleni" + +#: ../src/empathy.c:456 +msgid "- Empathy IM Client" +msgstr "- U-Empathy u-IM Mxhasi" + +#: ../src/empathy.c:643 +msgid "Error contacting the Account Manager" +msgstr "Impazamo ekuqhakamshelaneninompathi we-akhawunti" + +#: ../src/empathy.c:645 +#, c-format +msgid "" +"There was an error while trying to connect to the Telepathy Account Manager. " +"The error was:\n" +"\n" +"%s" +msgstr "" +"Kubekhona ingxaki xa ubuzama ukuqhakamshelana noMphathi we-akhawunti " +"yeTelepathy. Ingaki ibe yi:\n" +"\n" +"%s" + +#: ../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 "" +"U-Empathy yi-software yamahala; ungayisasaza kunye /okanye wenze utshintsho " +"ngaphantsi kwemmibandela ka-GNU General Public License ngokupapashiwe yi-" +"Free Software Foundation; okanye uhlobo lwesi-2 lelayisensi (kukukhetha " +"kwakho) naluphi uhlobo lamva." + +#: ../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 "" +"U-Empathy sisasazwa ngenjongo zokuba iza kubaluncedo, ngodwa ngaphandle " +"kwesiqinisekiso; ngaphandle kwesiqinisekiso esizanywayo sothengiso okanye " +"ukulungela iinjogo ezithile. Ukuze ufumane iinkcukacha ezithe xaxe bona " +"ilayisensi ka-GNU yasekuhlaleni nje." + +#: ../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 "" +"Kufuneka ukuba uyifumene ikopi ka-GNU General Public License kunye no-" +"Empathy; ukuba akukho njalo, bhalela kwi-Free Software Foundation, Inc., 51 " +"Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" + +#: ../src/empathy-about-dialog.c:109 +msgid "An Instant Messaging client for GNOME" +msgstr "Umxhasi womyalezo wangoku ka-GNOME" + +#: ../src/empathy-about-dialog.c:115 +msgid "translator-credits" +msgstr "Andiswa Mvanyashe " + +#: ../src/empathy-account-assistant.c:167 +msgid "There was an error while importing the accounts." +msgstr "Kubekhona ingxaki xa ubudlulisela ezi-akhawunti." + +#: ../src/empathy-account-assistant.c:170 +msgid "There was an error while parsing the account details." +msgstr "Kubekhona ingxaki xa ubuhela le-akhawunti." + +#: ../src/empathy-account-assistant.c:173 +msgid "There was an error while creating the account." +msgstr "Kubekhona ingxaki xa ubudala le-akhawunti." + +#: ../src/empathy-account-assistant.c:175 +msgid "There was an error." +msgstr "Bekungekho mpazamo." + +#: ../src/empathy-account-assistant.c:179 +#, c-format +msgid "The error message was: %s" +msgstr "Umyalezo oyingxaki ngu: %s" + +#: ../src/empathy-account-assistant.c:183 +msgid "" +"You can either go back and try to enter your accounts' details again or quit " +"this assistant and add accounts later from the Edit menu." +msgstr "" +"Kungaba uphinda umvu ufake iinkcukacha zee-akhawunti' yakho kwakhona okanye " +"uphume kulo mncedi uphinde ufake ii-akhawunti ngamva kwimenyu yokuhlela." + +#: ../src/empathy-account-assistant.c:220 +#: ../src/empathy-account-assistant.c:1274 +msgid "An error occurred" +msgstr "Kwenzeke imposiso" + +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 +msgid "What kind of chat account do you have?" +msgstr "Loluphi uhlobo lwe-akhawunti yengxoxo onayo?" + +#: ../src/empathy-account-assistant.c:475 +msgid "Do you have any other chat accounts you want to set up?" +msgstr "Unazo ezinye ii-khawunti zengxoxo ofuna ukuyidala?" + +#: ../src/empathy-account-assistant.c:481 +msgid "Enter your account details" +msgstr "Faka iinkcukacha ze-akhawunti" + +#: ../src/empathy-account-assistant.c:486 +msgid "What kind of chat account do you want to create?" +msgstr "Luhlobo luni lwengxelo ye-akhawunti ofuna ukuludala?" + +#: ../src/empathy-account-assistant.c:492 +msgid "Do you want to create other chat accounts?" +msgstr "Uyafuna ukudala ezinye ii-akhawunti zengxoxo?" + +#: ../src/empathy-account-assistant.c:499 +msgid "Enter the details for the new account" +msgstr "Faka iinkcukacha ze-akhawunti entsha" + +#: ../src/empathy-account-assistant.c:614 +msgid "" +"With Empathy you can chat with people online nearby and with friends and " +"colleagues who use Google Talk, AIM, Windows Live and many other chat " +"programs. With a microphone or a webcam you can also have audio or video " +"calls." +msgstr "" +"U-Empathy ungaxoxa nabantu abafumanekayo kufutshane kunye nabahlobo kunye " +"nabantu osebenza nabo abasebenzisa u-Google Talk, AIM, Windows Live kunye " +"namanye amagumbi okuxoxa. Ngomboko okanye nge-webcam ungava ilizwi okanye " +"unxibelelwano lwevidiyo." + +#: ../src/empathy-account-assistant.c:631 +msgid "Do you have an account you've been using with another chat program?" +msgstr "Unayo ikhawunti ubuyisebenzisa kwenye iinkqubo yokuxoxa?" + +#: ../src/empathy-account-assistant.c:655 +msgid "Yes, import my account details from " +msgstr "Ewe, dluliselani iinkcukacha ze-akhawunti yam ezisuka " + +#: ../src/empathy-account-assistant.c:676 +msgid "Yes, I'll enter my account details now" +msgstr "Ewe, ndiza kuzifaka iinkcukacha zam ngoku" + +#: ../src/empathy-account-assistant.c:698 +msgid "No, I want a new account" +msgstr "Hayi, ndifuna i-akhawunti entsha" + +#: ../src/empathy-account-assistant.c:708 +msgid "No, I just want to see people online nearby for now" +msgstr "Hayi, ndifuna ukubona abantu abangenile abakufutshane okwangoku" + +#: ../src/empathy-account-assistant.c:729 +msgid "Select the accounts you want to import:" +msgstr "Khetha ii-akhawunti ofuna ukuyikhuphela:" + +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:625 +#: ../src/empathy-new-chatroom-dialog.c:626 +msgid "Yes" +msgstr "Ewe" + +#: ../src/empathy-account-assistant.c:823 +msgid "No, that's all for now" +msgstr "Hayi, kuko konke okwangoku" + +#: ../src/empathy-account-assistant.c:1088 +msgid "" +"Empathy can automatically discover and chat with the people connected on the " +"same network as you. If you want to use this feature, please check that the " +"details below are correct. You can easily change these details later or " +"disable this feature by using the 'Accounts' dialog" +msgstr "" +"U-Empathy siyakwazi ukuzibuyisela kwaye uxoxe nabantu abaqhakamshelane nawe " +"kuqhakamshelwano olunye. Ukuba ufuna ukusebenzisa ii-feature, nceda ujonge " +"iinkcukacha apha ezantsi ukuba zilungile na. Unako ukuzitshintsha ezi " +"nkcukacha ngamva okanye uzimise ezi-feature ngokusebenzisa 'ii-Akhawunti' " +"yengxoxo" + +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1150 +msgid "Edit->Accounts" +msgstr "Hlela->ii-akhawunti" + +#: ../src/empathy-account-assistant.c:1110 +msgid "I do _not want to enable this feature for now" +msgstr "A_ndifuni kuyimisa le nkqubo okwangoku" + +#: ../src/empathy-account-assistant.c:1146 +msgid "" +"You won't be able to chat with people connected to your local network, as " +"telepathy-salut is not installed. If you want to enable this feature, please " +"install the telepathy-salut package and create a People Nearby account from " +"the Accounts dialog" +msgstr "" +"Awuzukwazi ukuxoxa nabantu abaqhakamshelana nawe kuqhakamshelwano " +"lasekuhlaleni, njengokuba i-telepathy-salut ingafakwanga. Ukuba ufuna " +"ukumisa ezi-feature, nceda ufake ipakethi ye-telepathy-salut kwaye dala ii-" +"akhawunti Yabantu abakufutshane kwingxoxo ye-akhawunti" + +#: ../src/empathy-account-assistant.c:1152 +msgid "telepathy-salut not installed" +msgstr "i-telepathy-salut ayifakwanga" + +#: ../src/empathy-account-assistant.c:1198 +msgid "Messaging and VoIP Accounts Assistant" +msgstr "Imiyalezo kunye nee-akhawunti zoncedo" + +#: ../src/empathy-account-assistant.c:1232 +msgid "Welcome to Empathy" +msgstr "Wamkelekile ku-Empathy" + +#: ../src/empathy-account-assistant.c:1241 +msgid "Import your existing accounts" +msgstr "Dlulisela ii-akhawunti zakho esele zikho" + +#: ../src/empathy-account-assistant.c:1259 +msgid "Please enter personal details" +msgstr "Ndiyacela ufake iinkcukacha ngawe" + +#. The primary text of the dialog shown to the user when he is about to lose +#. * unsaved changes +#: ../src/empathy-accounts-dialog.c:69 +#, c-format +msgid "There are unsaved modifications to your %s account." +msgstr "Kubekhona utshintsho olungagcinwanga kwi-akhawunti yakho %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:73 +msgid "Your new account has not been saved yet." +msgstr "I-akhawunti yakho entsha eyikagcineki okwa ngoku." + +#: ../src/empathy-accounts-dialog.c:352 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 +msgid "Connecting…" +msgstr "Uyadibana…" + +#: ../src/empathy-accounts-dialog.c:393 +#, c-format +msgid "Offline — %s" +msgstr "Uphumile — u-%s" + +#: ../src/empathy-accounts-dialog.c:405 +#, c-format +msgid "Disconnected — %s" +msgstr "Uqhawukile — u- %s" + +#: ../src/empathy-accounts-dialog.c:416 +msgid "Offline — No Network Connection" +msgstr "Uphumile — akukho ndibana nothungelwano" + +#: ../src/empathy-accounts-dialog.c:423 +msgid "Unknown Status" +msgstr "Imeko engaziwayo" + +#: ../src/empathy-accounts-dialog.c:435 +msgid "Offline — Account Disabled" +msgstr "Uphumile — i-akhawunti ivaliwe" + +#: ../src/empathy-accounts-dialog.c:538 +#, fuzzy +#| msgid "Connection has been refused" +msgid "Edit Connection Parameters" +msgstr "Udibaniso aluvunywanga" + +#: ../src/empathy-accounts-dialog.c:701 +msgid "Failed to retrieve your personal information from the server." +msgstr "" + +#: ../src/empathy-accounts-dialog.c:707 +msgid "Go online to edit your personal information." +msgstr "" + +#: ../src/empathy-accounts-dialog.c:792 +msgid "_Edit Connection Parameters..." +msgstr "" + +#: ../src/empathy-accounts-dialog.c:1293 +#, c-format +msgid "Do you want to remove %s from your computer?" +msgstr "Uyafuna ukususa u-%s kwikhompuyitha yakho?" + +#: ../src/empathy-accounts-dialog.c:1297 +msgid "This will not remove your account on the server." +msgstr "Le ayizususa i-akhawunti yakho kwi-seva." + +#: ../src/empathy-accounts-dialog.c:1533 +msgid "" +"You are about to select another account, which will discard\n" +"your changes. Are you sure you want to proceed?" +msgstr "" +"Uza kukhetha i-akhawunti entsha, leyo eza kucima\n" +"itshintsho lwakho. Uqinisekile ufuna ukuqhubeka?" + +#. Menu items: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1744 +msgid "_Enable" +msgstr "_Ukwenza isebenze" + +#: ../src/empathy-accounts-dialog.c:1745 +msgid "_Disable" +msgstr "_Yenza ukuba ingasebenzi" + +#: ../src/empathy-accounts-dialog.c:2255 +msgid "" +"You are about to close the window, which will discard\n" +"your changes. Are you sure you want to proceed?" +msgstr "" +"Uza kuvula ifestile entsha, leyo eza kucima \n" +"itshintsho lwakho. Uqinisekile ufuna ukuqhubeka?" + +#: ../src/empathy-accounts-dialog.ui.h:1 +msgid "Add…" +msgstr "Fakela…" + +#: ../src/empathy-accounts-dialog.ui.h:2 +msgid "Loading account information" +msgstr "Ugcwalisa iinkcukacha ze-akhawunti" + +#: ../src/empathy-accounts-dialog.ui.h:3 +msgid "No protocol installed" +msgstr "Ayikho i-protocla efakiwe" + +#: ../src/empathy-accounts-dialog.ui.h:4 +msgid "Protocol:" +msgstr "Imithetho yokusebenza:" + +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "" +"To add a new account, you first have to install a backend for each protocol " +"you want to use." +msgstr "" +"Ukufaka ikhawunti entsha, kufuneka kuqala ufake i-backend ngeprotocol nganye " +"ofuna ukuyisebenzisa." + +#: ../src/empathy-accounts-dialog.ui.h:7 +msgid "_Import…" +msgstr "_Thatha ngaphandle…" + +#: ../src/empathy-auth-client.c:286 +msgid " - Empathy authentication client" +msgstr " - u-Empathy esigunyazisa umxhasi" + +#: ../src/empathy-auth-client.c:302 +msgid "Empathy authentication client" +msgstr "U-Empathy esigunyazisa umxhasi" + +#: ../src/empathy-auto-salut-account-helper.c:83 +msgid "People nearby" +msgstr "Abantu abakufutshane" + +#: ../src/empathy-av.c:118 ../src/empathy-call.c:193 +msgid "- Empathy Audio/Video Client" +msgstr "- Ilizwi leka-Empathy okanye eloMxhasi vidiyo" + +#: ../src/empathy-av.c:134 ../src/empathy-call.c:218 +msgid "Empathy Audio/Video Client" +msgstr "Ilizwi lika-Empathy okanye eloMxhasi vidiyo" + +#: ../src/empathy-streamed-media-window.c:433 +msgid "Contrast" +msgstr "Umahluko phakathi kwezinto" + +#: ../src/empathy-streamed-media-window.c:436 +msgid "Brightness" +msgstr "Ukukhanya" + +#: ../src/empathy-streamed-media-window.c:439 +msgid "Gamma" +msgstr "Iinkqubo zaxeshanye" + +#: ../src/empathy-streamed-media-window.c:545 +msgid "Volume" +msgstr "Isixa" + +#: ../src/empathy-streamed-media-window.c:1097 +msgid "_Sidebar" +msgstr "_Isixwexwe somgca osecaleni" + +#: ../src/empathy-streamed-media-window.c:1117 +msgid "Audio input" +msgstr "Ungeniso lelizwi" + +#: ../src/empathy-streamed-media-window.c:1121 +msgid "Video input" +msgstr "Ungeniso lwevidiyo" + +#: ../src/empathy-streamed-media-window.c:1129 +msgid "Dialpad" +msgstr "I-dialpad" + +#: ../src/empathy-streamed-media-window.c:1140 +msgid "Details" +msgstr "Iinkcukacha" + +#. translators: Call is a noun and %s is the contact name. This string +#. * is used in the window title +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 +#, c-format +msgid "Call with %s" +msgstr "Biza ngo-%s" + +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 +msgid "The IP address as seen by the machine" +msgstr "Idilesi ye-IP njengokuba ubonile kumeshini" + +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 +msgid "The IP address as seen by a server on the Internet" +msgstr "Idilesi ye-IP njengokuba iboniwe yiseva kwi-intanethi" + +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 +msgid "The IP address of the peer as seen by the other side" +msgstr "Idilesi ye-IP yomata wakho njengokuba iboniwe kwelinye icala" + +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 +msgid "The IP address of a relay server" +msgstr "Idilesi ye-relay yeseva" + +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 +msgid "The IP address of the multicast group" +msgstr "Idilesi ye-IP yeqela le-multicast" + +#: ../src/empathy-streamed-media-window.c:1838 +#: ../src/empathy-streamed-media-window.c:1841 +#: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 +msgctxt "codec" +msgid "Unknown" +msgstr "Okungaziwayo" + +#. Translators: number of minutes:seconds the caller has been connected +#: ../src/empathy-streamed-media-window.c:2139 +#, c-format +msgid "Connected — %d:%02dm" +msgstr "Idibene — ngo-%d:%02dm" + +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 +msgid "Technical Details" +msgstr "Iinkcukacha zobuxhakaxhaka" + +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 +#, c-format +msgid "" +"%s's software does not understand any of the audio formats supported by your " +"computer" +msgstr "" +"Inkqubo ka-%s ayiqondi nanye yeentlobo zamazwi ezixhaswa yikhompuyutha yakho" + +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 +#, c-format +msgid "" +"%s's software does not understand any of the video formats supported by your " +"computer" +msgstr "" +"Inkqubo ka-%s ayiqondi nanye yeentlobo zevidiyo ezixhaswa yikhompuyutha " +"yakho" + +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 +#, 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 "" +"Andikwazi kwenza uqhakamshelwano ku-%s. Omnye wenu angabakuqhakamshelwano " +"olungavumeli uqhakamshelwano oluthe ngqo." + +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 +msgid "There was a failure on the network" +msgstr "Bekukhona umpazamiseko kuthungelwano" + +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 +msgid "" +"The audio formats necessary for this call are not installed on your computer" +msgstr "" +"Iintlobo zamazwi ezifunekayo kulo mnxeba azifakwanga kwikhompuyitha yakho" + +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 +msgid "" +"The video formats necessary for this call are not installed on your computer" +msgstr "" +"Iintlobo zevidiyo ezifunekayo kulo mnxeba azifakwanga kwikhompuyitha yakho" + +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 +#, c-format +msgid "" +"Something unexpected happened in a Telepathy component. Please report this bug and attach logs gathered from the 'Debug' window in " +"the Help menu." +msgstr "" +"Into engalindelekanga yenzekile kwindawo ye-Telepathy. Nceda " +"chaza le-bugkwaye ufake ii-logs ezidityanisiwe kwifestile 'yeSicoci' " +"kwimenyu yoncedo." + +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 +msgid "There was a failure in the call engine" +msgstr "Bekukhona umpazamiseko kwinjini yokufowna" + +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 +msgid "The end of the stream was reached" +msgstr "Isiphelo sokubukela sifikile" + +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 +msgid "Can't establish audio stream" +msgstr "Ayikwazi kwenza ikuveza ilizwi" + +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 +msgid "Can't establish video stream" +msgstr "Ayikwazi ukwenza ukubukela kwevidiyo" + +#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2 +#: ../src/empathy-streamed-media-window.ui.h:1 +msgid "Audio" +msgstr "Ilizwi" + +#: ../src/empathy-call-window.ui.h:3 +#: ../src/empathy-streamed-media-window.ui.h:5 +#, fuzzy +msgid "Decoding Codec:" +msgstr "I-Decoding Codec:" + +#: ../src/empathy-call-window.ui.h:4 +msgid "Disable camera" +msgstr "Yenza ikhamera ingabinako" + +#: ../src/empathy-call-window.ui.h:5 +msgid "Display the dialpad" +msgstr "Bonisa indawo yokucofa" + +#: ../src/empathy-call-window.ui.h:6 +#: ../src/empathy-streamed-media-window.ui.h:9 +#, fuzzy +msgid "Encoding Codec:" +msgstr "I-Encoding Codec:" + +#: ../src/empathy-call-window.ui.h:7 +#: ../src/empathy-streamed-media-window.ui.h:10 +msgid "Hang up" +msgstr "Beka phantsi" + +#: ../src/empathy-call-window.ui.h:8 +#: ../src/empathy-streamed-media-window.ui.h:11 +msgid "Hang up current call" +msgstr "Beka phantsi umnxeba wangoku" + +#: ../src/empathy-call-window.ui.h:9 +#: ../src/empathy-streamed-media-window.ui.h:12 +msgid "Local Candidate:" +msgstr "Umthathei nxaxheba wasekuhlaleni:" + +#: ../src/empathy-call-window.ui.h:10 +msgid "Maximise me" +msgstr "Yandisa mna" + +#: ../src/empathy-call-window.ui.h:11 +msgid "Minimise me" +msgstr "Nciphisa mna" + +#: ../src/empathy-call-window.ui.h:12 +#: ../src/empathy-streamed-media-window.ui.h:15 +msgid "Remote Candidate:" +msgstr "Umthathi-nxaxheba wakufutshane:" + +#: ../src/empathy-call-window.ui.h:13 +#: ../src/empathy-streamed-media-window.ui.h:16 +msgid "Send Audio" +msgstr "Thumela ilizwi" + +#: ../src/empathy-call-window.ui.h:14 +msgid "Send Video" +msgstr "Thumela ividiyo" + +#: ../src/empathy-call-window.ui.h:15 +msgid "Show dialpad" +msgstr "Bonisa indawo yokucofa" + +#: ../src/empathy-call-window.ui.h:16 +msgid "Start a video call" +msgstr "Qalisa umnxeba wevidiyo" + +#: ../src/empathy-call-window.ui.h:17 +msgid "Start an audio call" +msgstr "Qalisa umnxeba welizwi" + +#: ../src/empathy-call-window.ui.h:18 +msgid "Swap camera" +msgstr "Tshintshanisa iikhamera" + +#: ../src/empathy-call-window.ui.h:19 +#: ../src/empathy-streamed-media-window.ui.h:17 +msgid "Toggle audio transmission" +msgstr "Ukwenza ukuba kusebenze ijelo le vidiyo" + +#: ../src/empathy-call-window.ui.h:20 +msgid "Toggle video transmission" +msgstr "Ukwenza ukuba kusebenze ijelo lwevidiyo" + +#: ../src/empathy-call-window.ui.h:21 +#: ../src/empathy-streamed-media-window.ui.h:18 +#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 +msgid "Unknown" +msgstr "Okungaziwayo" + +#: ../src/empathy-call-window.ui.h:23 +msgid "Video call" +msgstr "Umnxeba wevidiyo" + +#: ../src/empathy-call-window.ui.h:24 +#: ../src/empathy-streamed-media-window.ui.h:24 +msgid "_Call" +msgstr "_Biza" + +#: ../src/empathy-call-window.ui.h:25 +msgid "_Camera" +msgstr "I_khamera" + +#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-main-window-menubar.ui.h:18 +msgid "_Contents" +msgstr "_Okuqulathiweyo" + +#: ../src/empathy-call-window.ui.h:27 +#: ../src/empathy-main-window-menubar.ui.h:19 +msgid "_Debug" +msgstr "_Susa iziphene" + +#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 +#: ../src/empathy-main-window-menubar.ui.h:22 +msgid "_Help" +msgstr "Un_cedo" + +#: ../src/empathy-call-window.ui.h:30 +msgid "_Microphone" +msgstr "U_mboko" + +#: ../src/empathy-call-window.ui.h:31 +msgid "_Settings" +msgstr "_Imimiselo" + +#: ../src/empathy-call-window.ui.h:32 +#: ../src/empathy-main-window-menubar.ui.h:30 +#: ../src/empathy-streamed-media-window.ui.h:25 +msgid "_View" +msgstr "_Bonisa" + +#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 +#, c-format +msgid "%s (%d unread)" +msgid_plural "%s (%d unread)" +msgstr[0] "%s (ayifundwanga eyi-%d )" +msgstr[1] "%s (awafundwanga ayi-%d)" + +#: ../src/empathy-chat-window.c:493 +#, c-format +msgid "%s (and %u other)" +msgid_plural "%s (and %u others)" +msgstr[0] "%s (kunye no-%u nabanye)" +msgstr[1] "%s (kunye no-%u nabanye)" + +#: ../src/empathy-chat-window.c:509 +#, c-format +msgid "%s (%d unread from others)" +msgid_plural "%s (%d unread from others)" +msgstr[0] "%s (%d akufundwanga kwabanye)" +msgstr[1] "%s (%d akufundwanga kwabanye)" + +#: ../src/empathy-chat-window.c:518 +#, c-format +msgid "%s (%d unread from all)" +msgid_plural "%s (%d unread from all)" +msgstr[0] "%s (%d akufundwanga kubo bonke)" +msgstr[1] "%s (%d akufundwanga kubo bonke)" + +#: ../src/empathy-chat-window.c:733 +msgid "SMS:" +msgstr "SMS:" + +#: ../src/empathy-chat-window.c:743 +#, c-format +msgid "Sending %d message" +msgid_plural "Sending %d messages" +msgstr[0] "Thumela umyalezo ku-%d" +msgstr[1] "Thumela imiyalezo ku-%d" + +#: ../src/empathy-chat-window.c:765 +msgid "Typing a message." +msgstr "Bhala umyalezo." + +#: ../src/empathy-chat-window.ui.h:1 +msgid "C_lear" +msgstr "_Cika" + +#: ../src/empathy-chat-window.ui.h:2 +msgid "C_ontact" +msgstr "N_xulumana" + +#: ../src/empathy-chat-window.ui.h:4 +msgid "Insert _Smiley" +msgstr "Faka u_ncumo" + +#: ../src/empathy-chat-window.ui.h:5 +msgid "Invite _Participant…" +msgstr "Mema a_bathathi-nxaxheba…" + +#: ../src/empathy-chat-window.ui.h:6 +msgid "Move Tab _Left" +msgstr "Hambisa i-Tab iye ngase_Khohlo" + +#: ../src/empathy-chat-window.ui.h:7 +msgid "Move Tab _Right" +msgstr "Hambisa i-Tab iye ngase_Kunene" + +#: ../src/empathy-chat-window.ui.h:8 +msgid "Notify for All Messages" +msgstr "Yazisa ngayo yonke imiyalezo" + +#: ../src/empathy-chat-window.ui.h:10 +msgid "_Conversation" +msgstr "I_ngxoxo" + +#: ../src/empathy-chat-window.ui.h:11 +msgid "_Detach Tab" +msgstr "_Susa i-Tab" + +#: ../src/empathy-chat-window.ui.h:13 +msgid "_Favorite Chat Room" +msgstr "Igumbi lokuxoxa oli_thanda kakhulu" + +#: ../src/empathy-chat-window.ui.h:15 +msgid "_Next Tab" +msgstr "I-Tab e_landelayo" + +#: ../src/empathy-chat-window.ui.h:16 +msgid "_Previous Tab" +msgstr "I-Tab e_ngaphambili" + +#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5 +msgid "_Show Contact List" +msgstr "_Bonisa uluhlu lwabaqhagamshelana nabo" + +#: ../src/empathy-chat-window.ui.h:18 +msgid "_Tabs" +msgstr "I_silungelelanisi semigca" + +#: ../src/empathy-chat-window.ui.h:19 +msgid "_Undo Close Tab" +msgstr "_Phinda ungakwenzi ukuvala i-Tab" + +#: ../src/empathy-chatrooms-window.c:251 +msgid "Name" +msgstr "Igama" + +#: ../src/empathy-chatrooms-window.c:269 +msgid "Room" +msgstr "Igumbi" + +#: ../src/empathy-chatrooms-window.c:277 +msgid "Auto-Connect" +msgstr "Uqhakamshelwano oluzenzekalayo" + +#: ../src/empathy-chatrooms-window.ui.h:2 +msgid "Manage Favorite Rooms" +msgstr "Phatha amagumbi owathanda kakhulu" + +#: ../src/empathy-event-manager.c:523 +msgid "Incoming video call" +msgstr "Umnxeba wevidiyo ongenayo" + +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 +msgid "Incoming call" +msgstr "Umnxeba ongenayo" + +#: ../src/empathy-event-manager.c:527 +#, c-format +msgid "%s is video calling you. Do you want to answer?" +msgstr "u-%s uyakufownela ngevidiyo. Uyafuna ukumphendula?" + +#: ../src/empathy-event-manager.c:528 +#, c-format +msgid "%s is calling you. Do you want to answer?" +msgstr "u-%s uyakufownela. Uyafuna ukumphendula?" + +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 +#, c-format +msgid "Incoming call from %s" +msgstr "Umnxeba ongenayo osuka ku- %s" + +#: ../src/empathy-event-manager.c:556 +msgid "_Reject" +msgstr "_Yala" + +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 +msgid "_Answer" +msgstr "_Impendulo" + +#: ../src/empathy-event-manager.c:572 +msgid "_Answer with video" +msgstr "_Phendula ngevidiyo" + +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 +#, c-format +msgid "Incoming video call from %s" +msgstr "Umnxeba wevidiyo ongenayo osuka ku-%s" + +#: ../src/empathy-event-manager.c:838 +msgid "Room invitation" +msgstr "Isimemo segubhi" + +#: ../src/empathy-event-manager.c:840 +#, c-format +msgid "Invitation to join %s" +msgstr "Isimemo sokungena ku-%s" + +#: ../src/empathy-event-manager.c:847 +#, c-format +msgid "%s is inviting you to join %s" +msgstr "u-%s uyakumema ukuba ungene ku-%s" + +#: ../src/empathy-event-manager.c:855 +msgid "_Decline" +msgstr "_Landula" + +#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 +msgid "_Join" +msgstr "_Dibanisa" + +#: ../src/empathy-event-manager.c:887 +#, c-format +msgid "%s invited you to join %s" +msgstr "u-%s uyakumema ukuba ungene ku-%s" + +#: ../src/empathy-event-manager.c:893 +#, c-format +msgid "You have been invited to join %s" +msgstr "Umemewe ukuba ungene ku-%s" + +#: ../src/empathy-event-manager.c:944 +#, c-format +msgid "Incoming file transfer from %s" +msgstr "Kukhona ifayile engenayo esuka ku-%s" + +#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375 +msgid "Password required" +msgstr "Igama lokuthela liyafuneka" + +#: ../src/empathy-event-manager.c:1217 +#, c-format +msgid "%s would like permission to see when you are online" +msgstr "u-%s ufuna ilungelo lokukubona xa ungenile" + +#: ../src/empathy-event-manager.c:1223 +#, c-format +msgid "" +"\n" +"Message: %s" +msgstr "" +"\n" +"Umyalezo: %s" + +#. Translators: time left, when it is more than one hour +#: ../src/empathy-ft-manager.c:99 +#, c-format +msgid "%u:%02u.%02u" +msgstr "yi-%u:%02u.%02u" + +#. Translators: time left, when is is less than one hour +#: ../src/empathy-ft-manager.c:102 +#, c-format +msgid "%02u.%02u" +msgstr "yi-%02u.%02u" + +#: ../src/empathy-ft-manager.c:178 +msgctxt "file transfer percent" +msgid "Unknown" +msgstr "Okungaziwayo" + +#: ../src/empathy-ft-manager.c:273 +#, c-format +msgid "%s of %s at %s/s" +msgstr "%s ye-%s ngo-%s/s" + +#: ../src/empathy-ft-manager.c:274 +#, c-format +msgid "%s of %s" +msgstr "i-%s ka %s" + +#. translators: first %s is filename, second %s is the contact name +#: ../src/empathy-ft-manager.c:305 +#, c-format +msgid "Receiving \"%s\" from %s" +msgstr "Iyafumana ku- \"%s\" ivela ku- %s" + +#. translators: first %s is filename, second %s is the contact name +#: ../src/empathy-ft-manager.c:308 +#, c-format +msgid "Sending \"%s\" to %s" +msgstr "Ithumela i-\"%s\" ku- %s" + +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:338 +#, c-format +msgid "Error receiving \"%s\" from %s" +msgstr "Ingxaki uyifumana ku-\"%s\" esuka ku-%s" + +#: ../src/empathy-ft-manager.c:341 +msgid "Error receiving a file" +msgstr "Ingxaki ekufumaneni ifayile" + +#: ../src/empathy-ft-manager.c:346 +#, c-format +msgid "Error sending \"%s\" to %s" +msgstr "Ingxaki ekuthumeleni i-\"%s\" ku-%s" + +#: ../src/empathy-ft-manager.c:349 +msgid "Error sending a file" +msgstr "Ingxaki ekuthumeleni ifayile" + +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:488 +#, c-format +msgid "\"%s\" received from %s" +msgstr "\"%s\" fumana esuka ku-%s" + +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:493 +#, c-format +msgid "\"%s\" sent to %s" +msgstr "u-\"%s\" ithunyelwe ku-%s" + +#: ../src/empathy-ft-manager.c:496 +msgid "File transfer completed" +msgstr "Uthumelo lwefayile lugqitywe" + +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 +msgid "Waiting for the other participant's response" +msgstr "Ulinde abanye abathathi-nxaxheba ukuba baphendule" + +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 +#, c-format +msgid "Checking integrity of \"%s\"" +msgstr "Ujonga ukuthembeka kuka-\"%s\"" + +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 +#, c-format +msgid "Hashing \"%s\"" +msgstr "Ukungxamisa \"%s\"" + +#: ../src/empathy-ft-manager.c:1025 +msgid "%" +msgstr "%" + +#: ../src/empathy-ft-manager.c:1037 +msgid "File" +msgstr "Ifayile" + +#: ../src/empathy-ft-manager.c:1059 +msgid "Remaining" +msgstr "Eziseleyo" + +#: ../src/empathy-ft-manager.ui.h:1 +msgid "File Transfers" +msgstr "Uthutho lweefayili" + +#: ../src/empathy-ft-manager.ui.h:2 +msgid "Remove completed, canceled and failed file transfers from the list" +msgstr "" +"Kususa imithwalo edluliswayo egqityiweyo, erhoxisiweyo nengaphumelelanga " +"kuludwe" + +#: ../src/empathy-import-dialog.c:84 +msgid "" +"No accounts to import could be found. Empathy currently only supports " +"importing accounts from Pidgin." +msgstr "" +"Akukho akhawunti ezifuna ukudluliswa ezifumanekile. U-Empathy sixhasa " +"kuphela ukudlilisa ii-akhawunti ezisuka ku-Pidgin." + +#: ../src/empathy-import-dialog.c:199 +msgid "Import Accounts" +msgstr "Ii-akhawunti ezithabathwa ngaphandle" + +#. Translators: this is the header of a treeview column +#: ../src/empathy-import-widget.c:315 +msgid "Import" +msgstr "Thabatha ngaphandle" + +#: ../src/empathy-import-widget.c:324 +msgid "Protocol" +msgstr "Imithetho yokusebenza" + +#: ../src/empathy-import-widget.c:348 +msgid "Source" +msgstr "Imvelaphi" + +#: ../src/empathy-main-window.c:392 +msgid "Provide Password" +msgstr "Nikeza ngegama lokuthela" + +#: ../src/empathy-main-window.c:398 +msgid "Disconnect" +msgstr "Nqamla uxhulumaniso" + +#: ../src/empathy-main-window.c:635 +msgid "No match found" +msgstr "Akukho siganeko zongqinelwano zifunyenweyo" + +#: ../src/empathy-main-window.c:743 +#, c-format +msgid "Sorry, %s accounts can’t be used until your %s software is updated." +msgstr "" +"Uxolo, %s ii-akhawunti yakho ayinako ukusetyenziswa kude inkqubo ka-%s " +"ivuselelwe." + +#: ../src/empathy-main-window.c:811 +msgid "Update software..." +msgstr "Vuselela inkqubo oyisebenzisayo..." + +#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938 +msgid "Close" +msgstr "Vala" + +#: ../src/empathy-main-window.c:926 +msgid "Reconnect" +msgstr "Dibanisa kwakhona" + +#: ../src/empathy-main-window.c:932 +msgid "Edit Account" +msgstr "Hlela i-akhawunti" + +#. Translators: this string will be something like: +#. * Top up My Account ($1.23)..." +#: ../src/empathy-main-window.c:1071 +#, c-format +msgid "Top up %s (%s)..." +msgstr "Gcwalisa%s (%s)..." + +#: ../src/empathy-main-window.c:1118 +msgid "Top up account credit" +msgstr "Gcwalisa i-akhawunti yakho ngemali" + +#. top up button +#: ../src/empathy-main-window.c:1189 +msgid "Top Up..." +msgstr "Gcwalisa..." + +#: ../src/empathy-main-window.c:1931 +msgid "Contact" +msgstr "Qhagamshelana" + +#: ../src/empathy-main-window.c:2306 +msgid "Contact List" +msgstr "Uluhlu loqhagamshelana nabo" + +#: ../src/empathy-main-window-menubar.ui.h:1 +msgid "Contacts on a _Map" +msgstr "Uqhakamshelwano olukwi_maphu" + +#: ../src/empathy-main-window-menubar.ui.h:2 +msgid "Credit Balance" +msgstr "Okushiyekile etyaleni" + +#: ../src/empathy-main-window-menubar.ui.h:3 +msgid "Find in Contact _List" +msgstr "Fumana ku_luhlu labaqhakamshelwayo" + +#: ../src/empathy-main-window-menubar.ui.h:4 +msgid "Join _Favorites" +msgstr "Ngena _kozithanda kakhulu" + +#: ../src/empathy-main-window-menubar.ui.h:5 +msgid "Manage Favorites" +msgstr "Phatha ozithanda kakhulu" + +#: ../src/empathy-main-window-menubar.ui.h:6 +msgid "N_ormal Size" +msgstr "Ubun_gakanani obuqhelekileyo" + +#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 +msgid "New _Call…" +msgstr "Umnxeba o_mtsha…" + +#: ../src/empathy-main-window-menubar.ui.h:8 +msgid "Normal Size With _Avatars" +msgstr "Ubungakanani obuqhelekileyo ne-_Avatars" + +#: ../src/empathy-main-window-menubar.ui.h:9 +msgid "P_references" +msgstr "Ezi_khethwayo" + +#: ../src/empathy-main-window-menubar.ui.h:10 +msgid "Show P_rotocols" +msgstr "Bonisa i-P_rotokoli" + +#: ../src/empathy-main-window-menubar.ui.h:11 +msgid "Sort by _Name" +msgstr "Hlela ngokusebenzisa i_gama" + +#: ../src/empathy-main-window-menubar.ui.h:12 +msgid "Sort by _Status" +msgstr "Zimise ngokwe-_Status" + +#: ../src/empathy-main-window-menubar.ui.h:13 +msgid "_Accounts" +msgstr "Ii-a_khawunti" + +#: ../src/empathy-main-window-menubar.ui.h:15 +msgid "_Blocked Contacts" +msgstr "U_qhakamshelwano olunqandiwe" + +#: ../src/empathy-main-window-menubar.ui.h:17 +msgid "_Compact Size" +msgstr "Ubungakanani u_bufanelekileyo" + +#: ../src/empathy-main-window-menubar.ui.h:21 +msgid "_File Transfers" +msgstr "_Uthutho lweefayili" + +#: ../src/empathy-main-window-menubar.ui.h:23 +msgid "_Join…" +msgstr "_Dibanisa…" + +#: ../src/empathy-main-window-menubar.ui.h:24 +#: ../src/empathy-status-icon.ui.h:3 +msgid "_New Conversation…" +msgstr "I_ngxoxo entsha…" + +#: ../src/empathy-main-window-menubar.ui.h:25 +msgid "_Offline Contacts" +msgstr "_Umqhakamshelanisi uphumile" + +#: ../src/empathy-main-window-menubar.ui.h:26 +msgid "_Personal Information" +msgstr "Ii_nkcukacha ngam" + +#: ../src/empathy-main-window-menubar.ui.h:28 +msgid "_Room" +msgstr "_Igumbi" + +#: ../src/empathy-main-window-menubar.ui.h:29 +msgid "_Search for Contacts…" +msgstr "_Khangela oza kuqhakamshelana nabo…" + +#: ../src/empathy-new-chatroom-dialog.c:369 +msgid "Chat Room" +msgstr "Igumbi lokuxoxa" + +#: ../src/empathy-new-chatroom-dialog.c:385 +msgid "Members" +msgstr "Amalungu" + +#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, +#. yes/no, yes/no and a number. +#: ../src/empathy-new-chatroom-dialog.c:623 +#, c-format +msgid "" +"%s\n" +"Invite required: %s\n" +"Password required: %s\n" +"Members: %s" +msgstr "" +"%s\n" +"Isimemo siyafuneka: %s\n" +"Igama lokuthela liyafuneka: %s\n" +"Amalungu: %s" + +#: ../src/empathy-new-chatroom-dialog.c:625 +#: ../src/empathy-new-chatroom-dialog.c:626 +msgid "No" +msgstr "Hayi" + +#: ../src/empathy-new-chatroom-dialog.c:654 +msgid "Could not start room listing" +msgstr "Ayikwazanga ukuqala uluhlu lwegumbi" + +#: ../src/empathy-new-chatroom-dialog.c:664 +msgid "Could not stop room listing" +msgstr "Ayikwazanga ukuyeka uluhlu lwegumbi" + +#: ../src/empathy-new-chatroom-dialog.ui.h:2 +msgid "Couldn't load room list" +msgstr "Ayakwazanga ukugcwalisa kuluhlu lwegumbi" + +#: ../src/empathy-new-chatroom-dialog.ui.h:3 +msgid "" +"Enter the room name to join here or click on one or more rooms in the list." +msgstr "" +"Faka igama legumbi ukungena apha okanye ucofe enye okanye uninzi lwamagumbi " +"akuluhlu." + +#: ../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 "" +"Faka iseva ekhupha igumbi, okanye uyishiye ingenanto ukuba igumbi likule " +"akhawunti yeseva" + +#: ../src/empathy-new-chatroom-dialog.ui.h:5 +msgid "Join Room" +msgstr "Ngena kwigumbi" + +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "Room List" +msgstr "Uluhlu lwendlu" + +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "_Room:" +msgstr "_Igumbi:" + +#: ../src/empathy-preferences.c:166 +msgid "Message received" +msgstr "Umyalezo ofunyenwe" + +#: ../src/empathy-preferences.c:167 +msgid "Message sent" +msgstr "Umyalezo uthunyelwe" + +#: ../src/empathy-preferences.c:168 +msgid "New conversation" +msgstr "Ingxoxo entsha" + +#: ../src/empathy-preferences.c:169 +msgid "Contact goes online" +msgstr "Umqhakashelani uyangena" + +#: ../src/empathy-preferences.c:170 +msgid "Contact goes offline" +msgstr "Umqhakashelani uyaphuma" + +#: ../src/empathy-preferences.c:171 +msgid "Account connected" +msgstr "I-akhawunti inxulunyanisiwe" + +#: ../src/empathy-preferences.c:172 +msgid "Account disconnected" +msgstr "I-akhawunti ayinxulunyaniswanga" + +#: ../src/empathy-preferences.c:475 +msgid "Language" +msgstr "Ulwimi" + +#. translators: Contact name for the chat theme preview +#: ../src/empathy-preferences.c:725 +msgid "Juliet" +msgstr "U-Juliet" + +#. translators: Contact name for the chat theme preview +#: ../src/empathy-preferences.c:732 +msgid "Romeo" +msgstr "U-Romeo" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:738 +msgid "O Romeo, Romeo, wherefore art thou Romeo?" +msgstr "Ye-Romeo, ye-Romeo, uphi na Romeo?" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:741 +msgid "Deny thy father and refuse thy name;" +msgstr "Phika utata wakho uze ungalivumi igama lakhe;" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:744 +msgid "Or if thou wilt not, be but sworn my love" +msgstr "Okanye ukuba awuvumi, uze ufunge sithandwa sam" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:747 +msgid "And I'll no longer be a Capulet." +msgstr "Kwaye andisoze ndiphinde ndibengowakwaCapulet." + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:750 +msgid "Shall I hear more, or shall I speak at this?" +msgstr "Ndingeva okunye, okanye ndithethe oku?" + +#. translators: Quote from Romeo & Julier, for chat theme preview +#: ../src/empathy-preferences.c:753 +msgid "Juliet has disconnected" +msgstr "U-Juliet waze waqhawuka" + +#: ../src/empathy-preferences.c:1157 +msgid "Preferences" +msgstr "Uluhlu lwezinto ezikhethwayo" + +#: ../src/empathy-preferences.ui.h:1 +msgid "Appearance" +msgstr "Imbonakalo" + +#: ../src/empathy-preferences.ui.h:3 +msgid "Behavior" +msgstr "Ukuziphatha" + +#: ../src/empathy-preferences.ui.h:5 +msgid "Chat Th_eme:" +msgstr "Umxholo wo_kuxoxa:" + +#: ../src/empathy-preferences.ui.h:6 +msgid "Disable notifications when _away or busy" +msgstr "Simise isazisi xa uha_mbile okanye uxakekile" + +#: ../src/empathy-preferences.ui.h:7 +msgid "Disable sounds when _away or busy" +msgstr "Simise isandi xa u_hambile okanye uxakekile" + +#: ../src/empathy-preferences.ui.h:8 +msgid "Display incoming events in the notification area" +msgstr "Bonisa into eiziza kwenzeka kwindawo yesazisi" + +#: ../src/empathy-preferences.ui.h:9 +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 "" +"Ukumisa into elinganisayo yenza ilizwi lakho liakale caileyo kwabanye " +"abantu, kodwa lo nto ingenza iingxaki kwezinye iikhompuyutha. Ukuba wena " +"okanye abantu bangeva amazwi angaqhelekanga okanye urhirhize ngezesha " +"lokufownelwa, zama ukumisa umiso lolinganiso kwaye uqalele ukufowna." + +#: ../src/empathy-preferences.ui.h:10 +msgid "Enable notifications when a contact comes online" +msgstr "Simise isazisi xa umqhakashelwa engena elayinini" + +#: ../src/empathy-preferences.ui.h:11 +msgid "Enable notifications when a contact goes offline" +msgstr "Simise isazisi xa umqhakashelwa ephuma elayinini" + +#: ../src/empathy-preferences.ui.h:12 +msgid "Enable notifications when the _chat is not focused" +msgstr "Misa isazisi xa i_ngxoxo inganakwanga" + +#: ../src/empathy-preferences.ui.h:13 +msgid "Enable spell checking for languages:" +msgstr "Misa ukujunga impazamo zolwimi:" + +#: ../src/empathy-preferences.ui.h:14 +msgid "General" +msgstr "Jikelele" + +#: ../src/empathy-preferences.ui.h:16 +msgid "Location sources:" +msgstr "Umthombo wendawo:" + +#: ../src/empathy-preferences.ui.h:17 +msgid "Log conversations" +msgstr "Ingxoxo ye-log" + +#: ../src/empathy-preferences.ui.h:18 +msgid "Notifications" +msgstr "Izaziso" + +#: ../src/empathy-preferences.ui.h:19 +msgid "Play sound for events" +msgstr "Dlala izandi kwizehlo" + +#: ../src/empathy-preferences.ui.h:20 +msgid "Privacy" +msgstr "Okwabucala" + +#: ../src/empathy-preferences.ui.h:21 +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 "" +"Yehlisa ukulunga kwendawo kuthetha ukuba akukhonto ethe ngqo njengesixeko " +"sakho, umhlaba kunye nelizwe eliza kupapashwa. I-GPS yoququzelo iza kulunga " +"kwindawo eyi-1." + +#: ../src/empathy-preferences.ui.h:22 +msgid "Show _smileys as images" +msgstr "Bonisa u_ncumo njengomyalezo" + +#: ../src/empathy-preferences.ui.h:23 +msgid "Show contact _list in rooms" +msgstr "Bonisa u_luhlu labaqhakamshelwa kumagumbi" + +#: ../src/empathy-preferences.ui.h:24 +msgid "Sounds" +msgstr "Izandi" + +#: ../src/empathy-preferences.ui.h:25 +msgid "Spell Checking" +msgstr "Ukhangelo upelo" + +#: ../src/empathy-preferences.ui.h:26 +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "" +"Uluhlu lweelwimi ezifumaneka apha lubonisa kuphela ezo lwimi zinezichazi " +"magama ozisekileyo." + +#: ../src/empathy-preferences.ui.h:27 +msgid "Themes" +msgstr "Imixholo" + +#: ../src/empathy-preferences.ui.h:28 +msgid "Use _echo cancellation to improve call quality" +msgstr "Sebenzisa u_ummisi wokulunganisa ukwenza ngcono ubunjani" + +#: ../src/empathy-preferences.ui.h:29 +msgid "Variant:" +msgstr "Isiguquki:" + +#: ../src/empathy-preferences.ui.h:30 +msgid "_Automatically connect on startup" +msgstr "_Ngokuzenzekela qhakamshelana nesiqalo" + +#: ../src/empathy-preferences.ui.h:31 +msgid "_Cellphone" +msgstr "I_selula" + +#: ../src/empathy-preferences.ui.h:32 +msgid "_Enable bubble notifications" +msgstr "_Misa iqamu elazisayo" + +#: ../src/empathy-preferences.ui.h:33 +msgid "_Enable sound notifications" +msgstr "_Cima isandi esazisayo" + +#: ../src/empathy-preferences.ui.h:34 +msgid "_GPS" +msgstr "_GPS" + +#: ../src/empathy-preferences.ui.h:35 +msgid "_Network (IP, Wi-Fi)" +msgstr "U_luhu lothungelwano (IP, Wi-Fi)" + +#: ../src/empathy-preferences.ui.h:36 +msgid "_Open new chats in separate windows" +msgstr "_Vula ingxoxo entsha kwifestile esecaleni" + +#: ../src/empathy-preferences.ui.h:37 +msgid "_Publish location to my contacts" +msgstr "_Papasha indawo kubaqhakamshelanisi" + +#. 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:39 +msgid "_Reduce location accuracy" +msgstr "_Yehlisa ukulunga kwendawo" + +#: ../src/empathy-status-icon.ui.h:2 +msgid "Status" +msgstr "Isimo sokuqhubekayo" + +#: ../src/empathy-status-icon.ui.h:4 +msgid "_Quit" +msgstr "_Phuma" + +#: ../src/empathy-streamed-media-window.ui.h:2 +msgid "Call the contact again" +msgstr "Biza umqhakashelani kwakhona" + +#: ../src/empathy-streamed-media-window.ui.h:3 +msgid "Camera Off" +msgstr "Ikhamera ivaliwe" + +#: ../src/empathy-streamed-media-window.ui.h:4 +msgid "Camera On" +msgstr "Ikhamera ivuliwe" + +#: ../src/empathy-streamed-media-window.ui.h:6 +msgid "Disable camera and stop sending video" +msgstr "Suvumela ikhamera kwaye misa uthumelo lwevidiyo" + +#: ../src/empathy-streamed-media-window.ui.h:7 +msgid "Enable camera and send video" +msgstr "Vumela ikhamera kunye nothumeli lwevidiyo" + +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "Enable camera but don't send video" +msgstr "Vumela ikhamera kodwa sukuyithumeli ividiyo" + +#: ../src/empathy-streamed-media-window.ui.h:13 +msgid "Preview" +msgstr "Imboniso yangaphambili" + +#: ../src/empathy-streamed-media-window.ui.h:14 +msgid "Redial" +msgstr "Phinda ucofe" + +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "V_ideo" +msgstr "I_vidiyo" + +#: ../src/empathy-streamed-media-window.ui.h:21 +msgid "Video Off" +msgstr "Ividiyo ivaliwe" + +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Video On" +msgstr "Ividiyo ivuliwe" + +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Video Preview" +msgstr "Ukujonga ividiyo phambi koshicilelo" + +#: ../src/empathy-map-view.c:471 +msgid "Contact Map View" +msgstr "Uqhakamshelwano olubonisa imaphu yendawo" + +#: ../src/empathy-debug-window.c:1228 +msgid "Save" +msgstr "Gcina" + +#: ../src/empathy-debug-window.c:1435 +msgid "Debug Window" +msgstr "Suza iziphene kwifestile" + +#: ../src/empathy-debug-window.c:1517 +msgid "Pause" +msgstr "Phumla" + +#: ../src/empathy-debug-window.c:1529 +msgid "Level " +msgstr "Inqanaba " + +#: ../src/empathy-debug-window.c:1549 +msgid "Debug" +msgstr "Cokisa" + +#: ../src/empathy-debug-window.c:1555 +msgid "Info" +msgstr "Ulwazi" + +#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610 +msgid "Message" +msgstr "Umyalezo" + +#: ../src/empathy-debug-window.c:1567 +msgid "Warning" +msgstr "Isilumkiso" + +#: ../src/empathy-debug-window.c:1573 +msgid "Critical" +msgstr "Okuxhalabisayo" + +#: ../src/empathy-debug-window.c:1579 +msgid "Error" +msgstr "Imposiso" + +#: ../src/empathy-debug-window.c:1598 +msgid "Time" +msgstr "Ixesha" + +#: ../src/empathy-debug-window.c:1601 +msgid "Domain" +msgstr "Ithambeka" + +#: ../src/empathy-debug-window.c:1603 +msgid "Category" +msgstr "Uluhlu" + +#: ../src/empathy-debug-window.c:1605 +msgid "Level" +msgstr "Inqanaba" + +#: ../src/empathy-debug-window.c:1642 +msgid "" +"The selected connection manager does not support the remote debugging " +"extension." +msgstr "" +"Umphathi woqhakamshelwano okhethiweyo akaluxhasi ococo oluphethe kwi-" +"extension." + +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 +msgid "Invite Participant" +msgstr "Mema abathathi-nxaxheba" + +#: ../src/empathy-invite-participant-dialog.c:201 +msgid "Choose a contact to invite into the conversation:" +msgstr "Khetha umqhakashelani ukumema kwingxoxo:" + +#: ../src/empathy-invite-participant-dialog.c:224 +msgid "Invite" +msgstr "Mema" + +#: ../src/empathy-accounts.c:183 +msgid "Don't display any dialogs; do any work (eg, importing) and exit" +msgstr "" +"Subonisa nanye ingxoxo; wenze nawuphi umsbenzi (i.e ukudlulisela) kunye " +"nokuphuma" + +#: ../src/empathy-accounts.c:187 +msgid "" +"Don't display any dialogs unless there are only \"People Nearby\" accounts" +msgstr "" +"Subonisa nanye ingxoxo ngaphandle kokuba kukho \"Abantu abakufutshane\" bee-" +"akhawunti" + +#: ../src/empathy-accounts.c:191 +msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" +msgstr "" +"Ngenjongo khetha ikhawunti oyinikiwe (umzekelo, gabble/jabber/" +"foo_40example_2eorg0)" + +#: ../src/empathy-accounts.c:193 +msgid "" +msgstr "" + +#: ../src/empathy-accounts.c:196 +msgid "Show account assistant" +msgstr "Bonisa uncedo lwe-akhawunti" + +#: ../src/empathy-accounts.c:202 +msgid "- Empathy Accounts" +msgstr "- Iikhawunti yoVelwano" + +#: ../src/empathy-accounts.c:238 +msgid "Empathy Accounts" +msgstr "Iikhawunti zika-Empathy" + +#: ../src/empathy-debugger.c:69 +msgid "Show a particular service" +msgstr "Bonisa intsebenzo ethile" + +#: ../src/empathy-debugger.c:74 +msgid "- Empathy Debugger" +msgstr "- Isicoci sika-Empathy" + +#: ../src/empathy-debugger.c:113 +msgid "Empathy Debugger" +msgstr "Isicoci sika-Empathy" + +#: ../src/empathy-chat.c:107 +msgid "- Empathy Chat Client" +msgstr "- Ingxogxo yoMxhasi we-Empathy" + +#: ../src/empathy-notifications-approver.c:190 +msgid "Respond" +msgstr "Phendula" + +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1565 +msgid "Reject" +msgstr "Yala" + +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1566 +msgid "Answer" +msgstr "Impendulo" + +#: ../src/empathy-notifications-approver.c:214 +msgid "Answer with video" +msgstr "Phendula ngevidiyo" + +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 +msgid "Decline" +msgstr "Landula" + +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 +msgid "Accept" +msgstr "Yamkela" + +#. 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:247 +msgid "Provide" +msgstr "Bonelela" + +#: ../src/empathy-call-observer.c:134 +#, c-format +msgid "%s just tried to call you, but you were in another call." +msgstr "u-%s usanda kuzama ukukufownela kodwa wabe ukomnye umnxeba." + +#. Translators: this is an "Info" label. It should be as short +#. * as possible. +#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 +msgid "i" +msgstr "i" + +#: ../src/empathy-call-window.c:2929 +msgid "On hold" +msgstr "Ekumiso" + +#: ../src/empathy-call-window.c:2932 +msgid "Mute" +msgstr "Ngokungavakaliyo" + +#: ../src/empathy-call-window.c:2934 +msgid "Duration" +msgstr "Ithuba" + +#. Translators: 'status - minutes:seconds' the caller has been connected +#: ../src/empathy-call-window.c:2937 +#, c-format +msgid "%s — %d:%02dm" +msgstr "ngu-%s — %d:%02dm" + +#: ../src/empathy-call-window.c:3207 +#, c-format +msgid "Your current balance is %s." +msgstr "Imali eshiyekile yi-%s." + +#: ../src/empathy-call-window.c:3211 +msgid "Sorry, you don’t have enough credit for that call." +msgstr "Uxolo, awunamali eyoneleyo ukuze utsale umnxeba." + +#: ../src/empathy-call-window.c:3213 +msgid "Top Up" +msgstr "Gcwalisa" + +#: ../libempathy-gtk/empathy-search-bar.c:243 +msgid "_Match case" +msgstr "_Dibanisa ikheyisi" + +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +#, fuzzy +#| msgid "New account" +msgid "Adding new account" +msgstr "Akhawunti entsha" + +#~ msgid "Socket type not supported" +#~ msgstr "Uhlobo lovimba olungaxhasawa" + +#~ msgid "My Web Accounts" +#~ msgstr "Ii-akhawuntsi ze-web" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "I-akhawunti %s ilungiswe nge-%s." + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "I-akhawunti %s ayinako ukulungeswa ku-Empathy." + +#~ msgid "Launch My Web Accounts" +#~ msgstr "Papasha ii-akhawunti zam ze-web" + +#~ msgid "Edit %s" +#~ msgstr "Hlela i-%s" + +#~ msgid "Ca_ncel" +#~ msgstr "_Hlaba" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "Hl_ela" + +#~ msgid "Set your presence and current status" +#~ msgstr "Yenza imbonakalo kunye nobume" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "Uza kudala i-akhawunti entsha, leyo eza kucima\n" +#~ "itshintsho lwakho. Uqinisekile ufuna ukuqhubeka?" + +#~ msgid "Input level:" +#~ msgstr "Amanqanaba olwazi olungenisiweyo:" + +#~ msgid "Input volume:" +#~ msgstr "Amanqanaba evoluyumu:" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1f83f27e..0a32f1cb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -15,17 +15,18 @@ # Tao Wang , 2010. # Dean Lee , 2010. # Aron Xu , 2009, 2010. -# Yinghua Wang , 2010 +# Wylmer Wang , 2010-2012. # zhen liu , 2011 +# Yangtse Su , 2011 # 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: 2011-11-24 11:51+0000\n" -"PO-Revision-Date: 2011-11-25 21:46+0800\n" -"Last-Translator: Yangtse Su \n" +"POT-Creation-Date: 2012-02-15 21:22+0000\n" +"PO-Revision-Date: 2012-02-14 13:52+0800\n" +"Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,468 +35,516 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务" - -#: ../data/empathy.desktop.in.in.h:2 msgid "Empathy" msgstr "Empathy" +#: ../data/empathy.desktop.in.in.h:2 +msgid "IM Client" +msgstr "即时通讯客户端" + #: ../data/empathy.desktop.in.in.h:3 msgid "Empathy Internet Messaging" msgstr "Empathy 即时通讯程序" #: ../data/empathy.desktop.in.in.h:4 -msgid "IM Client" -msgstr "即时通讯客户端" +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务" #: ../data/org.gnome.Empathy.gschema.xml.in.h:1 -msgid "Always open a separate chat window for new chats." -msgstr "总是为新聊天打开单独的聊天窗口。" +msgid "Connection managers should be used" +msgstr "应该使用连接管理器" #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Camera device" -msgstr "相机设备" +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." +msgstr "是否使用连接管理器自动断开连接或重新连接。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Camera position" -msgstr "相机位置" +msgid "Empathy should auto-connect on startup" +msgstr "Empathy 启动时是否自动连接" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." -msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。" +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "Empathy 是否在启动时自动登入您的帐号。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:5 -msgid "Chat window theme" -msgstr "聊天窗口主题" +msgid "Empathy should auto-away when idle" +msgstr "Empathy 空闲时是否自动离开" #: ../data/org.gnome.Empathy.gschema.xml.in.h:6 -msgid "Chat window theme variant" -msgstr "聊天窗口主题衍生" +msgid "" +"Whether Empathy should go into away mode automatically if the user is idle." +msgstr "Empathy 是否应在用户空闲时自动进入离开模式。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:7 -msgid "" -"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "用于拼写检查器的语言的列表，以逗号分隔(例如：en, fr, nl)。" +msgid "Empathy default download folder" +msgstr "Empathy 默认下载文件夹" #: ../data/org.gnome.Empathy.gschema.xml.in.h:8 -msgid "Compact contact list" -msgstr "紧凑显示联系人列表" +msgid "The default folder to save file transfers in." +msgstr "保存传送文件的默认文件夹。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:9 -msgid "Connection managers should be used" -msgstr "应该使用连接管理器" +msgid "Show offline contacts" +msgstr "显示离线联系人" #: ../data/org.gnome.Empathy.gschema.xml.in.h:10 -msgid "Contact list sort criterion" -msgstr "联系人列表排序条件" +msgid "Whether to show contacts that are offline in the contact list." +msgstr "是否显示联系人清单中离线的联系人。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:11 -msgid "D-Bus object path of the last account selected to join a room." -msgstr "" +msgid "Show avatars" +msgstr "显示头像" #: ../data/org.gnome.Empathy.gschema.xml.in.h:12 -msgid "Default camera device to use in video calls, e.g. /dev/video0." -msgstr "视频呼叫时默认使用的相机设备，例如 /dev/video0。" +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "是否在联系人列表和聊天窗口中显示头像。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:13 -msgid "Default directory to select an avatar image from" -msgstr "默认的选取头像图片的目录" +msgid "Show protocols" +msgstr "显示协议" #: ../data/org.gnome.Empathy.gschema.xml.in.h:14 -msgid "Disable popup notifications when away" -msgstr "离开时禁用弹出提示" +msgid "Whether to show protocols for contacts in the contact list." +msgstr "是否在联系人列表和聊天窗口中显示协议。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:15 -msgid "Disable sounds when away" -msgstr "离开时禁用声音" +msgid "Show Balance in contact list" +msgstr "在联系人列表中显示余额" #: ../data/org.gnome.Empathy.gschema.xml.in.h:16 -msgid "Display incoming events in the status area" -msgstr "在状态栏显示呼入事件。" +msgid "Whether to show account balances in the contact list." +msgstr "是否在联系人列表和聊天窗口中显示余额。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:17 -msgid "" -"Display incoming events in the status area. If false, present them to the " -"user immediately." -msgstr "在状态栏显示呼入事件。如果为 false 则立即显示给用户。" +msgid "Compact contact list" +msgstr "紧凑显示联系人列表" #: ../data/org.gnome.Empathy.gschema.xml.in.h:18 -msgid "Echo cancellation support" -msgstr "回声抑制支持" +msgid "Whether to show the contact list in compact mode." +msgstr "是否以紧凑模式显示联系人列表。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:19 -msgid "Empathy can publish the user's location" -msgstr "Empathy 能够发布用户的位置" +msgid "Hide main window" +msgstr "隐藏主窗口" #: ../data/org.gnome.Empathy.gschema.xml.in.h:20 -msgid "Empathy can use the GPS to guess the location" -msgstr "Empathy 能够通过 GPS 来估计位置" +msgid "Hide the main window." +msgstr "隐藏主窗口。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:21 -msgid "Empathy can use the cellular network to guess the location" -msgstr "Empathy 能够通过手机来估计位置" +msgid "Default directory to select an avatar image from" +msgstr "默认的选取头像图片的目录" #: ../data/org.gnome.Empathy.gschema.xml.in.h:22 -msgid "Empathy can use the network to guess the location" -msgstr "Empathy 能够通过网络来估计位置" +msgid "The last directory that an avatar image was chosen from." +msgstr "上次选取头像图片的目录。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:23 -msgid "Empathy default download folder" -msgstr "Empathy 默认下载文件夹" +msgid "Open new chats in separate windows" +msgstr "在单独窗口中打开新聊天" #: ../data/org.gnome.Empathy.gschema.xml.in.h:24 -msgid "Empathy should auto-away when idle" -msgstr "Empathy 空闲时是否自动离开" +msgid "Always open a separate chat window for new chats." +msgstr "总是为新聊天打开单独的聊天窗口。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:25 -msgid "Empathy should auto-connect on startup" -msgstr "Empathy 启动时是否自动连接" +msgid "Display incoming events in the status area" +msgstr "在状态栏显示呼入事件。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:26 -msgid "Empathy should reduce the location's accuracy" -msgstr "降低 Emapthy 位置信息的准确度" +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." +msgstr "在状态栏显示呼入事件。如果为 false 则立即显示给用户。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:27 -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "Empathy 是否使用联系人头像作为聊天窗口图标" +msgid "The position for the chat window side pane" +msgstr "聊天窗口边栏的位置" #: ../data/org.gnome.Empathy.gschema.xml.in.h:28 -msgid "Enable WebKit Developer Tools" -msgstr "启用 WebKit 开发工具" +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "聊天窗口边栏保存的位置(像素)。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:29 -msgid "Enable popup notifications for new messages" -msgstr "启用新消息弹出提示" +msgid "Show contact groups" +msgstr "显示联系人分组" #: ../data/org.gnome.Empathy.gschema.xml.in.h:30 -msgid "Enable spell checker" -msgstr "启用拼写检查器" +msgid "Whether to show groups in the contact list." +msgstr "是否在联系人列表中显示分组。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 -msgid "Hide main window" -msgstr "隐藏主窗口" +msgid "Contact list sort criterion" +msgstr "联系人列表排序条件" #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 -msgid "Hide the main window." -msgstr "隐藏主窗口。" +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." +msgstr "" +"使用何种条件来排序联系人列表。默认情况下使用值“状态”以按联系人状态排序。取值" +"为“姓名”时将按姓名排序联系人列表。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:33 -msgid "Last account selected in Join Room dialog" -msgstr "在加入聊天室对话框中最后选择的帐号" +msgid "Use notification sounds" +msgstr "使用通知声音" #: ../data/org.gnome.Empathy.gschema.xml.in.h:34 -msgid "Nick completed character" -msgstr "昵称补全字符" +msgid "Whether to play a sound to notify of events." +msgstr "是否需要事件提示音。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:35 -msgid "Open new chats in separate windows" -msgstr "在单独窗口中打开新聊天" +msgid "Disable sounds when away" +msgstr "离开时禁用声音" #: ../data/org.gnome.Empathy.gschema.xml.in.h:36 -msgid "Path of the Adium theme to use" -msgstr "Adium 主题的路径" +msgid "Whether to play sound notifications when away or busy." +msgstr "当离开或忙碌时是否使用声音提示。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:37 -msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound for incoming messages" msgstr "收到消息时播放声音" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 -msgid "Play a sound for new conversations" -msgstr "新对话时播放声音" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +msgid "Whether to play a sound to notify of incoming messages." +msgstr "是否需要消息到达提示音。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for outgoing messages" msgstr "发出消息时播放声音" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "是否为外出消息使用声音提示。" + #: ../data/org.gnome.Empathy.gschema.xml.in.h:41 -msgid "Play a sound when a contact logs in" -msgstr "联系人登录时播放声音" +msgid "Play a sound for new conversations" +msgstr "新对话时播放声音" #: ../data/org.gnome.Empathy.gschema.xml.in.h:42 -msgid "Play a sound when a contact logs out" -msgstr "联系人注销时播放声音" +msgid "Whether to play a sound to notify of new conversations." +msgstr "是否需要新会话提示音。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:43 -msgid "Play a sound when we log in" -msgstr "登录时播放声音" +msgid "Play a sound when a contact logs in" +msgstr "联系人登录时播放声音" #: ../data/org.gnome.Empathy.gschema.xml.in.h:44 -msgid "Play a sound when we log out" -msgstr "注销时播放声音" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "是否需要联系人上线提示音。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:45 -msgid "Pop up notifications if the chat isn't focused" -msgstr "如果聊天窗口不是焦点则弹出消息通知" +msgid "Play a sound when a contact logs out" +msgstr "联系人注销时播放声音" #: ../data/org.gnome.Empathy.gschema.xml.in.h:46 -msgid "Pop up notifications when a contact logs in" -msgstr "当联系人登录时弹出通知" +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "是否需要联系人下线提示音。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:47 -msgid "Pop up notifications when a contact logs out" -msgstr "当联系人注销时弹出通知" +msgid "Play a sound when we log in" +msgstr "登录时播放声音" #: ../data/org.gnome.Empathy.gschema.xml.in.h:48 -msgid "Position the camera preview should be during a call." -msgstr "在通话时摄像头预览的位置。" +msgid "Whether to play a sound when logging into a network." +msgstr "当联网登录时是否播放提示音。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:49 -msgid "Show Balance in contact list" -msgstr "在联系人列表中显示余额" +msgid "Play a sound when we log out" +msgstr "注销时播放声音" #: ../data/org.gnome.Empathy.gschema.xml.in.h:50 -msgid "Show avatars" -msgstr "显示头像" +msgid "Whether to play a sound when logging out of a network." +msgstr "当网络断开时是否播放提示音。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:51 -msgid "Show contact list in rooms" -msgstr "在聊天室显示联系人列表" +msgid "Enable popup notifications for new messages" +msgstr "启用新消息弹出提示" #: ../data/org.gnome.Empathy.gschema.xml.in.h:52 -msgid "Show hint about closing the main window" -msgstr "关闭主窗口时显示提示" +msgid "Whether to show a popup notification when receiving a new message." +msgstr "当收到新消息时是否弹出显示提示框。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:53 -msgid "Show offline contacts" -msgstr "显示离线联系人" +msgid "Disable popup notifications when away" +msgstr "离开时禁用弹出提示" #: ../data/org.gnome.Empathy.gschema.xml.in.h:54 -msgid "Show protocols" -msgstr "显示协议" +msgid "Whether to show popup notifications when away or busy." +msgstr "当离开或忙碌时是否弹出显示提示框。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -msgid "Spell checking languages" -msgstr "拼写检查器语言" +msgid "Pop up notifications if the chat isn't focused" +msgstr "如果聊天窗口不是焦点则弹出消息通知" #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 -msgid "The default folder to save file transfers in." -msgstr "保存传送文件的默认文件夹。" +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "如果聊天窗口已开启，但不是当前窗口，接收新消息时是否弹出提示。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:57 -msgid "The last directory that an avatar image was chosen from." -msgstr "上次选取头像图片的目录。" +msgid "Pop up notifications when a contact logs in" +msgstr "当联系人登录时弹出通知" #: ../data/org.gnome.Empathy.gschema.xml.in.h:58 -msgid "The position for the chat window side pane" -msgstr "聊天窗口边栏的位置" +msgid "Whether to show a popup notification when a contact goes online." +msgstr "当联系人上线时是否显示弹出通知" #: ../data/org.gnome.Empathy.gschema.xml.in.h:59 -msgid "The stored position (in pixels) of the chat window side pane." -msgstr "聊天窗口边栏保存的位置(像素)。" +msgid "Pop up notifications when a contact logs out" +msgstr "当联系人注销时弹出通知" #: ../data/org.gnome.Empathy.gschema.xml.in.h:60 -msgid "The theme that is used to display the conversation in chat windows." -msgstr "用于在聊天窗口中显示会话的主题。" +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "当联系人离线时是否显示弹出通知。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:61 -msgid "" -"The theme variant that is used to display the conversation in chat windows." -msgstr "用于在聊天窗口中显示会话的主题。" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "使用表情图标" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "对话时是否将表情符号转换为表情图标。" + #: ../data/org.gnome.Empathy.gschema.xml.in.h:63 -msgid "Use notification sounds" -msgstr "使用通知声音" +msgid "Show contact list in rooms" +msgstr "在聊天室显示联系人列表" #: ../data/org.gnome.Empathy.gschema.xml.in.h:64 -msgid "Use theme for chat rooms" -msgstr "为聊天室使用主题" +msgid "Whether to show the contact list in chat rooms." +msgstr "是否在聊天室显示联系人列表。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "是否允许 Empathy 将用户的位置共享给联系人" +msgid "Chat window theme" +msgstr "聊天窗口主题" #: ../data/org.gnome.Empathy.gschema.xml.in.h:66 -msgid "Whether Empathy can use the GPS to guess the location." -msgstr "是否允许 Empathy 通过 GPS 估计位置" +msgid "The theme that is used to display the conversation in chat windows." +msgstr "用于在聊天窗口中显示会话的主题。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:67 -msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "是否允许 Empathy 通过手机网络估计位置" +msgid "Chat window theme variant" +msgstr "聊天窗口主题衍生" #: ../data/org.gnome.Empathy.gschema.xml.in.h:68 -msgid "Whether Empathy can use the network to guess the location." -msgstr "是否允许 Empathy 通过网络估计位置" +msgid "" +"The theme variant that is used to display the conversation in chat windows." +msgstr "用于在聊天窗口中显示会话的主题。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:69 -msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "Empathy 是否在启动时自动登入您的帐号。" +msgid "Path of the Adium theme to use" +msgstr "Adium 主题的路径" #: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "" -"Whether Empathy should go into away mode automatically if the user is idle." -msgstr "Empathy 是否应在用户空闲时自动进入离开模式。" +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径" #: ../data/org.gnome.Empathy.gschema.xml.in.h:71 -msgid "" -"Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。" +msgid "Enable WebKit Developer Tools" +msgstr "启用 WebKit 开发工具" #: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" -"Whether Empathy should use the avatar of the contact as the chat window icon." -msgstr "是否使用联系人的头像作为聊天窗口的图标。" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 -msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "WebKit 开发工具，例如 Web Inspector 是否应该启用。" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +msgid "Inform other users when you are typing to them" +msgstr "告诉他人您正在输入" + #: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" -"Whether connectivity managers should be used to automatically disconnect/" -"reconnect." -msgstr "是否使用连接管理器自动断开连接或重新连接。" +"Whether to send the 'composing' or 'paused' chat states. Does not currently " +"affect the 'gone' state." +msgstr "" +"是否发送“编写中”(composing)或“暂停”(paused)的聊天状态。目前不影响“已离" +"开”(gone)状态" #: ../data/org.gnome.Empathy.gschema.xml.in.h:75 -msgid "" -"Whether to check words typed against the languages you want to check with." -msgstr "是否对您想要作拼写检查的单词作拼写检查。" +msgid "Use theme for chat rooms" +msgstr "为聊天室使用主题" #: ../data/org.gnome.Empathy.gschema.xml.in.h:76 -msgid "Whether to convert smileys into graphical images in conversations." -msgstr "对话时是否将表情符号转换为表情图标。" +msgid "Whether to use the theme for chat rooms." +msgstr "是否对聊天室使用主题。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:77 -msgid "Whether to enable Pulseaudio's echo cancellation filter." -msgstr "是否启用 Pulseaudio 的回声抑制过滤器。" +msgid "Spell checking languages" +msgstr "拼写检查器语言" #: ../data/org.gnome.Empathy.gschema.xml.in.h:78 -msgid "Whether to play a sound to notify of contacts logging into the network." -msgstr "是否需要联系人上线提示音。" +msgid "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +msgstr "用于拼写检查器的语言的列表，以逗号分隔(例如：en, fr, nl)。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:79 -msgid "" -"Whether to play a sound to notify of contacts logging out of the network." -msgstr "是否需要联系人下线提示音。" +msgid "Enable spell checker" +msgstr "启用拼写检查器" #: ../data/org.gnome.Empathy.gschema.xml.in.h:80 -msgid "Whether to play a sound to notify of events." -msgstr "是否需要事件提示音。" +msgid "" +"Whether to check words typed against the languages you want to check with." +msgstr "是否对您想要作拼写检查的单词作拼写检查。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:81 -msgid "Whether to play a sound to notify of incoming messages." -msgstr "是否需要消息到达提示音。" +msgid "Nick completed character" +msgstr "昵称补全字符" #: ../data/org.gnome.Empathy.gschema.xml.in.h:82 -msgid "Whether to play a sound to notify of new conversations." -msgstr "是否需要新会话提示音。" +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:83 -msgid "Whether to play a sound to notify of outgoing messages." -msgstr "是否为外出消息使用声音提示。" +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "Empathy 是否使用联系人头像作为聊天窗口图标" #: ../data/org.gnome.Empathy.gschema.xml.in.h:84 -msgid "Whether to play a sound when logging into a network." -msgstr "当联网登录时是否播放提示音。" +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." +msgstr "是否使用联系人的头像作为聊天窗口的图标。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:85 -msgid "Whether to play a sound when logging out of a network." -msgstr "当网络断开时是否播放提示音。" +msgid "Last account selected in Join Room dialog" +msgstr "在加入聊天室对话框中最后选择的帐号" #: ../data/org.gnome.Empathy.gschema.xml.in.h:86 -msgid "Whether to play sound notifications when away or busy." -msgstr "当离开或忙碌时是否使用声音提示。" +msgid "D-Bus object path of the last account selected to join a room." +msgstr "最后选择加入聊天室的帐号的 D-Bus 对象路径。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:87 -msgid "Whether to show a popup notification when a contact goes offline." -msgstr "当联系人离线时是否显示弹出通知。" +msgid "Camera device" +msgstr "相机设备" #: ../data/org.gnome.Empathy.gschema.xml.in.h:88 -msgid "Whether to show a popup notification when a contact goes online." -msgstr "当联系人上线时是否显示弹出通知" +msgid "Default camera device to use in video calls, e.g. /dev/video0." +msgstr "视频呼叫时默认使用的相机设备，例如 /dev/video0。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:89 -msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." -msgstr "如果聊天窗口已开启，但不是当前窗口，接收新消息时是否弹出提示。" +msgid "Camera position" +msgstr "相机位置" #: ../data/org.gnome.Empathy.gschema.xml.in.h:90 -msgid "Whether to show a popup notification when receiving a new message." -msgstr "当收到新消息时是否弹出显示提示框。" +msgid "Position the camera preview should be during a call." +msgstr "在通话时摄像头预览的位置。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:91 -msgid "Whether to show account balances in the contact list." -msgstr "是否在联系人列表和聊天窗口中显示余额。" +msgid "Echo cancellation support" +msgstr "回声抑制支持" #: ../data/org.gnome.Empathy.gschema.xml.in.h:92 -msgid "" -"Whether to show avatars for contacts in the contact list and chat windows." -msgstr "是否在联系人列表和聊天窗口中显示头像。" +msgid "Whether to enable Pulseaudio's echo cancellation filter." +msgstr "是否启用 Pulseaudio 的回声抑制过滤器。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:93 -msgid "Whether to show contacts that are offline in the contact list." -msgstr "是否显示联系人清单中离线的联系人。" +msgid "Show hint about closing the main window" +msgstr "关闭主窗口时显示提示" #: ../data/org.gnome.Empathy.gschema.xml.in.h:94 -msgid "Whether to show popup notifications when away or busy." -msgstr "当离开或忙碌时是否弹出显示提示框。" +msgid "" +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." +msgstr "当使用标题栏中的“X”按钮关闭主窗口时是否显示提示对话框。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:95 -msgid "Whether to show protocols for contacts in the contact list." -msgstr "是否在联系人列表和聊天窗口中显示协议。" +msgid "Empathy can publish the user's location" +msgstr "Empathy 能够发布用户的位置" #: ../data/org.gnome.Empathy.gschema.xml.in.h:96 -msgid "Whether to show the contact list in chat rooms." -msgstr "是否在聊天室显示联系人列表。" +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "是否允许 Empathy 将用户的位置共享给联系人" #: ../data/org.gnome.Empathy.gschema.xml.in.h:97 -msgid "Whether to show the contact list in compact mode." -msgstr "是否以紧凑模式显示联系人列表。" +msgid "Empathy can use the network to guess the location" +msgstr "Empathy 能够通过网络来估计位置" #: ../data/org.gnome.Empathy.gschema.xml.in.h:98 -msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." -msgstr "当使用标题栏中的“X”按钮关闭主窗口时是否显示提示对话框。" +msgid "Whether Empathy can use the network to guess the location." +msgstr "是否允许 Empathy 通过网络估计位置" #: ../data/org.gnome.Empathy.gschema.xml.in.h:99 -msgid "Whether to use the theme for chat rooms." -msgstr "是否对聊天室使用主题。" +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy 能够通过手机来估计位置" #: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "是否允许 Empathy 通过手机网络估计位置" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy 能够通过 GPS 来估计位置" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "是否允许 Empathy 通过 GPS 估计位置" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 +msgid "Empathy should reduce the location's accuracy" +msgstr "降低 Emapthy 位置信息的准确度" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 msgid "" -"Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." -msgstr "" -"使用何种条件来排序联系人列表。默认情况下使用值“姓名”以按联系人姓名排序。取值" -"为“状态”时将按状态排序联系人列表。" +"Whether Empathy should reduce the location's accuracy for privacy reasons." +msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。" +#. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2330 +msgid "Messaging and VoIP Accounts" +msgstr "消息和 VoIP 帐号" + +#: ../data/empathy-accounts.desktop.in.in.h:2 msgid "Manage Messaging and VoIP accounts" msgstr "管理消息和 VoIP 帐号" -#. Tweak the dialog -#: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2312 -msgid "Messaging and VoIP Accounts" -msgstr "消息和 VoIP 帐号" +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "未指定原因" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "需要状态改变信息" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "您取消了文件传输" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "另外的参与者取消了文件的传输" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "当传输这个文件的时候发生错误" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "另外的参与者无法传输这个文件" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "未知原因" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "文件传输完成，但该文件已损坏" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "文件传输不支持远程连接" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "所选文件是非正常的文件" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "所选文件是空的" @@ -515,450 +564,394 @@ msgstr "与 %s 通话" msgid "Call from %s" msgstr "来电：%s" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "不支持 Socket 类型" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "未指定原因" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "需要状态改变信息" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "您取消了文件传输" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "另外的参与者取消了文件的传输" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "当传输这个文件的时候发生错误" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "另外的参与者无法传输这个文件" - -#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "未知原因" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "在线" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "忙碌" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "离开" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "隐身" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "离线" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "未知" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "未指定原因" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "状态已设置为离线" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "网络错误" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "验证失败" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "加密错误" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" -msgstr "用户名已经被占用" +msgstr "用户名已被占用" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "未提供证书" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "证书不被信任" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "证书已过期" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "证书尚未激活" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "证书主机名不匹配" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "证书指纹不匹配" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "证书是自签属的" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "证书错误" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "加密不可用" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "证书无效" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "连接被拒绝" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "无法建立连接" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "连接已丢失" -#: ../libempathy/empathy-utils.c:354 -msgid "This resource is already connected to the server" -msgstr "该资源已被连接至服务器" +#: ../libempathy/empathy-utils.c:355 +msgid "This account is already connected to the server" +msgstr "该帐号已连接到服务器" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "连接已被使用相同资源的新连接取代" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "服务器上已存在该帐号" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "服务器太忙，无法处理当前连接" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "证书已被吊销" # lainme：证书使用不安全的加密算法或是弱加密的 # xslidian：证书使用的加密算法不安全或者易被破解 -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "证书使用不安全的加密算法或者是弱加密的" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:369 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" msgstr "服务器证书的长度——或服务器证书链的深度——超出了加密库的硬性限制" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:373 msgid "Your software is too old" msgstr "你的软件版本太旧了" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "内部错误" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "附近的人" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Yahoo! 日本" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Facebook 聊天" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "%d 秒钟前" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "%d 分钟前" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "%d 小时前" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 天前" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d 星期前" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d 月前" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "将来" -#: ../libempathy-gtk/empathy-account-chooser.c:688 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "全部帐号" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "帐号" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "密码" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "服务器" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "端口" -#: ../libempathy-gtk/empathy-account-widget.c:776 -#: ../libempathy-gtk/empathy-account-widget.c:828 +#: ../libempathy-gtk/empathy-account-widget.c:765 +#: ../libempathy-gtk/empathy-account-widget.c:817 #, c-format msgid "%s:" msgstr "%s：" -#: ../libempathy-gtk/empathy-account-widget.c:1182 -msgid "My Web Accounts" -msgstr "我的网络帐号" - -#: ../libempathy-gtk/empathy-account-widget.c:1199 -#, c-format -msgid "The account %s is edited via %s." -msgstr "%s 帐号通过 %s 进行了编辑。" - -#: ../libempathy-gtk/empathy-account-widget.c:1205 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "%s 帐号无法在 Empathy 中编辑。" - -#: ../libempathy-gtk/empathy-account-widget.c:1224 -msgid "Launch My Web Accounts" -msgstr "启动我的网络帐号" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1232 -#, c-format -msgid "Edit %s" -msgstr "编辑 %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1582 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget.c:1398 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Username:" msgstr "用户名：" -#: ../libempathy-gtk/empathy-account-widget.c:1900 +#: ../libempathy-gtk/empathy-account-widget.c:1710 msgid "A_pply" msgstr "应用(_P)" -#: ../libempathy-gtk/empathy-account-widget.c:1930 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "L_og in" msgstr "登录(_O)" -#: ../libempathy-gtk/empathy-account-widget.c:2004 +#: ../libempathy-gtk/empathy-account-widget.c:1812 msgid "This account already exists on the server" msgstr "服务器上已存在该帐号" -#: ../libempathy-gtk/empathy-account-widget.c:2007 +#: ../libempathy-gtk/empathy-account-widget.c:1816 msgid "Create a new account on the server" msgstr "在服务器上创建新的帐号" -#: ../libempathy-gtk/empathy-account-widget.c:2201 -msgid "Ca_ncel" -msgstr "取消(_N)" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2479 +#: ../libempathy-gtk/empathy-account-widget.c:2241 #, c-format msgid "%1$s on %2$s" msgstr "%2$s 中的 %1$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2505 +#: ../libempathy-gtk/empathy-account-widget.c:2267 #, c-format msgid "%s Account" msgstr "%s 帐号" -#: ../libempathy-gtk/empathy-account-widget.c:2509 +#: ../libempathy-gtk/empathy-account-widget.c:2271 msgid "New account" msgstr "新建帐号" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 -msgid "Example: MyScreenName" -msgstr "例如： 我的屏幕名称" +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Pass_word:" +msgstr "密码(_W)：" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 -msgid "Advanced" -msgstr "高级" +msgid "Screen _Name:" +msgstr "用户名(_N)：" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +msgid "Example: MyScreenName" +msgstr "例如： 我的屏幕名称" + +#. remember password ticky box +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 -msgid "Pass_word:" -msgstr "密码(_W)：" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 +msgid "Remember password" +msgstr "记住密码" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -msgid "Remember Password" -msgstr "记住密码" +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Port:" +msgstr "端口(_P)：" -#. remember password ticky box -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-base-password-dialog.c:261 -msgid "Remember password" -msgstr "记住密码" - -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 -msgid "Screen _Name:" -msgstr "用户名(_N)：" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "_Server:" +msgstr "服务器(_S)：" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 -msgid "What is your AIM password?" -msgstr "您的 AIM 密码是什么？" +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +msgid "Advanced" +msgstr "高级" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 msgid "What is your AIM screen name?" msgstr "您的 AIM 屏幕名称是什么？" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 -msgid "_Port:" -msgstr "端口(_P)：" +msgid "What is your AIM password?" +msgstr "您的 AIM 密码是什么？" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../src/empathy-new-chatroom-dialog.ui.h:9 -msgid "_Server:" -msgstr "服务器(_S)：" - -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "Example: username" -msgstr "例如：用户名" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "Remember Password" +msgstr "记住密码" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "登录 I_D：" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Example: username" +msgstr "例如：用户名" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 msgid "What is your GroupWise User ID?" msgstr "您的 GroupWise 用户名是什么？" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9 msgid "What is your GroupWise password?" msgstr "您的 GroupWise 密码是什么？" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "ICQ _UIN：" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "Example: 123456789" msgstr "例如：123456789" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "Ch_aracter set:" msgstr "字符集(_A):" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 -msgid "ICQ _UIN:" -msgstr "ICQ _UIN：" - -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 msgid "What is your ICQ UIN?" msgstr "您的 ICQ UIN 是什么？" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10 msgid "What is your ICQ password?" msgstr "您的 ICQ 密码是什么？" @@ -995,24 +988,28 @@ msgstr "选项" msgid "None" msgstr "无" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Network" +msgstr "网络" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +msgid "Network:" +msgstr "网络：" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Character set:" msgstr "字符集：" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +msgid "Servers" +msgstr "服务器" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." msgstr "大多数 IRC 服务器不需要密码，如果您不确定，则不要输入密码。" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 -msgid "Network" -msgstr "网络" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 -msgid "Network:" -msgstr "网络：" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "昵称：" @@ -1029,48 +1026,20 @@ msgstr "退出消息：" msgid "Real name:" msgstr "真名：" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 -msgid "Servers" -msgstr "服务器" - #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 -msgid "What is your IRC nickname?" -msgstr "您的 IRC 昵称是什么?" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Which IRC network?" msgstr "哪个 IRC 网络?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "Example: user@gmail.com" -msgstr "例如：user@gmail.com" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "Example: user@jabber.org" -msgstr "例如：user@jabber.org" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 -msgid "Encr_yption required (TLS/SSL)" -msgstr "需要加密(TLS/SSL)(_Y)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 -msgid "I_gnore SSL certificate errors" -msgstr "忽略 SSL 证书错误(_G)" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 -msgid "Override server settings" -msgstr "覆盖服务器设置" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 -msgid "Priori_ty:" -msgstr "优先级(_T):" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +msgid "What is your IRC nickname?" +msgstr "您的 IRC 昵称是什么?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 -msgid "Reso_urce:" -msgstr "资源(_U)：" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +msgid "What is your Facebook username?" +msgstr "您的 Facebook 用户名是什么？" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/badger, enter badger.\n" @@ -1082,179 +1051,203 @@ msgstr "" "badger。如果您还没有 Facebook 用户名的话，使用这个页面 来选择一个。" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 -msgid "Use old SS_L" -msgstr "使用旧的 SS_L" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "What is your Facebook password?" msgstr "您的 Facebook 密码是什么？" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 -msgid "What is your Facebook username?" -msgstr "您的 Facebook 用户名是什么？" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "What is your Google ID?" msgstr "您的 Google ID 是什么？" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "Example: user@gmail.com" +msgstr "例如：user@gmail.com" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "What is your Google password?" msgstr "您的 Google 密码是什么？" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +msgid "Example: user@jabber.org" +msgstr "例如：user@jabber.org" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "I_gnore SSL certificate errors" +msgstr "忽略 SSL 证书错误(_G)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +msgid "Priori_ty:" +msgstr "优先级(_T):" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +msgid "Reso_urce:" +msgstr "资源(_U)：" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +msgid "Encr_yption required (TLS/SSL)" +msgstr "需要加密(TLS/SSL)(_Y)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +msgid "Use old SS_L" +msgstr "使用旧的 SS_L" + #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +msgid "Override server settings" +msgstr "覆盖服务器设置" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 msgid "What is your Jabber ID?" msgstr "您的 Jabber ID 是什么？" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 -msgid "What is your Jabber password?" -msgstr "您的 Jabber 密码是什么？" - -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 msgid "What is your desired Jabber ID?" msgstr "您想要的 Jabber ID 是什么？" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26 +msgid "What is your Jabber password?" +msgstr "您的 Jabber 密码是什么？" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27 msgid "What is your desired Jabber password?" msgstr "您想要的 Jabber 密码是什么？" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 msgid "Example: user@hotmail.com" msgstr "例如：user@hotmail.com" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 msgid "What is your Windows Live ID?" msgstr "您的 Windows Live 帐号是什么？" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9 msgid "What is your Windows Live password?" msgstr "您的 Windows Live 密码是什么？" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "E-_mail address:" -msgstr "电子邮件地址(_M):" - -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 msgid "Nic_kname:" msgstr "昵称(_K):" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 +msgid "_Last Name:" +msgstr "姓(_L)：" + +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 msgid "_First Name:" msgstr "名(_F)" +#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 +msgid "_Published Name:" +msgstr "公开的名字(_P)：" + #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Jabber ID:" msgstr "_Jabber ID：" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6 -msgid "_Last Name:" -msgstr "姓(_L)：" +msgid "E-_mail address:" +msgstr "电子邮件地址(_M):" -#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -msgid "_Published Name:" -msgstr "公开的名字(_P)：" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "_Username:" +msgstr "用户名(_U)：" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Example: user@my.sip.server" msgstr "例如：user@my.sip.server" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "Authentication username:" -msgstr "验证用户名：" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover Binding" -msgstr "发现绑定" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "Discover the STUN server automatically" -msgstr "自动发现 STUN 服务器" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 +msgid "Use this account to call _landlines and mobile phones" +msgstr "用此帐号拨打固定电话和手机(_L)" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 -msgid "Ignore TLS Errors" -msgstr "忽略 TLS 错误" +msgid "NAT Traversal Options" +msgstr "NAT 选项" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "Interval (seconds)" -msgstr "间隔(秒)" +msgid "Proxy Options" +msgstr "代理选项" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -msgid "Keep-Alive Options" -msgstr "Keep-Alive 选项" +msgid "Miscellaneous Options" +msgstr "杂项" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 -msgid "Loose Routing" -msgstr "宽松路由" +msgid "STUN Server:" +msgstr "STUN 服务器：" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 -msgid "Mechanism:" -msgstr "机制：" +msgid "Discover the STUN server automatically" +msgstr "自动发现 STUN 服务器" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 -msgid "Miscellaneous Options" -msgstr "杂项" +msgid "Discover Binding" +msgstr "发现绑定" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -msgid "NAT Traversal Options" -msgstr "NAT 选项" +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 +msgid "Server:" +msgstr "服务器：" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Keep-Alive Options" +msgstr "Keep-Alive 选项" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 -msgid "Port:" -msgstr "端口：" +msgid "Mechanism:" +msgstr "机制：" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 -msgid "Proxy Options" -msgstr "代理选项" +msgid "Interval (seconds)" +msgstr "间隔(秒)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Authentication username:" +msgstr "验证用户名：" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Transport:" +msgstr "传输：" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -msgid "STUN Server:" -msgstr "STUN 服务器：" +msgid "Loose Routing" +msgstr "宽松路由" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 -msgid "Server:" -msgstr "服务器：" +msgid "Ignore TLS Errors" +msgstr "忽略 TLS 错误" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -msgid "Transport:" -msgstr "传输：" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -msgid "Use this account to call _landlines and mobile phones" -msgstr "用此帐户拨打固定电话和手机(_L)" +msgid "Port:" +msgstr "端口：" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 -msgid "What is your SIP account password?" -msgstr "您的 SIP 帐号密码是什么？" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "您的 SIP 登录 ID 是什么？" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 -msgid "_Username:" -msgstr "用户名(_U)：" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "What is your SIP account password?" +msgstr "您的 SIP 帐号密码是什么？" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Yahoo! I_D:" +msgstr "Yahoo I_D：" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "I_gnore conference and chat room invitations" msgstr "忽略会议和聊天室邀请(_G)" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Room List locale:" +msgstr "聊天室列表 locale(_R)：" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "What is your Yahoo! ID?" msgstr "您的 Yahoo! ID 是什么？" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "What is your Yahoo! password?" msgstr "您的 Yahoo! 密码是什么？" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "Yahoo! I_D:" -msgstr "Yahoo I_D：" - -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 -msgid "_Room List locale:" -msgstr "聊天室列表 locale(_R)：" - #: ../libempathy-gtk/empathy-avatar-chooser.c:471 #: ../libempathy-gtk/empathy-avatar-chooser.c:556 msgid "Couldn't convert image" @@ -1317,62 +1310,62 @@ msgstr "不支持在此会话上进行紧急呼叫" msgid "You don't have enough credit in order to place this call" msgstr "您信用卡余额不足以支付此次通话" -#: ../libempathy-gtk/empathy-chat.c:706 +#: ../libempathy-gtk/empathy-chat.c:728 msgid "Failed to open private chat" msgstr "建立私人对话失败" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:786 msgid "Topic not supported on this conversation" msgstr "不支持在此会话上设置主题" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:792 msgid "You are not allowed to change the topic" msgstr "您不能更改主题" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:991 #, c-format msgid "“%s” is not a valid contact ID" msgstr "%s 是无效的联系人 ID" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1086 msgid "/clear: clear all messages from the current conversation" msgstr "/clear：清空当前会话的所有消息" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1089 msgid "/topic : set the topic of the current conversation" msgstr "/topic <主题>：设定当前对话的主题" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/join : join a new chat room" msgstr "/join <聊天室名>：加入一个新的聊天室" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "/j : join a new chat room" msgstr "/j <聊天室名>：加入一个新的聊天室" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1099 msgid "" "/part [] []: leave the chat room, by default the " "current one" msgstr "/用户[<聊天室ID>] [<原因>]：当前默认离开聊天室" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "/query []: open a private chat" msgstr "/query <昵称> [<消息>]：打开一个私人聊天" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "/msg : open a private chat" msgstr "/msg <昵称> <消息>：打开一个私人聊天" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "/nick : change your nickname on the current server" msgstr "/nick <昵称>：在当前服务器上改变您的昵称" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "/me : send an ACTION message to the current conversation" msgstr "/me <动作消息>：向当前对话中发送一个动作消息" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1381,131 +1374,137 @@ msgstr "" "/say <消息>：发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如：“/" "say /join 是用来加入一个新的聊天室”" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1120 msgid "/whois : display information about a contact" msgstr "/whois <联系人 ID>：显示一个联系人的信息" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1123 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." msgstr "" "/help [<命令>]：显示所有支持的命令。如果 <命令> 是有定义的，则显示它的用法。" -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1142 #, c-format msgid "Usage: %s" msgstr "用法：%s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1187 msgid "Unknown command" msgstr "未知命令" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1313 msgid "Unknown command; see /help for the available commands" msgstr "未知命令，请使用 /help 查阅可用命令" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1564 msgid "insufficient balance to send message" msgstr "余额不足，无法发送消息" -#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582 +#: ../libempathy-gtk/empathy-chat.c:1645 #, c-format msgid "Error sending message '%s': %s" msgstr "发送消息“%s”出错：%s" -#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587 +#: ../libempathy-gtk/empathy-chat.c:1649 #, c-format msgid "Error sending message: %s" msgstr "发送消息出错：%s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1469 +#: ../libempathy-gtk/empathy-chat.c:1576 #, c-format msgid "insufficient balance to send message. Top up." msgstr "余额不足，无法发送消息。 充值。" -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "not capable" msgstr "做不到" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "offline" msgstr "离线" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1626 msgid "invalid contact" msgstr "无效联系人" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1629 msgid "permission denied" msgstr "权限不足" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1632 msgid "too long message" msgstr "消息太长" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1635 msgid "not implemented" msgstr "尚未实现" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1639 msgid "unknown" msgstr "未知" -#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "话题：" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1721 #, c-format msgid "Topic set to: %s" msgstr "话题被设置为：%s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1723 +#, c-format +msgid "Topic set by %s to: %s" +msgstr "话题被 %s 设置为：%s" + +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1728 msgid "No topic defined" msgstr "未设置话题" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2244 msgid "(No Suggestions)" msgstr "(没有建议)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2312 #, c-format msgid "Add '%s' to Dictionary" msgstr "添加“%s”到字典" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2349 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "添加“%s”到 %s 字典" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2419 msgid "Insert Smiley" msgstr "插入表情" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 +#: ../libempathy-gtk/empathy-chat.c:2437 #: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "发送(_S)" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2376 +#: ../libempathy-gtk/empathy-chat.c:2494 msgid "_Spelling Suggestions" msgstr "拼写建议(_S)" -#: ../libempathy-gtk/empathy-chat.c:2465 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "获取最近日志失败" -#: ../libempathy-gtk/empathy-chat.c:2602 +#: ../libempathy-gtk/empathy-chat.c:2722 #, c-format msgid "%s has disconnected" msgstr "%s 已断开连接" @@ -1513,12 +1512,12 @@ msgstr "%s 已断开连接" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2609 +#: ../libempathy-gtk/empathy-chat.c:2729 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s 被 %2$s 踢出" -#: ../libempathy-gtk/empathy-chat.c:2612 +#: ../libempathy-gtk/empathy-chat.c:2732 #, c-format msgid "%s was kicked" msgstr "%s 被踢出" @@ -1526,17 +1525,17 @@ msgstr "%s 被踢出" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2620 +#: ../libempathy-gtk/empathy-chat.c:2740 #, c-format msgid "%1$s was banned by %2$s" msgstr "%s 已被 %s 禁止" -#: ../libempathy-gtk/empathy-chat.c:2623 +#: ../libempathy-gtk/empathy-chat.c:2743 #, c-format msgid "%s was banned" msgstr "%s 被禁止" -#: ../libempathy-gtk/empathy-chat.c:2627 +#: ../libempathy-gtk/empathy-chat.c:2747 #, c-format msgid "%s has left the room" msgstr "%s 离开了聊天室" @@ -1546,17 +1545,17 @@ msgstr "%s 离开了聊天室" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2636 +#: ../libempathy-gtk/empathy-chat.c:2756 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2661 +#: ../libempathy-gtk/empathy-chat.c:2781 #, c-format msgid "%s has joined the room" msgstr "%s 加入了聊天室" -#: ../libempathy-gtk/empathy-chat.c:2686 +#: ../libempathy-gtk/empathy-chat.c:2806 #, c-format msgid "%s is now known as %s" msgstr "%s 现在叫做 %s" @@ -1564,90 +1563,90 @@ msgstr "%s 现在叫做 %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2847 +#: ../libempathy-gtk/empathy-chat.c:2993 #: ../src/empathy-streamed-media-window.c:1889 -#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1538 -#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545 +#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638 msgid "Disconnected" msgstr "已断开连接" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3493 +#: ../libempathy-gtk/empathy-chat.c:3657 msgid "Would you like to store this password?" msgstr "是否保存密码?" -#: ../libempathy-gtk/empathy-chat.c:3499 +#: ../libempathy-gtk/empathy-chat.c:3663 msgid "Remember" msgstr "记录" -#: ../libempathy-gtk/empathy-chat.c:3509 +#: ../libempathy-gtk/empathy-chat.c:3673 msgid "Not now" msgstr "不是现在" -#: ../libempathy-gtk/empathy-chat.c:3553 +#: ../libempathy-gtk/empathy-chat.c:3717 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "重试" -#: ../libempathy-gtk/empathy-chat.c:3557 +#: ../libempathy-gtk/empathy-chat.c:3721 msgid "Wrong password; please try again:" msgstr "密码错误，请重试：" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3687 +#: ../libempathy-gtk/empathy-chat.c:3851 msgid "This room is protected by a password:" msgstr "这个房间是由一个密码保护的：" -#: ../libempathy-gtk/empathy-chat.c:3714 +#: ../libempathy-gtk/empathy-chat.c:3878 msgid "Join" msgstr "加入" -#: ../libempathy-gtk/empathy-chat.c:3902 ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "已连接" -#: ../libempathy-gtk/empathy-chat.c:3957 +#: ../libempathy-gtk/empathy-chat.c:4125 msgid "Conversation" msgstr "对话" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3962 +#: ../libempathy-gtk/empathy-chat.c:4130 #, c-format msgid "%s (SMS)" msgstr "%s (短信)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "未知或无效的识别符" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "联系人屏蔽暂时不可用" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "联系人屏蔽不可用" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "权限不足" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "无法屏蔽联系人" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "编辑屏蔽的联系人" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506 -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1475 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 +#: ../src/empathy-chatrooms-window.ui.h:2 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "Account:" msgstr "帐号：" @@ -1657,7 +1656,7 @@ msgstr "已屏蔽的联系人" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:2 #: ../src/empathy-chatrooms-window.ui.h:3 msgid "Remove" msgstr "删除" @@ -1680,121 +1679,45 @@ msgstr "打开链接(_O)" msgid "%A %B %d %Y" msgstr "%A %B %d %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:287 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "编辑联系人信息" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:338 -msgid "Personal Information" -msgstr "个人信息" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:439 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "新建联系人" -#: ../libempathy-gtk/empathy-contact-dialogs.c:508 -#: ../libempathy-gtk/empathy-individual-dialogs.c:198 +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "屏蔽 %s？" -#: ../libempathy-gtk/empathy-contact-dialogs.c:513 -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "确定要屏蔽 %s 以阻止他再次联系您吗？" -#: ../libempathy-gtk/empathy-contact-dialogs.c:518 -#: ../libempathy-gtk/empathy-individual-dialogs.c:275 +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 msgid "_Block" msgstr "屏蔽(_B)" -#: ../libempathy-gtk/empathy-contact-dialogs.c:536 -#: ../libempathy-gtk/empathy-individual-dialogs.c:284 +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "举报联系人滥用" #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "以后再决定(_L)" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "订阅请求" -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "_Block User" msgstr "屏蔽用户(_B)" -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../libempathy-gtk/empathy-individual-menu.c:1558 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "添加联系人(_A)..." - -#: ../libempathy-gtk/empathy-contact-menu.c:287 -msgid "_Block Contact" -msgstr "屏蔽联系人" - -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:316 -#: ../libempathy-gtk/empathy-individual-menu.c:789 -#: ../libempathy-gtk/empathy-new-message-dialog.c:320 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "聊天(_C)" - -#: ../libempathy-gtk/empathy-contact-menu.c:348 -#: ../libempathy-gtk/empathy-individual-menu.c:881 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "音频呼叫(_A)" - -#: ../libempathy-gtk/empathy-contact-menu.c:381 -#: ../libempathy-gtk/empathy-individual-menu.c:926 -msgctxt "menu item" -msgid "_Video Call" -msgstr "视频呼叫(_V)" - -#: ../libempathy-gtk/empathy-contact-menu.c:427 -#: ../libempathy-gtk/empathy-individual-menu.c:979 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "最近会话(_P)" - -#: ../libempathy-gtk/empathy-contact-menu.c:449 -#: ../libempathy-gtk/empathy-individual-menu.c:1020 -msgid "Send File" -msgstr "发送文件" - -#: ../libempathy-gtk/empathy-contact-menu.c:472 -#: ../libempathy-gtk/empathy-individual-menu.c:1062 -msgid "Share My Desktop" -msgstr "共享我的桌面" - -#: ../libempathy-gtk/empathy-contact-menu.c:501 -#: ../libempathy-gtk/empathy-individual-menu.c:1125 -msgid "Infor_mation" -msgstr "信息(_M)" - -#: ../libempathy-gtk/empathy-contact-menu.c:547 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "编辑(_E)" - -#: ../libempathy-gtk/empathy-contact-menu.c:601 -#: ../libempathy-gtk/empathy-individual-menu.c:1316 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "邀请到此聊天室" - -#: ../libempathy-gtk/empathy-contact-menu.c:632 -#: ../libempathy-gtk/empathy-individual-menu.c:1362 -msgid "_Invite to Chat Room" -msgstr "邀请到聊天室(_I)" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "Decide _Later" +msgstr "以后再决定(_L)" #. Title #: ../libempathy-gtk/empathy-contact-search-dialog.c:499 @@ -1821,166 +1744,170 @@ msgstr "您的自我介绍信息：" msgid "Please let me see when you're online. Thanks!" msgstr "你在线时请让我知道，谢谢！" -#: ../libempathy-gtk/empathy-contact-widget.c:571 +#: ../libempathy-gtk/empathy-contact-widget.c:569 #: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "频道：" -#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-contact-widget.c:749 #: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "包括 ISO 编码：" -#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-contact-widget.c:751 #: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "国家：" -#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-contact-widget.c:753 #: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "省：" -#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-contact-widget.c:755 #: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "城市：" -#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-contact-widget.c:757 #: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "地区：" -#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-contact-widget.c:759 #: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "邮政编码：" -#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-contact-widget.c:761 #: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "街道：" -#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-contact-widget.c:763 #: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "建筑物：" -#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-contact-widget.c:765 #: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "楼层：" -#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-contact-widget.c:767 #: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "房间：" -#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-contact-widget.c:769 #: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "文本：" -#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-contact-widget.c:771 #: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "描述：" -#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-contact-widget.c:773 #: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI：" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:775 #: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "准确程度：" -#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-contact-widget.c:777 #: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "错误：" -#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-contact-widget.c:779 #: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "垂直误差(ç±³)：" -#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-contact-widget.c:781 #: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "水平误差(ç±³)：" -#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-contact-widget.c:783 #: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "速度：" -#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-contact-widget.c:785 #: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "方位朝向：" -#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-contact-widget.c:787 #: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "爬升速度：" -#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-contact-widget.c:789 #: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "最近更新于：" -#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-contact-widget.c:791 #: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "经度：" -#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-contact-widget.c:793 #: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "纬度：" -#: ../libempathy-gtk/empathy-contact-widget.c:797 +#: ../libempathy-gtk/empathy-contact-widget.c:795 #: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "海拔：" -#: ../libempathy-gtk/empathy-contact-widget.c:850 -#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-contact-widget.c:848 +#: ../libempathy-gtk/empathy-contact-widget.c:863 #: ../libempathy-gtk/empathy-individual-widget.c:593 #: ../libempathy-gtk/empathy-individual-widget.c:608 -#: ../src/empathy-preferences.ui.h:15 +#: ../src/empathy-preferences.ui.h:35 msgid "Location" msgstr "位置" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:867 +#: ../libempathy-gtk/empathy-contact-widget.c:865 #: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:919 +#: ../libempathy-gtk/empathy-contact-widget.c:917 #: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%B %e,%Y 于 %R UTC 时间" -#: ../libempathy-gtk/empathy-contact-widget.c:1001 -#: ../libempathy-gtk/empathy-individual-widget.c:901 +#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "保存头像" -#: ../libempathy-gtk/empathy-contact-widget.c:1057 -#: ../libempathy-gtk/empathy-individual-widget.c:959 +#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "无法保存头像" -#: ../libempathy-gtk/empathy-contact-widget.c:1745 -#: ../libempathy-gtk/empathy-individual-menu.c:1097 -#: ../libempathy-gtk/empathy-individual-widget.c:1358 -msgid "Favorite" -msgstr "收藏" +#: ../libempathy-gtk/empathy-contact-widget.c:1446 +msgid "Personal Details" +msgstr "个人详情" + +#: ../libempathy-gtk/empathy-contact-widget.c:1449 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +msgid "Contact Details" +msgstr "联系人详情" #: ../libempathy-gtk/empathy-contactinfo-utils.c:104 msgid "Full name" @@ -2047,176 +1974,216 @@ msgstr "邮政" msgid "parcel" msgstr "邮件" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -msgid "Location at (date)\t" -msgstr "位置于(日期）\t" +#. Identifier to connect to Instant Messaging network +#. Translators: Identifier to connect to Instant Messaging network +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 +msgid "Identifier:" +msgstr "标识符：" #. Alias -#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1294 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "别名：" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "Client Information" -msgstr "客户端信息" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 -msgid "Client:" -msgstr "客户端：" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 -msgid "Contact Details" -msgstr "联系人详情" - -#. Identifier to connect to Instant Messaging network -#. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1503 -msgid "Identifier:" -msgstr "标识符：" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Location at (date)\t" +msgstr "位置于(日期）\t" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 msgid "Information requested…" msgstr "已发送信息请求..." -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Client Information" +msgstr "客户端信息" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "OS:" msgstr "操作系统：" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Version:" msgstr "版本：" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Client:" +msgstr "客户端：" + +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "组" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." msgstr "选择您想将该联系人加入的群组。注意您可以选择多个群组，也可以不选择。" -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "添加群组(_A)" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "选择" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1952 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1970 msgid "Group" msgstr "群组" -#: ../libempathy-gtk/empathy-individual-dialogs.c:258 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "以下用户将被屏蔽：" -#: ../libempathy-gtk/empathy-individual-dialogs.c:265 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "以下用户无法被屏蔽：" -#. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 -msgid "Linked Contacts" -msgstr "已绑定的联系人" - -#: ../libempathy-gtk/empathy-individual-linker.c:372 -msgid "Select contacts to link" -msgstr "选择要绑定的联系人" - -#: ../libempathy-gtk/empathy-individual-linker.c:447 -msgid "New contact preview" -msgstr "新联系人预览" - -#: ../libempathy-gtk/empathy-individual-linker.c:491 -msgid "Contacts selected in the list on the left will be linked together." -msgstr "在左侧列表中选中的联系人将被绑定在一起。" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "编辑联系人信息" #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:148 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:312 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" -msgstr "选择要用于拨打电话的帐户" +msgstr "选择要用于拨打电话的帐号" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:316 -#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../libempathy-gtk/empathy-individual-menu.c:348 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-streamed-media-window.c:1288 -#: ../src/empathy-call-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "通话" -#: ../libempathy-gtk/empathy-individual-menu.c:381 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "手机" -#: ../libempathy-gtk/empathy-individual-menu.c:383 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "办公" -#: ../libempathy-gtk/empathy-individual-menu.c:385 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "家庭" +#: ../libempathy-gtk/empathy-individual-menu.c:658 +msgid "_Block Contact" +msgstr "屏蔽联系人" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1017 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:1 +msgid "_Chat" +msgstr "聊天(_C)" + #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:836 -#: ../libempathy-gtk/empathy-new-message-dialog.c:314 +#: ../libempathy-gtk/empathy-individual-menu.c:1052 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "短信(_S)" -#: ../libempathy-gtk/empathy-individual-menu.c:1174 +#: ../libempathy-gtk/empathy-individual-menu.c:1085 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "音频呼叫(_A)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1118 +msgctxt "menu item" +msgid "_Video Call" +msgstr "视频呼叫(_V)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1159 +#: ../src/empathy-roster-window-menubar.ui.h:4 +msgid "_Previous Conversations" +msgstr "最近会话(_P)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1188 +msgid "Send File" +msgstr "发送文件" + +#: ../libempathy-gtk/empathy-individual-menu.c:1218 +msgid "Share My Desktop" +msgstr "共享我的桌面" + +#: ../libempathy-gtk/empathy-individual-menu.c:1244 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "收藏" + +#: ../libempathy-gtk/empathy-individual-menu.c:1263 +msgid "gnome-contacts not installed" +msgstr "gnome-contacts 未安装" + +#: ../libempathy-gtk/empathy-individual-menu.c:1266 +msgid "Please install gnome-contacts to access contacts details." +msgstr "请安装 gnome-contacts 来访问联系人详情。" + +#: ../libempathy-gtk/empathy-individual-menu.c:1380 +msgid "Infor_mation" +msgstr "信息(_M)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1429 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "编辑(_E)" -#. Translators: this is a verb meaning "to connect two contacts together -#. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1200 -msgctxt "Link individual (contextual menu)" -msgid "_Link Contacts…" -msgstr "绑定联系人(_L)…" +#: ../libempathy-gtk/empathy-individual-menu.c:1546 +#: ../src/empathy-chat-window.c:1175 +msgid "Inviting you to this room" +msgstr "邀请到此聊天室" + +#: ../libempathy-gtk/empathy-individual-menu.c:1592 +msgid "_Invite to Chat Room" +msgstr "邀请到聊天室(_I)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1788 +#: ../src/empathy-roster-window-menubar.ui.h:5 +msgid "_Add Contact…" +msgstr "添加联系人(_A)..." -#: ../libempathy-gtk/empathy-individual-view.c:2362 +#: ../libempathy-gtk/empathy-individual-view.c:2306 msgid "Delete and _Block" msgstr "删除并屏蔽(_B)" -#: ../libempathy-gtk/empathy-individual-view.c:2397 +#: ../libempathy-gtk/empathy-individual-view.c:2341 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "您真的要删除群组“%s”吗？" -#: ../libempathy-gtk/empathy-individual-view.c:2400 +#: ../libempathy-gtk/empathy-individual-view.c:2344 msgid "Removing group" msgstr "删除群组" #. Remove -#: ../libempathy-gtk/empathy-individual-view.c:2455 -#: ../libempathy-gtk/empathy-individual-view.c:2672 +#: ../libempathy-gtk/empathy-individual-view.c:2399 +#: ../libempathy-gtk/empathy-individual-view.c:2603 msgid "_Remove" msgstr "删除(_R)" -#: ../libempathy-gtk/empathy-individual-view.c:2532 +#: ../libempathy-gtk/empathy-individual-view.c:2476 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "您真的想要删除联系人“%s”吗？" -#: ../libempathy-gtk/empathy-individual-view.c:2541 +#: ../libempathy-gtk/empathy-individual-view.c:2485 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2224,11 +2191,11 @@ msgid "" msgstr "" "您是否真正地想要删除已绑定的联系人'%s' ？ 注意这将删除所有联系已绑定的联系人" -#: ../libempathy-gtk/empathy-individual-view.c:2553 +#: ../libempathy-gtk/empathy-individual-view.c:2497 msgid "Removing contact" msgstr "删除联系人" -#: ../libempathy-gtk/empathy-individual-widget.c:1642 +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2238,23 +2205,23 @@ msgstr[0] "已绑定联系人包含 %u 联系人" msgid "Location at (date)" msgstr "位置 于 (日期)" -#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 msgid "Online from a phone or mobile device" msgstr "通过电话或移动设备上网" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "新建网络" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "选择一个 IRC 网络" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "重置_Networks列表" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "选择" @@ -2267,308 +2234,246 @@ msgstr "新建服务器" msgid "SSL" msgstr "SSL" -#. Translators: this is the title of the linking dialogue (reached by -#. * right-clicking on a contact and selecting "Link…"). "Link" in this title -#. * is a verb. -#: ../libempathy-gtk/empathy-linking-dialog.c:115 -msgid "Link Contacts" -msgstr "绑定联系人" - -#: ../libempathy-gtk/empathy-linking-dialog.c:120 -msgctxt "Unlink individual (button)" -msgid "_Unlink…" -msgstr "解除绑定(_U)..." - -#: ../libempathy-gtk/empathy-linking-dialog.c:121 -msgid "" -"Completely split the displayed linked contacts into the separate contacts." -msgstr "完全分离已显示的绑定的联系人成为单独的联系人" - -#. Add button -#. Translators: this is an action button in the linking dialogue. "Link" is -#. * used here as a verb meaning "to connect two contacts to form a -#. * meta-contact". -#: ../libempathy-gtk/empathy-linking-dialog.c:136 -msgid "_Link" -msgstr "绑定(_L)" - -#: ../libempathy-gtk/empathy-linking-dialog.c:183 -#, c-format -msgid "Unlink linked contacts '%s'?" -msgstr "解除已绑定的联系人 %s？" - -#: ../libempathy-gtk/empathy-linking-dialog.c:186 -msgid "" -"Are you sure you want to unlink these linked contacts? This will completely " -"split the linked contacts into separate contacts." -msgstr "" -"您确定您要接触这些已绑定的联系人？这将会完全拆分已绑定的联系人为单独的联系" -"人。" - -#: ../libempathy-gtk/empathy-linking-dialog.c:190 -msgctxt "Unlink individual (button)" -msgid "_Unlink" -msgstr "解除绑定(_U)" - -#: ../libempathy-gtk/empathy-log-window.c:621 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "历史" -#: ../libempathy-gtk/empathy-log-window.c:676 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "显示" -#: ../libempathy-gtk/empathy-log-window.c:698 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "搜索" -#: ../libempathy-gtk/empathy-log-window.c:1147 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "在 %s 聊天" -#: ../libempathy-gtk/empathy-log-window.c:1149 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "与 %s 聊天" -#: ../libempathy-gtk/empathy-log-window.c:1199 -#: ../libempathy-gtk/empathy-log-window.c:1346 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%Yå¹´%m月%d日 %A" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1288 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1294 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: ../libempathy-gtk/empathy-log-window.c:1370 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s 秒" -#: ../libempathy-gtk/empathy-log-window.c:1377 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s 分" -#: ../libempathy-gtk/empathy-log-window.c:1385 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "通话时长：%s，结束于 %s" -#: ../libempathy-gtk/empathy-log-window.c:1719 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "今天" -#: ../libempathy-gtk/empathy-log-window.c:1723 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "昨天" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1738 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%Yå¹´%m月%d日" -#: ../libempathy-gtk/empathy-log-window.c:1826 -#: ../libempathy-gtk/empathy-log-window.c:3458 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "随时" -#: ../libempathy-gtk/empathy-log-window.c:1915 -#: ../libempathy-gtk/empathy-log-window.c:2371 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "任何人" -#: ../libempathy-gtk/empathy-log-window.c:2684 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "谁" -#: ../libempathy-gtk/empathy-log-window.c:2893 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "何时" -#: ../libempathy-gtk/empathy-log-window.c:3009 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "任何事" -#: ../libempathy-gtk/empathy-log-window.c:3011 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "文本聊天" -#: ../libempathy-gtk/empathy-log-window.c:3013 -#: ../src/empathy-preferences.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "通话" -#: ../libempathy-gtk/empathy-log-window.c:3018 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "来电" -#: ../libempathy-gtk/empathy-log-window.c:3019 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "呼出的语音通话" -#: ../libempathy-gtk/empathy-log-window.c:3020 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "未接来电" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "什么事" -#: ../libempathy-gtk/empathy-log-window.c:3751 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "确定要删除以前的全部对话日志？" -#: ../libempathy-gtk/empathy-log-window.c:3755 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "全部清除" -#: ../libempathy-gtk/empathy-log-window.c:3762 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "从以下位置删除：" #: ../libempathy-gtk/empathy-log-window.ui.h:1 -msgid "Loading..." -msgstr "正在载入..." +msgid "_File" +msgstr "文件(_F)" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 -#: ../src/empathy-chat-window.ui.h:3 -msgid "Chat" -msgstr "聊天" +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:12 +msgid "_Edit" +msgstr "编辑(_E)" -#: ../libempathy-gtk/empathy-log-window.ui.h:4 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Delete All History..." msgstr "清空全部历史..." -#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "Profile" msgstr "个人信息" -#: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:20 -msgid "Video" -msgstr "视频" +#: ../libempathy-gtk/empathy-log-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:19 +msgid "Chat" +msgstr "聊天" #: ../libempathy-gtk/empathy-log-window.ui.h:7 -#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 -msgid "_Edit" -msgstr "编辑(_E)" +#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "Video" +msgstr "视频" #: ../libempathy-gtk/empathy-log-window.ui.h:8 -msgid "_File" -msgstr "文件(_F)" - -#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "第 2 页" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 -#, fuzzy -#| msgid "The specified contact is offline" +#: ../libempathy-gtk/empathy-log-window.ui.h:9 +msgid "Loading..." +msgstr "正在载入..." + +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" -msgstr "选择的联系人离线" +msgstr "联系人为离线" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 -#, fuzzy -#| msgid "The specified contact is not valid" +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 msgid "The specified contact is either invalid or unknown" -msgstr "选择的联系人无效" +msgstr "指定的联系人无效或信息未知" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" msgstr "选择的联系人不支持在该类型会话" -#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 msgid "The requested functionality is not implemented for this protocol" msgstr "所要求的功能与此协议不兼容" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 msgid "Could not start a conversation with the given contact" msgstr "无法与选择的联系人发起对话" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "您已被此频道屏蔽" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "频道已满" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 -#, fuzzy -#| msgid "You have been invited to join %s" +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 msgid "You must be invited to join this channel" -msgstr "您被邀请加入 %s" +msgstr "您必须被邀请才能加入此频道" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 -#, fuzzy -#| msgid "Contact disconnected" +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" -msgstr "联系人已断开" +msgstr "断开时无法进行" -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 -#, fuzzy -#| msgid "permission denied" +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" -msgstr "权限不足" +msgstr "拒绝访问" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 -#, fuzzy -#| msgid "There was an error starting the call" +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" -msgstr "发起呼叫时出错" +msgstr "发起对话时出错" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "输入一个联系人标识或电话号码：" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:334 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "新建对话" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:226 -#, fuzzy -#| msgctxt "menu item" -#| msgid "_Video Call" +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "_Video Call" msgstr "视频呼叫(_V)" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:236 -#, fuzzy -#| msgctxt "menu item" -#| msgid "_Audio Call" +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 msgid "_Audio Call" msgstr "音频呼叫(_A)" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:246 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "新建通话" #: ../libempathy-gtk/empathy-bad-password-dialog.c:130 -#, fuzzy, c-format -#| msgid "Authentication failed" +#, c-format msgid "Authentification failed for account %s" -msgstr "验证失败" +msgstr "帐号 %s 验证失败" #: ../libempathy-gtk/empathy-base-password-dialog.c:224 #: ../libempathy-gtk/empathy-password-dialog.c:134 @@ -2598,11 +2503,11 @@ msgstr "编辑自定义消息" #: ../libempathy-gtk/empathy-presence-chooser.c:345 msgid "Click to remove this status as a favorite" -msgstr "点击移除自定义状态" +msgstr "点击移除常用自定义状态" #: ../libempathy-gtk/empathy-presence-chooser.c:354 msgid "Click to make this status a favorite" -msgstr "点击设置自定义状态" +msgstr "点击设置常用自定义状态" #: ../libempathy-gtk/empathy-presence-chooser.c:388 msgid "Set status" @@ -2627,20 +2532,20 @@ msgid "Find:" msgstr "查找：" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 -msgid "Mat_ch case" -msgstr "区分大小写(_C)" +msgid "_Previous" +msgstr "上一页(_P)" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 -msgid "Phrase not found" -msgstr "未找到短语" - -#: ../libempathy-gtk/empathy-search-bar.ui.h:4 msgid "_Next" msgstr "下一页(_N)" +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 +msgid "Mat_ch case" +msgstr "区分大小写(_C)" + #: ../libempathy-gtk/empathy-search-bar.ui.h:5 -msgid "_Previous" -msgstr "上一页(_P)" +msgid "Phrase not found" +msgstr "未找到短语" #: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" @@ -2684,14 +2589,14 @@ msgstr "语音通话结束" #: ../libempathy-gtk/empathy-status-preset-dialog.c:296 msgid "Edit Custom Messages" -msgstr "编辑自定义状态" +msgstr "编辑自定义消息" -#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "消息于 %s 被编辑" -#: ../libempathy-gtk/empathy-theme-adium.c:1752 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "普通" @@ -2767,18 +2672,22 @@ msgid "Certificate hostname: %s" msgstr "证书主机名: %s" #: ../libempathy-gtk/empathy-tls-dialog.c:281 -msgid "Continue" -msgstr "继续" +msgid "C_ontinue" +msgstr "继续(_O)" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "不受信任的连接" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "连接不受信任。是否仍要继续?" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "为将来的连接记住本次选择" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "证书详情" @@ -2973,31 +2882,31 @@ msgstr "西方语言" msgid "Vietnamese" msgstr "越南语" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "无错误信息" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "即时消息(Empathy)" -#: ../src/empathy.c:433 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "启动时不自动连接" -#: ../src/empathy.c:437 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "启动时不显示联系人列表" -#: ../src/empathy.c:452 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr " - Empathy 即时通讯客户端" -#: ../src/empathy.c:639 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "联系帐号管理器出错" -#: ../src/empathy.c:641 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3039,11 +2948,11 @@ msgstr "" "给自由软件基金会写信。地址是：51 Franklin Street, Fifth Floor, Boston, MA " "02110-130159 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "一个 GNOME 即时消息客户端" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "Abel Cheung , 2003\n" @@ -3093,38 +3002,39 @@ msgid "" "You can either go back and try to enter your accounts' details again or quit " "this assistant and add accounts later from the Edit menu." msgstr "" -"您可以返回尝试重新输入您的帐号信息，或者退出助理，然后从编辑菜单中加入帐户。" +"您可以返回尝试重新输入您的帐号信息，或者退出助理，然后从编辑菜单中加入帐号。" #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1272 +#: ../src/empathy-account-assistant.c:1276 msgid "An error occurred" msgstr "发生错误" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "您已经拥有哪个类型的帐号？" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "您还要设置其它聊天帐号吗？" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "输入您的帐号详情" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "您想创建那种类型的帐号？" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "您想要创建其它的聊天帐号吗、" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "输入新帐号的详细资料" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3135,41 +3045,41 @@ msgstr "" "Live 和许多其它聊天软件的朋友和同事聊天。使用麦克风或摄像头，您就可以开始音频" "和视频通话。" -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "您有没有其它聊天软件的帐号？" -#: ../src/empathy-account-assistant.c:653 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "有，请导入我的帐号信息" -#: ../src/empathy-account-assistant.c:674 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "有，我现在就输入我的帐号信息" -#: ../src/empathy-account-assistant.c:696 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "不，我想要一个新的帐号" -#: ../src/empathy-account-assistant.c:706 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "没有，我只是想看看附近现在谁在线上" -#: ../src/empathy-account-assistant.c:727 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "选择您要导入的帐号：" -#: ../src/empathy-account-assistant.c:814 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "是" -#: ../src/empathy-account-assistant.c:821 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "没有，就这样吧" -#: ../src/empathy-account-assistant.c:1086 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3180,16 +3090,16 @@ msgstr "" "想使用这个功能，请仔细查看下列信息是否正确。您之后也可以通过“帐号”对话框轻松" "的修改这些信息或关闭这个功能" -#: ../src/empathy-account-assistant.c:1092 -#: ../src/empathy-account-assistant.c:1148 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 msgid "Edit->Accounts" msgstr "编辑->帐号" -#: ../src/empathy-account-assistant.c:1108 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "暂不启用此特性(_N)" -#: ../src/empathy-account-assistant.c:1144 +#: ../src/empathy-account-assistant.c:1148 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3200,98 +3110,108 @@ msgstr "" "用该功能，请安装 telepathy-salut 包，并且在帐号对话框中创建附近的人(People " "Nearby)帐号" -#: ../src/empathy-account-assistant.c:1150 +#: ../src/empathy-account-assistant.c:1154 msgid "telepathy-salut not installed" msgstr "telepathy-salut 未安装" -#: ../src/empathy-account-assistant.c:1196 +#: ../src/empathy-account-assistant.c:1200 msgid "Messaging and VoIP Accounts Assistant" msgstr "消息和 VoIP 帐号助手" -#: ../src/empathy-account-assistant.c:1230 +#: ../src/empathy-account-assistant.c:1234 msgid "Welcome to Empathy" msgstr "欢迎使用 Empathy" -#: ../src/empathy-account-assistant.c:1239 +#: ../src/empathy-account-assistant.c:1243 msgid "Import your existing accounts" msgstr "导入现有帐号" -#: ../src/empathy-account-assistant.c:1257 +#: ../src/empathy-account-assistant.c:1261 msgid "Please enter personal details" msgstr "请输入个人信息" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "您的 %s 帐号有未保存的修改。" #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "您的新帐号还没有保存。" -#: ../src/empathy-accounts-dialog.c:345 +#: ../src/empathy-accounts-dialog.c:347 #: ../src/empathy-streamed-media-window.c:757 -#: ../src/empathy-call-window.c:1325 +#: ../src/empathy-call-window.c:1332 msgid "Connecting…" msgstr "正在连接..." -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:388 #, c-format msgid "Offline — %s" msgstr "离线 - %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:400 #, c-format msgid "Disconnected — %s" msgstr "已断开 - %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:411 msgid "Offline — No Network Connection" msgstr "离线 - 无可用网络" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:418 msgid "Unknown Status" msgstr "未知状态" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:430 msgid "Offline — Account Disabled" msgstr "离线 - 帐号被禁用" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "您将要创建一个新帐号，所做的修改将作废。您确定要继续吗？" +#: ../src/empathy-accounts-dialog.c:533 +msgid "Edit Connection Parameters" +msgstr "编辑连接参数" + +#: ../src/empathy-accounts-dialog.c:696 +msgid "Failed to retrieve your personal information from the server." +msgstr "从服务器获取您的个人信息失败。" -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:702 +msgid "Go online to edit your personal information." +msgstr "请上线以编辑您的个人信息。" + +#: ../src/empathy-accounts-dialog.c:787 +msgid "_Edit Connection Parameters..." +msgstr "编辑连接参数(_E)..." + +#: ../src/empathy-accounts-dialog.c:1292 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "您要从电脑中移除 %s 吗？" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1296 msgid "This will not remove your account on the server." msgstr "这不会删除服务器上的帐号。" -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1532 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" msgstr "您将要选择另一个帐号，所做的修改将作废。您确定要继续吗？" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1708 msgid "_Enable" msgstr "启用(_E)" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1709 msgid "_Disable" msgstr "禁用(_D)" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2179 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3301,33 +3221,33 @@ msgstr "您将要关闭此窗口，所做的修改将作废。您确定要继续 msgid "Add…" msgstr "添加..." -#: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Loading account information" -msgstr "正在加载账号信息" - #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "No protocol installed" -msgstr "尚未安装协议" +msgid "_Import…" +msgstr "导入(_I)..." #: ../src/empathy-accounts-dialog.ui.h:4 msgid "Protocol:" msgstr "协议：" -#: ../src/empathy-accounts-dialog.ui.h:6 +#: ../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 "要添加一个新帐号，您首先需要为您想要使用的每个协议安装后端。" +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "尚未安装协议" + #: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Import…" -msgstr "导入(_I)..." +msgid "Loading account information" +msgstr "正在加载帐号信息" -#: ../src/empathy-auth-client.c:284 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr " - Empathy 认证客户端" -#: ../src/empathy-auth-client.c:300 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Empathy 认证客户端" @@ -3335,11 +3255,11 @@ msgstr "Empathy 认证客户端" msgid "People nearby" msgstr "附近的人" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:193 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:203 msgid "- Empathy Audio/Video Client" msgstr " - Empathy 语音/视频客户端" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:218 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:228 msgid "Empathy Audio/Video Client" msgstr "Empathy 语音/视频客户端" @@ -3382,33 +3302,33 @@ msgstr "详细信息" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title #: ../src/empathy-streamed-media-window.c:1209 -#: ../src/empathy-call-window.c:1927 +#: ../src/empathy-call-window.c:1934 #, c-format msgid "Call with %s" msgstr "与 %s 通话" #: ../src/empathy-streamed-media-window.c:1442 -#: ../src/empathy-call-window.c:2171 +#: ../src/empathy-call-window.c:2178 msgid "The IP address as seen by the machine" msgstr "机器所见的 IP 地址" #: ../src/empathy-streamed-media-window.c:1444 -#: ../src/empathy-call-window.c:2173 +#: ../src/empathy-call-window.c:2180 msgid "The IP address as seen by a server on the Internet" msgstr "Internet 上服务器所见的 IP 地址" #: ../src/empathy-streamed-media-window.c:1446 -#: ../src/empathy-call-window.c:2175 +#: ../src/empathy-call-window.c:2182 msgid "The IP address of the peer as seen by the other side" msgstr "另一方所见的 IP 地址" #: ../src/empathy-streamed-media-window.c:1448 -#: ../src/empathy-call-window.c:2177 +#: ../src/empathy-call-window.c:2184 msgid "The IP address of a relay server" msgstr "中转服务器 IP 地址" #: ../src/empathy-streamed-media-window.c:1450 -#: ../src/empathy-call-window.c:2179 +#: ../src/empathy-call-window.c:2186 msgid "The IP address of the multicast group" msgstr "多播组的 IP 地址" @@ -3416,8 +3336,6 @@ msgstr "多播组的 IP 地址" #: ../src/empathy-streamed-media-window.c:1841 #: ../src/empathy-streamed-media-window.c:1844 #: ../src/empathy-streamed-media-window.c:1847 -#, fuzzy -#| msgid "Unknown" msgctxt "codec" msgid "Unknown" msgstr "未知" @@ -3429,12 +3347,12 @@ msgid "Connected — %d:%02dm" msgstr "已连接 — %d:%02dm" #: ../src/empathy-streamed-media-window.c:2200 -#: ../src/empathy-call-window.c:3033 +#: ../src/empathy-call-window.c:3040 msgid "Technical Details" msgstr "技术细节" #: ../src/empathy-streamed-media-window.c:2238 -#: ../src/empathy-call-window.c:3072 +#: ../src/empathy-call-window.c:3079 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3442,7 +3360,7 @@ msgid "" msgstr "%s 软件无法理解您计算机所支持的任何音频格式。" #: ../src/empathy-streamed-media-window.c:2243 -#: ../src/empathy-call-window.c:3077 +#: ../src/empathy-call-window.c:3084 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3450,7 +3368,7 @@ msgid "" msgstr "%s 软件无法理解您计算机所支持的任何视频格式。" #: ../src/empathy-streamed-media-window.c:2249 -#: ../src/empathy-call-window.c:3083 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3458,24 +3376,24 @@ msgid "" msgstr "不能与 %s 建立连接。可能是两台计算机之一不允许直接连接。" #: ../src/empathy-streamed-media-window.c:2255 -#: ../src/empathy-call-window.c:3089 +#: ../src/empathy-call-window.c:3096 msgid "There was a failure on the network" msgstr "网络出现一个错误" #: ../src/empathy-streamed-media-window.c:2259 -#: ../src/empathy-call-window.c:3093 +#: ../src/empathy-call-window.c:3100 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "呼叫所需要的音频格式还没有在您的电脑上安装" #: ../src/empathy-streamed-media-window.c:2262 -#: ../src/empathy-call-window.c:3096 +#: ../src/empathy-call-window.c:3103 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "呼叫所需要的视频格式还没有在您的电脑上安装" #: ../src/empathy-streamed-media-window.c:2272 -#: ../src/empathy-call-window.c:3108 +#: ../src/empathy-call-window.c:3115 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please " msgstr "<帐号 ID>" #: ../src/empathy-accounts.c:196 -#, fuzzy -#| msgid "Show the accounts dialog" msgid "Show account assistant" -msgstr "显示帐号对话框" +msgstr "显示帐号助手" #: ../src/empathy-accounts.c:202 msgid "- Empathy Accounts" @@ -4603,7 +4583,7 @@ msgstr "- Empathy 调试器" msgid "Empathy Debugger" msgstr "Empathy 调试器" -#: ../src/empathy-chat.c:107 +#: ../src/empathy-chat.c:109 msgid "- Empathy Chat Client" msgstr " - Empathy IM 客户端" @@ -4612,13 +4592,13 @@ msgid "Respond" msgstr "响应" #: ../src/empathy-notifications-approver.c:204 -#: ../src/empathy-call-window.c:1565 +#: ../src/empathy-call-window.c:1572 msgid "Reject" msgstr "拒绝" #: ../src/empathy-notifications-approver.c:209 #: ../src/empathy-notifications-approver.c:214 -#: ../src/empathy-call-window.c:1566 +#: ../src/empathy-call-window.c:1573 msgid "Answer" msgstr "接听" @@ -4650,38 +4630,38 @@ msgstr "%s 刚刚尝试呼叫您，但您当时正在与其他人通话。" #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 +#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202 msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2929 +#: ../src/empathy-call-window.c:2936 msgid "On hold" msgstr "挂起" -#: ../src/empathy-call-window.c:2932 +#: ../src/empathy-call-window.c:2939 msgid "Mute" msgstr "静音" -#: ../src/empathy-call-window.c:2934 +#: ../src/empathy-call-window.c:2941 msgid "Duration" msgstr "时长" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2937 +#: ../src/empathy-call-window.c:2944 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:3207 +#: ../src/empathy-call-window.c:3214 #, c-format msgid "Your current balance is %s." msgstr "您当前的余额为 %s。" -#: ../src/empathy-call-window.c:3211 +#: ../src/empathy-call-window.c:3218 msgid "Sorry, you don’t have enough credit for that call." msgstr "对不起，您信用卡余额不足以支付此次通话。" -#: ../src/empathy-call-window.c:3213 +#: ../src/empathy-call-window.c:3220 msgid "Top Up" msgstr "充值" @@ -4689,6 +4669,93 @@ msgstr "充值" msgid "_Match case" msgstr "区分大小写(_M)" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "添加新帐号" + +#~ msgid "Socket type not supported" +#~ msgstr "不支持 Socket 类型" + +#~ msgid "My Web Accounts" +#~ msgstr "我的网络帐号" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "%s 帐号通过 %s 进行了编辑。" + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "%s 帐号无法在 Empathy 中编辑。" + +#~ msgid "Launch My Web Accounts" +#~ msgstr "启动我的网络帐号" + +#~ msgid "Edit %s" +#~ msgstr "编辑 %s" + +#~ msgid "Ca_ncel" +#~ msgstr "取消(_N)" + +#~ msgid "Personal Information" +#~ msgstr "个人信息" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "编辑(_E)" + +#~ msgid "Linked Contacts" +#~ msgstr "已绑定的联系人" + +#~ msgid "Select contacts to link" +#~ msgstr "选择要绑定的联系人" + +#~ msgid "New contact preview" +#~ msgstr "新联系人预览" + +#~ msgid "Contacts selected in the list on the left will be linked together." +#~ msgstr "在左侧列表中选中的联系人将被绑定在一起。" + +#~ msgctxt "Link individual (contextual menu)" +#~ msgid "_Link Contacts…" +#~ msgstr "绑定联系人(_L)…" + +#~ msgid "Link Contacts" +#~ msgstr "绑定联系人" + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink…" +#~ msgstr "解除绑定(_U)..." + +#~ msgid "" +#~ "Completely split the displayed linked contacts into the separate contacts." +#~ msgstr "完全分离已显示的绑定的联系人成为单独的联系人" + +#~ msgid "_Link" +#~ msgstr "绑定(_L)" + +#~ msgid "Unlink linked contacts '%s'?" +#~ msgstr "解除已绑定的联系人 %s？" + +#~ msgid "" +#~ "Are you sure you want to unlink these linked contacts? This will " +#~ "completely split the linked contacts into separate contacts." +#~ msgstr "" +#~ "您确定您要接触这些已绑定的联系人？这将会完全拆分已绑定的联系人为单独的联系" +#~ "人。" + +#~ msgctxt "Unlink individual (button)" +#~ msgid "_Unlink" +#~ msgstr "解除绑定(_U)" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "您将要创建一个新帐号，所做的修改将作废。您确定要继续吗？" + +#~ msgid "_Personal Information" +#~ msgstr "个人信息(_P)" + +#~ msgid "_Open new chats in separate windows" +#~ msgstr "在单独窗口中打开新聊天(_O)" + #~ msgid "Call volume" #~ msgstr "来电音量" diff --git a/po/zh_HK.po b/po/zh_HK.po index 0bb97f1f..6704d1a1 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: empathy 3.3.1\n" +"Project-Id-Version: empathy 3.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-12 19:09+0800\n" -"PO-Revision-Date: 2011-11-12 19:10+0800\n" +"POT-Creation-Date: 2012-02-04 15:09+0800\n" +"PO-Revision-Date: 2012-02-04 15:09+0800\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: Chinese (Hong Kong) \n" "Language: zh_TW\n" @@ -40,430 +40,422 @@ msgid "Always open a separate chat window for new chats." msgstr "永遠為每個新的聊天開啟新的聊天視窗。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "通話音量" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "通話音量，為百分比。" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "Camera device" msgstr "攝影機裝置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 msgid "Camera position" msgstr "攝影機位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." msgstr "在羣組聊天中使用網名補齊 (tab) 時要加到網名之後的字符。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 msgid "Chat window theme" msgstr "聊天視窗佈景主題" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "Chat window theme variant" msgstr "聊天視窗佈景主題樣式" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "以逗號分隔要使用拼字檢查的語言清單 (如：「 en, fr, nl」)。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Compact contact list" msgstr "精簡聯絡人清單" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 msgid "Connection managers should be used" msgstr "使用連線管理程式" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Contact list sort criterion" msgstr "聯絡人清單排序準則" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 msgid "D-Bus object path of the last account selected to join a room." msgstr "上次要加入聊天室所選取帳號的 D-Bus 物件路徑。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "要用於視像通話的預設攝影機裝置，例：/dev/video0。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Default directory to select an avatar image from" msgstr "用來選擇大頭貼圖片的預設目錄" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Disable popup notifications when away" msgstr "當狀態為離開時停用彈出式通知" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Disable sounds when away" msgstr "當狀態為離開時停用音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Display incoming events in the status area" msgstr "在狀態區域顯示收到事件" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "" "Display incoming events in the status area. If false, present them to the " "user immediately." msgstr "在狀態區域顯示收到事件。如果不啟用的話，收到事件會直接呈現給使用者。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Echo cancellation support" msgstr "回音消除支援" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy can publish the user's location" msgstr "Empathy 可以發布使用者的位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy 可以利用 GPS 來推測位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy can use the cellular network to guess the location" msgstr "Empathy 可以利用流動電話網絡基地臺來推測位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy can use the network to guess the location" msgstr "Empathy 可以利用網絡來推測位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Empathy default download folder" msgstr "Empathy 預設下載資料夾" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Empathy should auto-away when idle" msgstr "Empathy 當閒置時應該自動設為離開" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Empathy should auto-connect on startup" msgstr "Empathy 啟動時自動連線" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Empathy should reduce the location's accuracy" msgstr "Empathy 應降低位置的準確度" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "Empathy 要使用聯絡人的大頭貼做為聊天視窗圖示" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Enable WebKit Developer Tools" msgstr "啟用 WebKit 開發者工具" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Enable popup notifications for new messages" msgstr "啟用新訊息的彈出式通知" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Enable spell checker" msgstr "啟用拼字檢查程式" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Hide main window" msgstr "隱藏主視窗" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Hide the main window." msgstr "隱藏主視窗。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Last account selected in Join Room dialog" msgstr "上次在「參加聊天室」對話盒選取的帳號" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Nick completed character" msgstr "網名補齊字符" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Open new chats in separate windows" msgstr "在個別視窗開啟新的聊天" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Path of the Adium theme to use" msgstr "要使用的 Adium 佈景主題路徑" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "如果聊天室使用的主題是 Adium 時要使用的 Adium 佈景主題路徑。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound for incoming messages" msgstr "收到訊息時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for new conversations" msgstr "當開啟新的談話時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for outgoing messages" msgstr "送出訊息時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Play a sound when a contact logs in" msgstr "當聯絡人登入時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound when a contact logs out" msgstr "當有聯絡人登出時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when we log in" msgstr "當我們登入時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound when we log out" msgstr "當我們登出時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Pop up notifications if the chat isn't focused" msgstr "如果聊天視窗失去焦點則彈出通知" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Pop up notifications when a contact logs in" msgstr "當聯絡人登入時彈出通知" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Pop up notifications when a contact logs out" msgstr "當聯絡人登出時彈出通知" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Position the camera preview should be during a call." msgstr "通話時攝影機預覽應該擺放的位置。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "Show Balance in contact list" msgstr "於聯絡人清單內顯示餘額" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Show avatars" msgstr "顯示大頭貼" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Show contact list in rooms" msgstr "在聊天室顯示聯絡人清單" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Show hint about closing the main window" msgstr "關閉主視窗時顯示提示" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Show offline contacts" msgstr "顯示離線聯絡人" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Show protocols" msgstr "顯示協定" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Spell checking languages" msgstr "拼字檢查的語言" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "The default folder to save file transfers in." msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "The last directory that an avatar image was chosen from." msgstr "上次選擇大頭貼圖片的目錄。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "The position for the chat window side pane" msgstr "聊天視窗側窗格的位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "The stored position (in pixels) of the chat window side pane." msgstr "聊天視窗側窗格的儲存位置 (單位為像素)。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "The theme that is used to display the conversation in chat windows." msgstr "用來顯示在聊天視窗中談話的佈景主題。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "用來在聊天視窗顯示談話的佈景主題樣式。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "使用圖片式表情符號" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Use notification sounds" msgstr "使用通知音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use theme for chat rooms" msgstr "在聊天室使用佈景主題" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "Empathy 是否要將使用者的位置發布給他的聯絡人。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Empathy 是否使用 GPS 來推測位置。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "Empathy 是否使用流動電話網絡來推測位置。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether Empathy can use the network to guess the location." msgstr "Empathy 是否使用網絡來推測位置。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "Empathy 是否應在啟動時自動登入你的帳號。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "" "Whether Empathy should go into away mode automatically if the user is idle." msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "Empathy 是否基於私隱的理由減低位置的準確度。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "Empathy 是否使用聯絡人大頭貼做為聊天視窗圖示。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "是否啟用 WebKit 開發者工具，例如 Web Inspector。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." msgstr "是否使用連線管理程式自動斷線或重新連線。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "" "Whether to check words typed against the languages you want to check with." msgstr "是否以你設定的語言檢查輸入有無錯字。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Whether to convert smileys into graphical images in conversations." msgstr "是否將談話中的表情符號轉換為圖片形式。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "是否要啟用 Pulseaudio 的回音消除過濾器。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "是否播放音效來通知有聯絡人登入網絡。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "是否播放音效來通知有聯絡人登出網絡。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Whether to play a sound to notify of events." msgstr "是否播放音效來通知有事件發生。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to play a sound to notify of incoming messages." msgstr "是否播放音效來通知有收到訊息。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Whether to play a sound to notify of new conversations." msgstr "是否播放音效來通知新的談話。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to play a sound to notify of outgoing messages." msgstr "是否播放音效來通知有送出訊息。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Whether to play a sound when logging into a network." msgstr "當登入某網絡時是否播放音效。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to play a sound when logging out of a network." msgstr "當登出某網絡時是否播放音效。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to play sound notifications when away or busy." msgstr "當狀態為離開或忙碌時是否播放音效通知。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to show a popup notification when a contact goes offline." msgstr "當聯絡人離線時是否顯示彈出式通知。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Whether to show a popup notification when a contact goes online." msgstr "當聯絡人上線時是否顯示彈出式通知。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." msgstr "收到新訊息時是否顯示彈出式通知 (即使已開啟聊天視窗，但沒有獲得焦點)。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Whether to show a popup notification when receiving a new message." msgstr "當收到新訊息時是否顯示彈出式通知。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Whether to show account balances in the contact list." msgstr "是否要在聯絡人清單內顯示帳戶餘額。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "是否在聯絡人清單與聊天視窗顯示聯絡人大頭貼。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Whether to show contacts that are offline in the contact list." msgstr "是否在聯絡人清單中顯示離線的聯絡人。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Whether to show popup notifications when away or busy." msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to show protocols for contacts in the contact list." msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Whether to show the contact list in chat rooms." msgstr "是否在聊天室中顯示聯絡人清單。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "Whether to show the contact list in compact mode." msgstr "是否以精簡模式顯示聯絡人清單。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." msgstr "是否在使用標題列的「x」按鈕關閉主視窗時，顯示訊息對話窗。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether to use the theme for chat rooms." msgstr "是否為聊天室使用佈景主題。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." -msgstr "排序聯絡人清單時要使用哪個準則。預設值是使用聯絡人的名稱「name」(名稱) 值來排序。而「state」(狀態) 值則會使用其狀態來排序聯絡人清單。" +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." +msgstr "排序聯絡人清單時要使用哪個準則。預設值是使用聯絡人的狀態「state」(狀態) 值來排序。而「name」(名稱) 值則會根據據名稱來排序聯絡人清單。" #: ../data/empathy-accounts.desktop.in.in.h:1 msgid "Manage Messaging and VoIP accounts" @@ -471,23 +463,51 @@ msgstr "管理訊息與 VoIP 帳號" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2312 +#: ../src/empathy-accounts-dialog.c:2327 msgid "Messaging and VoIP Accounts" msgstr "訊息與 VoIP 帳號" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "沒有指定原因" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "已要求更改狀態" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "你已取消檔案傳輸" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "其他的參與者取消了檔案傳輸" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "嘗試傳輸檔案時發生錯誤" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "其他的參與者無法傳輸該檔案" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "不明原因" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "檔案傳輸完畢，但是檔案已損毀" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "遠端聯絡人不支援檔案傳輸" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "選取的檔案不是正規的檔案" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "選取的檔案是空白的" @@ -507,330 +527,274 @@ msgstr "已播打 %s" msgid "Call from %s" msgstr "%s 的來電" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "Socket 類型不支援" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "沒有指定原因" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "已要求更改狀態" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "你已取消檔案傳輸" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "其他的參與者取消了檔案傳輸" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "嘗試傳輸檔案時發生錯誤" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "其他的參與者無法傳輸該檔案" - -#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "不明原因" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "有空" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "忙碌" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "離開" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "隱藏" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "離線" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "未知" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "沒有指定原因" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "狀態設為離線" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "網絡錯誤" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "驗證失敗" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "加密發生錯誤" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "使用中的名稱" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "沒有提供證書" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "證書不被信任" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "證書已逾期" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "證書尚未使用" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "證書主機名稱不符" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "證書指紋檔不符" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "證書為自我簽署" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "證書錯誤" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "加密無法使用" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "證書無效" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "連線遭拒" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "無法建立連線" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "已失去連線" -#: ../libempathy/empathy-utils.c:354 +#: ../libempathy/empathy-utils.c:355 msgid "This resource is already connected to the server" msgstr "此資源已連接至該伺服器" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "連線已被使用相同資源的新連線取代" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "該帳號已經存在於伺服器上" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "伺服器目前過於忙碌以致於無法處理該連線" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "已撤銷證書" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "證書使用不安全的密碼演算法，或是密碼處理上較弱" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:369 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" msgstr "伺服器證書的長度，或是伺服器證書鏈的深度超過密碼函式庫所能處理的範圍" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:373 msgid "Your software is too old" msgstr "你的軟件過舊" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "內部錯誤" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "附近的人" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Yahoo! 日本" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Facebook 聊天" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "%d 秒前" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "%d 分鐘以前" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "%d 小時以前" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 天以前" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d 週前" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d 個月以前" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "未來" -#: ../libempathy-gtk/empathy-account-chooser.c:688 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "所有帳號" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "帳號" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "密碼" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "伺服器" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "連接埠" -#: ../libempathy-gtk/empathy-account-widget.c:776 -#: ../libempathy-gtk/empathy-account-widget.c:828 +#: ../libempathy-gtk/empathy-account-widget.c:763 +#: ../libempathy-gtk/empathy-account-widget.c:815 #, c-format msgid "%s:" msgstr "%s：" -#: ../libempathy-gtk/empathy-account-widget.c:1182 -msgid "My Web Accounts" -msgstr "我的網絡帳號" - -#: ../libempathy-gtk/empathy-account-widget.c:1199 -#, c-format -msgid "The account %s is edited via %s." -msgstr "%s 帳號已透過 %s 修改。" - -#: ../libempathy-gtk/empathy-account-widget.c:1205 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "%s 帳號無法於 Empathy 內修改。" - -#: ../libempathy-gtk/empathy-account-widget.c:1224 -msgid "Launch My Web Accounts" -msgstr "啟動我的網絡帳號" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1232 -#, c-format -msgid "Edit %s" -msgstr "編輯 %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1582 +#: ../libempathy-gtk/empathy-account-widget.c:1396 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "使用者名稱：" -#: ../libempathy-gtk/empathy-account-widget.c:1900 +#: ../libempathy-gtk/empathy-account-widget.c:1708 msgid "A_pply" msgstr "套用(_A)" -#: ../libempathy-gtk/empathy-account-widget.c:1930 +#: ../libempathy-gtk/empathy-account-widget.c:1737 msgid "L_og in" msgstr "登入(_O)" -#: ../libempathy-gtk/empathy-account-widget.c:2004 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "此帳號已經存在這個伺服器上" -#: ../libempathy-gtk/empathy-account-widget.c:2007 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "在這個伺服器上建立新的帳號" -#: ../libempathy-gtk/empathy-account-widget.c:2199 -msgid "Ca_ncel" -msgstr "取消(_N)" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2477 +#: ../libempathy-gtk/empathy-account-widget.c:2239 #, c-format msgid "%1$s on %2$s" msgstr "%2$s 上的 %1$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2503 +#: ../libempathy-gtk/empathy-account-widget.c:2265 #, c-format msgid "%s Account" msgstr "%s 帳號" -#: ../libempathy-gtk/empathy-account-widget.c:2507 +#: ../libempathy-gtk/empathy-account-widget.c:2269 msgid "New account" msgstr "新增帳號" @@ -878,7 +842,7 @@ msgstr "記住密碼" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 msgid "Remember password" msgstr "記住密碼" @@ -1200,7 +1164,7 @@ msgid "STUN Server:" msgstr "STUN 伺服器：" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 msgid "Server:" msgstr "伺服器：" @@ -1306,192 +1270,199 @@ msgstr "此協定不支援緊急通話功能" msgid "You don't have enough credit in order to place this call" msgstr "你的存額不足以買下該通話。" -#: ../libempathy-gtk/empathy-chat.c:706 +#: ../libempathy-gtk/empathy-chat.c:710 msgid "Failed to open private chat" msgstr "開啟私人聊天失敗" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:768 msgid "Topic not supported on this conversation" msgstr "此談話的主題不被支援" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:774 msgid "You are not allowed to change the topic" msgstr "你不被允許更改這個主題" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:973 #, c-format msgid "“%s” is not a valid contact ID" msgstr "「%s」不是有效的聯絡人 ID" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1068 msgid "/clear: clear all messages from the current conversation" msgstr "/clear：清除目前談話的所有訊息" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/topic : set the topic of the current conversation" msgstr "/topic <主題>：設置目前談話的主題" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1074 msgid "/join : join a new chat room" msgstr "/join <聊天室 ID>：參加新的聊天室" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1077 msgid "/j : join a new chat room" msgstr "/j <聊天室 ID>：參加新的聊天室" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "" "/part [] []: leave the chat room, by default the " "current one" msgstr "/part [<聊天室 ID>] [<原因>]：離開聊天室，預設為目前的聊天室" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/query []: open a private chat" msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人聊天" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/msg : open a private chat" msgstr "/msg <聯絡人 ID> <訊息>：開啟私人聊天" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/nick : change your nickname on the current server" msgstr "/nick <網名>：更改在目前伺服器上的你的網名" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/me : send an ACTION message to the current conversation" msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1097 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " "join a new chat room\"" msgstr "/say <訊息>：送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來說：「/say /join 是用來參加新的聊天室」" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "/whois : display information about a contact" msgstr "/whois <聯絡人 ID>：顯示聯絡人的相關資訊" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1105 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." msgstr "/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用法。" -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1124 #, c-format msgid "Usage: %s" msgstr "用法：%s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1169 msgid "Unknown command" msgstr "未知的命令" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1295 msgid "Unknown command; see /help for the available commands" msgstr "未知的指令；請參見 /help 以取得可用的指令" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1541 msgid "insufficient balance to send message" msgstr "餘額不足以傳送訊息" -#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559 +#: ../libempathy-gtk/empathy-chat.c:1622 #, c-format msgid "Error sending message '%s': %s" msgstr "傳送訊息「%s」時發生錯誤：%s" -#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564 +#: ../libempathy-gtk/empathy-chat.c:1626 #, c-format msgid "Error sending message: %s" msgstr "傳送訊息時發生錯誤：%s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1469 +#: ../libempathy-gtk/empathy-chat.c:1553 #, c-format msgid "insufficient balance to send message. Top up." msgstr "餘額不足以傳送訊息。加值。" -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1593 msgid "not capable" msgstr "無法" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1600 msgid "offline" msgstr "離線" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1603 msgid "invalid contact" msgstr "無效的聯絡人" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1606 msgid "permission denied" msgstr "權限被拒絕" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1609 msgid "too long message" msgstr "太長的訊息" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "not implemented" msgstr "未實作" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "unknown" msgstr "不明" -#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "主題：" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1698 #, c-format msgid "Topic set to: %s" msgstr "主題設定為: %s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1700 +#, fuzzy, c-format +#| msgid "Topic set to: %s" +msgid "Topic set by %s to: %s" +msgstr "主題設定為: %s" + +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1705 msgid "No topic defined" msgstr "尚未定義主題" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2221 msgid "(No Suggestions)" msgstr "(沒有建議)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2289 #, c-format msgid "Add '%s' to Dictionary" msgstr "加入「%s」至字典" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2326 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "加入「%s」至 %s 字典" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2396 msgid "Insert Smiley" msgstr "插入表情符號" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 +#: ../libempathy-gtk/empathy-chat.c:2414 #: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "傳送(_S)" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2376 +#: ../libempathy-gtk/empathy-chat.c:2471 msgid "_Spelling Suggestions" msgstr "拼字建議(_S)" -#: ../libempathy-gtk/empathy-chat.c:2465 +#: ../libempathy-gtk/empathy-chat.c:2560 msgid "Failed to retrieve recent logs" msgstr "無法取得最近的日誌" -#: ../libempathy-gtk/empathy-chat.c:2602 +#: ../libempathy-gtk/empathy-chat.c:2699 #, c-format msgid "%s has disconnected" msgstr "%s 已斷線" @@ -1499,12 +1470,12 @@ msgstr "%s 已斷線" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2609 +#: ../libempathy-gtk/empathy-chat.c:2706 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s 被 %2$s 踢出去" -#: ../libempathy-gtk/empathy-chat.c:2612 +#: ../libempathy-gtk/empathy-chat.c:2709 #, c-format msgid "%s was kicked" msgstr "%s 被踢出" @@ -1512,17 +1483,17 @@ msgstr "%s 被踢出" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2620 +#: ../libempathy-gtk/empathy-chat.c:2717 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s 被 %2$s 設為黑名單" -#: ../libempathy-gtk/empathy-chat.c:2623 +#: ../libempathy-gtk/empathy-chat.c:2720 #, c-format msgid "%s was banned" msgstr "%s 被設為黑名單" -#: ../libempathy-gtk/empathy-chat.c:2627 +#: ../libempathy-gtk/empathy-chat.c:2724 #, c-format msgid "%s has left the room" msgstr "%s 已經離開此聊天室" @@ -1532,17 +1503,17 @@ msgstr "%s 已經離開此聊天室" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2636 +#: ../libempathy-gtk/empathy-chat.c:2733 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2661 +#: ../libempathy-gtk/empathy-chat.c:2758 #, c-format msgid "%s has joined the room" msgstr "%s 已經參加此聊天室" -#: ../libempathy-gtk/empathy-chat.c:2686 +#: ../libempathy-gtk/empathy-chat.c:2783 #, c-format msgid "%s is now known as %s" msgstr "%s 現在被稱為 %s" @@ -1550,79 +1521,80 @@ msgstr "%s 現在被稱為 %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2839 -#: ../src/empathy-streamed-media-window.c:1886 -#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1539 -#: ../src/empathy-call-window.c:1589 ../src/empathy-call-window.c:2635 +#: ../libempathy-gtk/empathy-chat.c:2970 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "已斷線" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3485 +#: ../libempathy-gtk/empathy-chat.c:3634 msgid "Would you like to store this password?" msgstr "你想要儲存此密碼？" -#: ../libempathy-gtk/empathy-chat.c:3491 +#: ../libempathy-gtk/empathy-chat.c:3640 msgid "Remember" msgstr "記住" -#: ../libempathy-gtk/empathy-chat.c:3501 +#: ../libempathy-gtk/empathy-chat.c:3650 msgid "Not now" msgstr "現在不要" -#: ../libempathy-gtk/empathy-chat.c:3545 +#: ../libempathy-gtk/empathy-chat.c:3694 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "重試" -#: ../libempathy-gtk/empathy-chat.c:3549 +#: ../libempathy-gtk/empathy-chat.c:3698 msgid "Wrong password; please try again:" msgstr "密碼錯誤；請再試一次：" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3679 +#: ../libempathy-gtk/empathy-chat.c:3828 msgid "This room is protected by a password:" msgstr "此聊天室已被密碼保護：" -#: ../libempathy-gtk/empathy-chat.c:3706 +#: ../libempathy-gtk/empathy-chat.c:3855 msgid "Join" msgstr "參加" -#: ../libempathy-gtk/empathy-chat.c:3894 ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "成功連線" -#: ../libempathy-gtk/empathy-chat.c:3949 +#: ../libempathy-gtk/empathy-chat.c:4102 msgid "Conversation" msgstr "談話" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3954 +#: ../libempathy-gtk/empathy-chat.c:4107 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "未知或無效的識別身分" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "聯絡人封鎖暫時無法使用" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "聯絡人封鎖無法使用" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "已拒絕授權" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "無法封鎖聯絡人" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "編輯封鎖的聯絡人" @@ -1630,7 +1602,7 @@ msgstr "編輯封鎖的聯絡人" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1441 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" @@ -1665,150 +1637,45 @@ msgstr "開啟連結(_O)" msgid "%A %B %d %Y" msgstr "%Y %B %d %A" -#: ../libempathy-gtk/empathy-contact-dialogs.c:287 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "編輯聯絡人資訊" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:338 -msgid "Personal Information" -msgstr "個人資料" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:439 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "新增聯絡人" -#: ../libempathy-gtk/empathy-contact-dialogs.c:508 -#: ../libempathy-gtk/empathy-individual-dialogs.c:198 +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "封鎖 %s？" -#: ../libempathy-gtk/empathy-contact-dialogs.c:513 -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 -#, c-format -msgid "Are you sure you want to block '%s' from contacting you again?" -msgstr "你確定想要封鎖「%s」讓他無法再與你聯絡嗎？" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:518 -#: ../libempathy-gtk/empathy-individual-dialogs.c:275 -msgid "_Block" -msgstr "封鎖(_B)" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:536 -#: ../libempathy-gtk/empathy-individual-dialogs.c:284 -msgid "_Report this contact as abusive" -msgid_plural "_Report these contacts as abusive" -msgstr[0] "回報這些聯絡人濫用帳號(_R)" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "稍後再決定(_L)" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 -msgid "Subscription Request" -msgstr "訂閱要求" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 -msgid "_Block User" -msgstr "封鎖使用者(_B)" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1935 -#: ../libempathy-gtk/empathy-individual-view.c:2375 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "是否想要移除羣組「%s」？" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1937 -#: ../libempathy-gtk/empathy-individual-view.c:2378 -msgid "Removing group" -msgstr "正在移除羣組" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-contact-list-view.c:2059 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 -msgid "_Remove" -msgstr "移除(_R)" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2015 -#: ../libempathy-gtk/empathy-individual-view.c:2500 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "是否想要移除聯絡人「%s」？" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2017 -#: ../libempathy-gtk/empathy-individual-view.c:2521 -msgid "Removing contact" -msgstr "正在移除聯絡人" - -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "加入聯絡人(_A)…" - -#: ../libempathy-gtk/empathy-contact-menu.c:287 -msgid "_Block Contact" -msgstr "封鎖聯絡人(_B)" - -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:316 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../libempathy-gtk/empathy-new-message-dialog.c:320 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "聊天(_C)" - -#: ../libempathy-gtk/empathy-contact-menu.c:348 -#: ../libempathy-gtk/empathy-individual-menu.c:850 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "語音通話(_A)" - -#: ../libempathy-gtk/empathy-contact-menu.c:381 -#: ../libempathy-gtk/empathy-individual-menu.c:895 -msgctxt "menu item" -msgid "_Video Call" -msgstr "視像通話(_V)" - -#: ../libempathy-gtk/empathy-contact-menu.c:427 -#: ../libempathy-gtk/empathy-individual-menu.c:948 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "過往談話(_P)" - -#: ../libempathy-gtk/empathy-contact-menu.c:449 -#: ../libempathy-gtk/empathy-individual-menu.c:989 -msgid "Send File" -msgstr "傳送檔案" +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#, c-format +msgid "Are you sure you want to block '%s' from contacting you again?" +msgstr "你確定想要封鎖「%s」讓他無法再與你聯絡嗎？" -#: ../libempathy-gtk/empathy-contact-menu.c:472 -#: ../libempathy-gtk/empathy-individual-menu.c:1031 -msgid "Share My Desktop" -msgstr "分享我的桌面" +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +msgid "_Block" +msgstr "封鎖(_B)" -#: ../libempathy-gtk/empathy-contact-menu.c:501 -#: ../libempathy-gtk/empathy-individual-menu.c:1094 -msgid "Infor_mation" -msgstr "資訊(_M)" +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +msgid "_Report this contact as abusive" +msgid_plural "_Report these contacts as abusive" +msgstr[0] "回報這些聯絡人濫用帳號(_R)" -#: ../libempathy-gtk/empathy-contact-menu.c:547 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "編輯(_E)" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 +msgid "Decide _Later" +msgstr "稍後再決定(_L)" -#: ../libempathy-gtk/empathy-contact-menu.c:601 -#: ../libempathy-gtk/empathy-individual-menu.c:1285 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "邀請你到這個聊天室" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 +msgid "Subscription Request" +msgstr "訂閱要求" -#: ../libempathy-gtk/empathy-contact-menu.c:632 -#: ../libempathy-gtk/empathy-individual-menu.c:1331 -msgid "_Invite to Chat Room" -msgstr "邀請到聊天室(_I)" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "_Block User" +msgstr "封鎖使用者(_B)" #. Title #: ../libempathy-gtk/empathy-contact-search-dialog.c:499 @@ -1835,228 +1702,223 @@ msgstr "你的訊息" msgid "Please let me see when you're online. Thanks!" msgstr "當你上線時請讓我知道。感謝！" -#: ../libempathy-gtk/empathy-contact-widget.c:504 +#: ../libempathy-gtk/empathy-contact-widget.c:568 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "頻道：" -#: ../libempathy-gtk/empathy-contact-widget.c:799 -#: ../libempathy-gtk/empathy-individual-widget.c:421 +#: ../libempathy-gtk/empathy-contact-widget.c:748 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "國家 ISO 碼：" -#: ../libempathy-gtk/empathy-contact-widget.c:801 -#: ../libempathy-gtk/empathy-individual-widget.c:423 +#: ../libempathy-gtk/empathy-contact-widget.c:750 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "國家：" -#: ../libempathy-gtk/empathy-contact-widget.c:803 -#: ../libempathy-gtk/empathy-individual-widget.c:425 +#: ../libempathy-gtk/empathy-contact-widget.c:752 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "州：" -#: ../libempathy-gtk/empathy-contact-widget.c:805 -#: ../libempathy-gtk/empathy-individual-widget.c:427 +#: ../libempathy-gtk/empathy-contact-widget.c:754 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "市：" -#: ../libempathy-gtk/empathy-contact-widget.c:807 -#: ../libempathy-gtk/empathy-individual-widget.c:429 +#: ../libempathy-gtk/empathy-contact-widget.c:756 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "區域：" -#: ../libempathy-gtk/empathy-contact-widget.c:809 -#: ../libempathy-gtk/empathy-individual-widget.c:431 +#: ../libempathy-gtk/empathy-contact-widget.c:758 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "郵遞區號：" -#: ../libempathy-gtk/empathy-contact-widget.c:811 -#: ../libempathy-gtk/empathy-individual-widget.c:433 +#: ../libempathy-gtk/empathy-contact-widget.c:760 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "街：" -#: ../libempathy-gtk/empathy-contact-widget.c:813 -#: ../libempathy-gtk/empathy-individual-widget.c:435 +#: ../libempathy-gtk/empathy-contact-widget.c:762 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "建築：" -#: ../libempathy-gtk/empathy-contact-widget.c:815 -#: ../libempathy-gtk/empathy-individual-widget.c:437 +#: ../libempathy-gtk/empathy-contact-widget.c:764 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "樓層：" -#: ../libempathy-gtk/empathy-contact-widget.c:817 -#: ../libempathy-gtk/empathy-individual-widget.c:439 +#: ../libempathy-gtk/empathy-contact-widget.c:766 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "室：" -#: ../libempathy-gtk/empathy-contact-widget.c:819 -#: ../libempathy-gtk/empathy-individual-widget.c:441 +#: ../libempathy-gtk/empathy-contact-widget.c:768 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "文字：" -#: ../libempathy-gtk/empathy-contact-widget.c:821 -#: ../libempathy-gtk/empathy-individual-widget.c:443 +#: ../libempathy-gtk/empathy-contact-widget.c:770 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "描述：" -#: ../libempathy-gtk/empathy-contact-widget.c:823 -#: ../libempathy-gtk/empathy-individual-widget.c:445 +#: ../libempathy-gtk/empathy-contact-widget.c:772 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI：" -#: ../libempathy-gtk/empathy-contact-widget.c:825 -#: ../libempathy-gtk/empathy-individual-widget.c:447 +#: ../libempathy-gtk/empathy-contact-widget.c:774 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "準確度等級：" -#: ../libempathy-gtk/empathy-contact-widget.c:827 -#: ../libempathy-gtk/empathy-individual-widget.c:449 +#: ../libempathy-gtk/empathy-contact-widget.c:776 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "錯誤：" -#: ../libempathy-gtk/empathy-contact-widget.c:829 -#: ../libempathy-gtk/empathy-individual-widget.c:451 +#: ../libempathy-gtk/empathy-contact-widget.c:778 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "垂直誤差 (ç±³)：" -#: ../libempathy-gtk/empathy-contact-widget.c:831 -#: ../libempathy-gtk/empathy-individual-widget.c:453 +#: ../libempathy-gtk/empathy-contact-widget.c:780 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "水平誤差 (ç±³)：" -#: ../libempathy-gtk/empathy-contact-widget.c:833 -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-contact-widget.c:782 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "速度：" -#: ../libempathy-gtk/empathy-contact-widget.c:835 -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-contact-widget.c:784 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "方位：" -#: ../libempathy-gtk/empathy-contact-widget.c:837 -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-contact-widget.c:786 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "爬升速度：" -#: ../libempathy-gtk/empathy-contact-widget.c:839 -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-contact-widget.c:788 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "上次更新於：" -#: ../libempathy-gtk/empathy-contact-widget.c:841 -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-contact-widget.c:790 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "經度：" -#: ../libempathy-gtk/empathy-contact-widget.c:843 -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-contact-widget.c:792 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "緯度：" -#: ../libempathy-gtk/empathy-contact-widget.c:845 -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-contact-widget.c:794 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "緯度：" -#: ../libempathy-gtk/empathy-contact-widget.c:898 -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:559 -#: ../libempathy-gtk/empathy-individual-widget.c:574 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:847 +#: ../libempathy-gtk/empathy-contact-widget.c:862 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:15 msgid "Location" msgstr "位置" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:576 +#: ../libempathy-gtk/empathy-contact-widget.c:864 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s，%s" -#: ../libempathy-gtk/empathy-contact-widget.c:967 -#: ../libempathy-gtk/empathy-individual-widget.c:625 +#: ../libempathy-gtk/empathy-contact-widget.c:916 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%Y %B %e 於 %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1049 -#: ../libempathy-gtk/empathy-individual-widget.c:867 +#: ../libempathy-gtk/empathy-contact-widget.c:998 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "儲存大頭貼" -#: ../libempathy-gtk/empathy-contact-widget.c:1105 -#: ../libempathy-gtk/empathy-individual-widget.c:925 +#: ../libempathy-gtk/empathy-contact-widget.c:1054 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "無法儲存大頭貼" -#: ../libempathy-gtk/empathy-contact-widget.c:1793 -#: ../libempathy-gtk/empathy-individual-menu.c:1066 -#: ../libempathy-gtk/empathy-individual-widget.c:1324 -msgid "Favorite" -msgstr "喜好" - -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 msgid "Full name" msgstr "全名" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 msgid "Phone number" msgstr "電話號碼" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 msgid "E-mail address" msgstr "電子信箱位址" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Website" msgstr "網站" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Birthday" msgstr "生日" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Last seen:" msgstr "上次看見：" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 msgid "Connected from:" msgstr "已連接從：" #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 msgid "Away message:" msgstr "離開訊息：" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "work" msgstr "工作" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 msgid "home" msgstr "住家" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 msgid "mobile" msgstr "行動" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 msgid "voice" msgstr "聲音" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 msgid "preferred" msgstr "偏好" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 msgid "postal" msgstr "郵遞" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 msgid "parcel" msgstr "包裹" @@ -2066,7 +1928,7 @@ msgstr "位置 於 (date)\t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1260 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "別名：" @@ -2086,7 +1948,7 @@ msgstr "聯絡人詳細資料" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1469 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "識別身分：" @@ -2103,120 +1965,205 @@ msgstr "OS：" msgid "Version:" msgstr "版本：" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "羣組" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." msgstr "請選擇這個聯絡人要顯現在哪個羣組。注意你可以選擇一個以上的羣組或不選擇羣組。" -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "加入羣組(_G)" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "選取" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1953 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1951 msgid "Group" msgstr "羣組" -#: ../libempathy-gtk/empathy-individual-dialogs.c:258 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "下列識別身分將被封鎖：" -#: ../libempathy-gtk/empathy-individual-dialogs.c:265 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "下列識別身分無法被封鎖：" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "編輯聯絡人資訊" + #. Translators: the heading at the top of the Information dialogue #: ../libempathy-gtk/empathy-individual-information-dialog.c:288 msgid "Linked Contacts" msgstr "連結聯絡羣" -#: ../libempathy-gtk/empathy-individual-linker.c:370 +#: ../libempathy-gtk/empathy-individual-linker.c:372 msgid "Select contacts to link" msgstr "選取要連結的聯絡人" -#: ../libempathy-gtk/empathy-individual-linker.c:444 +#: ../libempathy-gtk/empathy-individual-linker.c:447 msgid "New contact preview" msgstr "新增聯絡人預覽" -#: ../libempathy-gtk/empathy-individual-linker.c:488 +#: ../libempathy-gtk/empathy-individual-linker.c:491 msgid "Contacts selected in the list on the left will be linked together." msgstr "在清單左方的所選聯絡人將連結在一起。" #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:145 +#: ../libempathy-gtk/empathy-individual-menu.c:181 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:363 msgid "Select account to use to place the call" msgstr "選取要用來放置通話的帳號" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 +#: ../libempathy-gtk/empathy-individual-menu.c:367 #: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1285 +#: ../src/empathy-streamed-media-window.c:1288 #: ../src/empathy-call-window.ui.h:2 msgid "Call" msgstr "通話" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:432 msgid "Mobile" msgstr "流動電話" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:434 msgid "Work" msgstr "工作" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:436 msgid "HOME" msgstr "住家" +#: ../libempathy-gtk/empathy-individual-menu.c:677 +msgid "_Block Contact" +msgstr "封鎖聯絡人(_B)" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "_Chat" +msgstr "聊天(_C)" + #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:805 -#: ../libempathy-gtk/empathy-new-message-dialog.c:314 +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1143 +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "語音通話(_A)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +msgctxt "menu item" +msgid "_Video Call" +msgstr "視像通話(_V)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "_Previous Conversations" +msgstr "過往談話(_P)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +msgid "Send File" +msgstr "傳送檔案" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "分享我的桌面" + +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "喜好" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "資訊(_M)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "編輯(_E)" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1169 +#: ../libempathy-gtk/empathy-individual-menu.c:1385 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "連結聯絡人(_L)…" -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1166 +msgid "Inviting you to this room" +msgstr "邀請你到這個聊天室" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +msgid "_Invite to Chat Room" +msgstr "邀請到聊天室(_I)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Add Contact…" +msgstr "加入聯絡人(_A)…" + +#: ../libempathy-gtk/empathy-individual-view.c:2307 msgid "Delete and _Block" msgstr "刪除並封鎖(_B)" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +#: ../libempathy-gtk/empathy-individual-view.c:2342 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "是否想要移除羣組「%s」？" + +#: ../libempathy-gtk/empathy-individual-view.c:2345 +msgid "Removing group" +msgstr "正在移除羣組" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2400 +#: ../libempathy-gtk/empathy-individual-view.c:2617 +msgid "_Remove" +msgstr "移除(_R)" + +#: ../libempathy-gtk/empathy-individual-view.c:2477 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "是否想要移除聯絡人「%s」？" + +#: ../libempathy-gtk/empathy-individual-view.c:2486 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " "remove all the contacts which make up this linked contact." msgstr "你真的想要移除連結聯絡人「%s」嗎？請注意這會移除所有構成此連結聯絡羣的聯絡人。" -#: ../libempathy-gtk/empathy-individual-widget.c:1608 +#: ../libempathy-gtk/empathy-individual-view.c:2498 +msgid "Removing contact" +msgstr "正在移除聯絡人" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2230,19 +2177,19 @@ msgstr "位置 於 (日期)" msgid "Online from a phone or mobile device" msgstr "從手機或流動通訊器材上線" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "新增網絡" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "選擇 IRC 網絡" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "重設網絡清單(_N)" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "選取" @@ -2296,133 +2243,133 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "取消連結(_U)" -#: ../libempathy-gtk/empathy-log-window.c:620 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "歷史" -#: ../libempathy-gtk/empathy-log-window.c:675 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "顯示" -#: ../libempathy-gtk/empathy-log-window.c:697 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "搜尋" -#: ../libempathy-gtk/empathy-log-window.c:1145 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "於 %s 內聊天" -#: ../libempathy-gtk/empathy-log-window.c:1147 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "與 %s 聊天中" -#: ../libempathy-gtk/empathy-log-window.c:1197 -#: ../libempathy-gtk/empathy-log-window.c:1344 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%Y %B %d %A" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1286 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1292 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s： %s" -#: ../libempathy-gtk/empathy-log-window.c:1368 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s 秒" -#: ../libempathy-gtk/empathy-log-window.c:1375 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s 分鐘" -#: ../libempathy-gtk/empathy-log-window.c:1383 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "通話時間 %s，結束於 %s" -#: ../libempathy-gtk/empathy-log-window.c:1715 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "今日" -#: ../libempathy-gtk/empathy-log-window.c:1719 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "昨日" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1734 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%Yå¹´%B%e日" -#: ../libempathy-gtk/empathy-log-window.c:1815 -#: ../libempathy-gtk/empathy-log-window.c:3430 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "任何時間" -#: ../libempathy-gtk/empathy-log-window.c:1902 -#: ../libempathy-gtk/empathy-log-window.c:2358 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "任一個" -#: ../libempathy-gtk/empathy-log-window.c:2671 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "誰" -#: ../libempathy-gtk/empathy-log-window.c:2875 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "何時" -#: ../libempathy-gtk/empathy-log-window.c:2991 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "任何事" -#: ../libempathy-gtk/empathy-log-window.c:2993 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "文字聊天" -#: ../libempathy-gtk/empathy-log-window.c:2995 +#: ../libempathy-gtk/empathy-log-window.c:3044 #: ../src/empathy-preferences.ui.h:4 msgid "Calls" msgstr "通話" -#: ../libempathy-gtk/empathy-log-window.c:3000 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "來電" -#: ../libempathy-gtk/empathy-log-window.c:3001 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "播出" -#: ../libempathy-gtk/empathy-log-window.c:3002 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "漏接來電" -#: ../libempathy-gtk/empathy-log-window.c:3024 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "什麼" -#: ../libempathy-gtk/empathy-log-window.c:3719 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "你確定要刪除過往談話的所有紀錄嗎？" -#: ../libempathy-gtk/empathy-log-window.c:3723 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "清除全部" -#: ../libempathy-gtk/empathy-log-window.c:3730 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "刪除從：" @@ -2451,7 +2398,7 @@ msgstr "視像" #: ../libempathy-gtk/empathy-log-window.ui.h:7 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 +#: ../src/empathy-roster-window-menubar.ui.h:20 msgid "_Edit" msgstr "編輯(_E)" @@ -2463,76 +2410,82 @@ msgstr "檔案(_F)" msgid "page 2" msgstr "頁面 2" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "聯絡人已經離線" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 msgid "The specified contact is either invalid or unknown" msgstr "指定的聯絡人無效或未知" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" msgstr "該聯絡人不支援這類談話" -#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 msgid "The requested functionality is not implemented for this protocol" msgstr "請求的功能尚未在此協定中實作" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 msgid "Could not start a conversation with the given contact" msgstr "無法啟動與給定聯絡人的談話" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "你被此頻道禁封" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "此頻道已滿" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 msgid "You must be invited to join this channel" msgstr "你必須被邀請才能參加此頻道" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" msgstr "斷線時無法處理" -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "許可被拒絕" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "啟動談話時發生錯誤" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "請輸入聯絡人辨識身份或電話號碼：" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:334 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "新增談話" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:226 +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "_Video Call" msgstr "視像通話(_V)" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:236 +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 msgid "_Audio Call" msgstr "語音通話(_A)" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:246 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "新增通話" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "%s 帳號驗證失敗" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2647,12 +2600,12 @@ msgstr "語音通話結束" msgid "Edit Custom Messages" msgstr "編輯自選訊息" -#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "訊息編輯於 %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1752 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "一般" @@ -2732,14 +2685,18 @@ msgid "Continue" msgstr "繼續" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "未受信任的連線" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "此連線未受信任。你無論如何都要繼續嗎？" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "請記住此選擇以供未來連線使用" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "證書詳細資料" @@ -2934,31 +2891,31 @@ msgstr "西歐語系" msgid "Vietnamese" msgstr "越南文" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "沒有錯誤訊息" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "即時通訊 (Empathy)" -#: ../src/empathy.c:433 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "啟動時不要自動連線" -#: ../src/empathy.c:437 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "啟動時不顯示聯絡人清單或任何其他對話窗" -#: ../src/empathy.c:452 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "- Empathy 即時通用戶端" -#: ../src/empathy.c:639 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "聯絡帳號管理程式時發生錯誤" -#: ../src/empathy.c:641 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -2993,11 +2950,11 @@ msgid "" "Street, Fifth Floor, Boston, MA 02110-130159 USA" msgstr "你應該已經和 Empathy 一起收到一份 GNU 通用公共許可證的副本；如果還沒有，寫信給： Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "GNOME 的即時訊息用戶端程式" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "如對翻譯有任何意見，請送一封電子郵件給\n" @@ -3037,35 +2994,36 @@ msgid "" msgstr "你可以回到前頁再次輸入帳號的詳細資料或結束此助理，稍後再從「編輯」選單加入帳號。" #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1276 msgid "An error occurred" msgstr "發生錯誤" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "你的聊天帳號是哪一種？" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "你還想要設定其他的聊天帳號嗎？" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "請輸入你的帳號詳細資料" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "你想要建立何種聊天帳號？" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "是否想要建立其他聊天帳號？" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "請輸入新帳號的詳細資料" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3073,41 +3031,41 @@ msgid "" "calls." msgstr "使用 Empathy 可以在網上跟附近的人聊天，或是和使用 Google Talk、AIM、Windows Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網絡攝影機還可以進行語音或視像通話。" -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "你是否有使用其他聊天程式的帳號？" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "是的，請匯入我的帳號詳細資料於" -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "是的，我現在要輸入帳號的詳細資料" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "不，我想要新的帳號" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "不，我現在只想看看附近有誰上線" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "選擇要匯入的帳號：" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "是" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "不，目前就這樣" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3115,16 +3073,16 @@ msgid "" "disable this feature by using the 'Accounts' dialog" msgstr "Empathy 可以自動探索與你連線到相同網絡上的人們，並且和他們聊天。如果你想要使用此功能，請檢查下列詳細資料是否正確。你也可以在以後簡單地更改這些細節，或是用「帳號」對話窗來停用此功能" -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 msgid "Edit->Accounts" msgstr "編輯 -> 帳號" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "我現在不想要啟用這項功能(_N)" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1148 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3132,85 +3090,93 @@ msgid "" "the Accounts dialog" msgstr "你無法與連線到你本機網絡的人們聊天，因為 telepathy-salut 尚未安裝。如果你想要啟用此功能，請安裝 telepathy-salut 套件，並從「帳號」對話窗建立「附近的人」帳號" -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1154 msgid "telepathy-salut not installed" msgstr "telepathy-salut 尚未安裝" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1200 msgid "Messaging and VoIP Accounts Assistant" msgstr "訊息與 VoIP 帳號助理" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1234 msgid "Welcome to Empathy" msgstr "歡迎使用 Empathy" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1243 msgid "Import your existing accounts" msgstr "匯入現有的帳號" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1261 msgid "Please enter personal details" msgstr "請輸入個人詳細資料" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "有與你的 %s 帳號相關的修改尚未儲存。" #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "尚未儲存你的新帳號。" -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:755 -#: ../src/empathy-call-window.c:1326 +#: ../src/empathy-accounts-dialog.c:344 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "連線中…" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:385 #, c-format msgid "Offline — %s" msgstr "離線 — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:397 #, c-format msgid "Disconnected — %s" msgstr "已斷線 — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:408 msgid "Offline — No Network Connection" msgstr "離線 — 無網絡連線" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:415 msgid "Unknown Status" msgstr "未知的狀態" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:427 msgid "Offline — Account Disabled" msgstr "離線 — 帳號已停用" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"你即將建立新的帳號，這樣會放棄\n" -"你所做的更改。確定要繼續？" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "編輯連線參數" + +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "無法從伺服器擷取你的個人資料。" + +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "上線以編輯你的個人資料。" -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "編輯連線參數(_E)..." + +#: ../src/empathy-accounts-dialog.c:1289 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "是否想要從你的電腦上移除羣組 %s？" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1293 msgid "This will not remove your account on the server." msgstr "這不會移除伺服器上的你的帳號。" -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1529 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3219,15 +3185,15 @@ msgstr "" "你所做的更改。確定要繼續？" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1705 msgid "_Enable" msgstr "啟用(_E)" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1706 msgid "_Disable" msgstr "停用(_D)" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2176 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3261,11 +3227,11 @@ msgstr "要加入新的帳號，你必須先安裝每個會用到的通訊協定 msgid "_Import…" msgstr "匯入(_I)…" -#: ../src/empathy-auth-client.c:251 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr "- Empathy 認證用戶端" -#: ../src/empathy-auth-client.c:267 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Empathy 認證用戶端" @@ -3281,137 +3247,137 @@ msgstr "- Empathy 音訊視像用戶端" msgid "Empathy Audio/Video Client" msgstr "Empathy 音訊視像用戶端" -#: ../src/empathy-streamed-media-window.c:432 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "對比" -#: ../src/empathy-streamed-media-window.c:435 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "亮度" -#: ../src/empathy-streamed-media-window.c:438 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-streamed-media-window.c:543 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "音量" -#: ../src/empathy-streamed-media-window.c:1094 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "側邊欄(_S)" -#: ../src/empathy-streamed-media-window.c:1114 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "音效輸入" -#: ../src/empathy-streamed-media-window.c:1118 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "視像輸入" -#: ../src/empathy-streamed-media-window.c:1126 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "播號盤" -#: ../src/empathy-streamed-media-window.c:1137 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "詳細資料" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1206 -#: ../src/empathy-call-window.c:1932 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format msgid "Call with %s" msgstr "與 %s 通話中" -#: ../src/empathy-streamed-media-window.c:1439 -#: ../src/empathy-call-window.c:2176 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 msgid "The IP address as seen by the machine" msgstr "機器看見的 IP 位址" -#: ../src/empathy-streamed-media-window.c:1441 -#: ../src/empathy-call-window.c:2178 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 msgid "The IP address as seen by a server on the Internet" msgstr "互聯網上的伺服器看見的 IP 位址" -#: ../src/empathy-streamed-media-window.c:1443 -#: ../src/empathy-call-window.c:2180 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 msgid "The IP address of the peer as seen by the other side" msgstr "其他端看見的點的 IP 位址" -#: ../src/empathy-streamed-media-window.c:1445 -#: ../src/empathy-call-window.c:2182 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 msgid "The IP address of a relay server" msgstr "中繼伺服器的 IP 位址" -#: ../src/empathy-streamed-media-window.c:1447 -#: ../src/empathy-call-window.c:2184 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 msgid "The IP address of the multicast group" msgstr "多點廣播羣組的 IP 位址" -#: ../src/empathy-streamed-media-window.c:1835 #: ../src/empathy-streamed-media-window.c:1838 #: ../src/empathy-streamed-media-window.c:1841 #: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 msgctxt "codec" msgid "Unknown" msgstr "未知" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2136 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "已連線 — %d:%02dm" -#: ../src/empathy-streamed-media-window.c:2197 -#: ../src/empathy-call-window.c:3045 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 msgid "Technical Details" msgstr "技術細節" -#: ../src/empathy-streamed-media-window.c:2235 -#: ../src/empathy-call-window.c:3084 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " "computer" msgstr "%s 的軟件不瞭解任何你電腦上所支援的音訊格式" -#: ../src/empathy-streamed-media-window.c:2240 -#: ../src/empathy-call-window.c:3089 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " "computer" msgstr "%s 的軟件不瞭解任何你電腦上所支援的視像格式" -#: ../src/empathy-streamed-media-window.c:2246 -#: ../src/empathy-call-window.c:3095 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " "does not allow direct connections." msgstr "無法和 %s 建立連線。你們其中之一可能在一個不允許直接連線的網絡之上。" -#: ../src/empathy-streamed-media-window.c:2252 -#: ../src/empathy-call-window.c:3101 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 msgid "There was a failure on the network" msgstr "這個網絡上有錯誤發生" -#: ../src/empathy-streamed-media-window.c:2256 -#: ../src/empathy-call-window.c:3105 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "此通話所必要的音訊格式尚未在你的電腦上安裝" -#: ../src/empathy-streamed-media-window.c:2259 -#: ../src/empathy-call-window.c:3108 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "此通話所必要的視像格式尚未在你的電腦上安裝" -#: ../src/empathy-streamed-media-window.c:2269 -#: ../src/empathy-call-window.c:3120 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please 匯報這個錯誤並附上從求助選單內的「除錯」視窗中所收集的紀錄。" -#: ../src/empathy-streamed-media-window.c:2277 -#: ../src/empathy-call-window.c:3129 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 msgid "There was a failure in the call engine" msgstr "通話引擎內有錯誤發生" -#: ../src/empathy-streamed-media-window.c:2280 -#: ../src/empathy-call-window.c:3132 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 msgid "The end of the stream was reached" msgstr "已達串流末端" -#: ../src/empathy-streamed-media-window.c:2320 -#: ../src/empathy-call-window.c:3172 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 msgid "Can't establish audio stream" msgstr "無法建立音訊串流" -#: ../src/empathy-streamed-media-window.c:2330 -#: ../src/empathy-call-window.c:3182 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 msgid "Can't establish video stream" msgstr "無法建立視像串流" @@ -3526,8 +3492,8 @@ msgstr "切換視像傳播" #: ../src/empathy-call-window.ui.h:21 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../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.c:2580 ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 msgid "Unknown" msgstr "不明" @@ -3545,17 +3511,17 @@ msgid "_Camera" msgstr "攝影機(_C)" #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "_Contents" msgstr "內容(_C)" #: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "_Debug" msgstr "偵錯(_D)" #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Help" msgstr "求助(_H)" @@ -3568,46 +3534,86 @@ msgid "_Settings" msgstr "設定值(_S)" #: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 +#: ../src/empathy-roster-window-menubar.ui.h:29 #: ../src/empathy-streamed-media-window.ui.h:25 msgid "_View" msgstr "檢視(_V)" -#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 +#: ../src/empathy-chat-window.c:285 +msgid "Close this window?" +msgstr "要關閉這個視窗？" + +#: ../src/empathy-chat-window.c:290 +#, c-format +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "關閉此視窗會離開 %s。你將無法接收到之後的訊息，除非你再次參與。" + +#: ../src/empathy-chat-window.c:301 +#, 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] "關閉此視窗會離開 %u 個聊天室。你將無法接收到之後的訊息，除非你再次參與。" + +#: ../src/empathy-chat-window.c:310 +#, c-format +msgid "Leave %s?" +msgstr "離開 %s？" + +#: ../src/empathy-chat-window.c:311 +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "你將無法接收到此聊天室之後的訊息，除非你再次參與。" + +#: ../src/empathy-chat-window.c:330 +msgid "Close window" +msgstr "關閉視窗" + +#: ../src/empathy-chat-window.c:330 +msgid "Leave room" +msgstr "離開聊天室" + +#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d 個未讀)" -#: ../src/empathy-chat-window.c:493 +#: ../src/empathy-chat-window.c:648 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (與 %u 其他的)" -#: ../src/empathy-chat-window.c:509 +#: ../src/empathy-chat-window.c:664 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (來自其他人的 %d 個未讀)" -#: ../src/empathy-chat-window.c:518 +#: ../src/empathy-chat-window.c:673 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (來自所有人的 %d 個未讀)" -#: ../src/empathy-chat-window.c:733 +#: ../src/empathy-chat-window.c:888 msgid "SMS:" msgstr "SMS：" -#: ../src/empathy-chat-window.c:743 +#: ../src/empathy-chat-window.c:898 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "正在傳送 %d 個訊息" -#: ../src/empathy-chat-window.c:765 +#: ../src/empathy-chat-window.c:920 msgid "Typing a message." msgstr "正在輸入訊息。" @@ -3687,96 +3693,96 @@ msgstr "自動連線" msgid "Manage Favorite Rooms" msgstr "管理喜好的聊天室" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "傳入的視像通話" -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1556 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "來電" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s 要與你進行視像通話。你是否要接聽？" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s 要與你進行通話。你是否要接聽？" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1562 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "%s 的來電" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "拒絕(_R)" -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "接聽(_A)" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "以視像接聽(_A)" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1562 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" msgstr "來自 %s 的視像通話" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "聊天室邀請" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "邀請參加 %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s 正在邀請你參加 %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "拒絕(_D)" -#: ../src/empathy-event-manager.c:858 +#: ../src/empathy-event-manager.c:860 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "參加(_J)" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s 曾邀請你參加 %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "你被邀請參加 %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "收到來自 %s 的檔案傳輸" -#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372 msgid "Password required" msgstr "需要密碼" -#: ../src/empathy-event-manager.c:1210 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s 想要得到查看你是否上線的許可" -#: ../src/empathy-event-manager.c:1214 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3786,105 +3792,105 @@ msgstr "" "訊息：%s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "不明" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s / %s 於 %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s / %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "正在接收 %2$s 送出的「%1$s」" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "正在傳送「%s」給 %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "從 %2$s 接收「%1$s」時發生錯誤" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "接收檔案時發生錯誤" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "傳送「%s」給 %s 時發生錯誤" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "傳送檔案時發生錯誤" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "「%s」接收自 %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "「%s」傳送給 %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "檔案傳輸完畢" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "正在等待其他參與者的回應" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "正在檢查檔案「%s」的完整性" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "正在計算「%s」雜湊值" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "檔案" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "剩餘" @@ -3907,161 +3913,178 @@ msgid "Import Accounts" msgstr "匯入帳號" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "匯入" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "通訊協定" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "來源" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-roster-window.c:389 msgid "Provide Password" msgstr "提供密碼" -#: ../src/empathy-main-window.c:401 +#: ../src/empathy-roster-window.c:395 msgid "Disconnect" msgstr "斷線" -#: ../src/empathy-main-window.c:638 +#: ../src/empathy-roster-window.c:644 +msgid "You need to setup an account to see contacts here." +msgstr "" + +#: ../src/empathy-roster-window.c:660 msgid "No match found" msgstr "找不到符合項目" -#: ../src/empathy-main-window.c:746 +#: ../src/empathy-roster-window.c:765 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "很抱歉，%s 帳號無法使用，除非你的 %s 軟件已更新。" -#: ../src/empathy-main-window.c:814 +#: ../src/empathy-roster-window.c:831 msgid "Update software..." msgstr "更新軟件..." -#: ../src/empathy-main-window.c:820 ../src/empathy-main-window.c:941 +#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954 msgid "Close" msgstr "關閉" -#: ../src/empathy-main-window.c:929 +#: ../src/empathy-roster-window.c:942 msgid "Reconnect" msgstr "重新連接" -#: ../src/empathy-main-window.c:935 +#: ../src/empathy-roster-window.c:948 msgid "Edit Account" msgstr "編輯帳號" #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:1074 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1092 #, c-format msgid "Top up %s (%s)..." msgstr "加值 %s (%s)..." -#: ../src/empathy-main-window.c:1121 +#: ../src/empathy-roster-window.c:1138 msgid "Top up account credit" msgstr "加值帳號存額" #. top up button -#: ../src/empathy-main-window.c:1192 +#: ../src/empathy-roster-window.c:1210 msgid "Top Up..." msgstr "加值..." -#: ../src/empathy-main-window.c:1935 +#: ../src/empathy-roster-window.c:1933 msgid "Contact" msgstr "聯絡人" -#: ../src/empathy-main-window.c:2310 +#: ../src/empathy-roster-window.c:2131 +msgid "You need to enable one of your accounts to see contacts here." +msgstr "" + +#. translators: argument is an account name +#: ../src/empathy-roster-window.c:2139 +#, c-format +msgid "You need to enable %s to see contacts here." +msgstr "" + +#: ../src/empathy-roster-window.c:2419 msgid "Contact List" msgstr "聯絡人清單" -#: ../src/empathy-main-window-menubar.ui.h:1 +#: ../src/empathy-roster-window.ui.h:1 +#, fuzzy +#| msgid "_Accounts" +msgid "Account settings" +msgstr "帳號(_A)" + +#: ../src/empathy-roster-window-menubar.ui.h:1 msgid "Contacts on a _Map" msgstr "聯絡人地圖(_M)" -#: ../src/empathy-main-window-menubar.ui.h:2 +#: ../src/empathy-roster-window-menubar.ui.h:2 msgid "Credit Balance" msgstr "儲值餘額" -#: ../src/empathy-main-window-menubar.ui.h:3 +#: ../src/empathy-roster-window-menubar.ui.h:3 msgid "Find in Contact _List" msgstr "於聯絡人清單內尋找(_L)" -#: ../src/empathy-main-window-menubar.ui.h:4 +#: ../src/empathy-roster-window-menubar.ui.h:4 msgid "Join _Favorites" msgstr "參加喜好聊天室(_F)" -#: ../src/empathy-main-window-menubar.ui.h:5 +#: ../src/empathy-roster-window-menubar.ui.h:5 msgid "Manage Favorites" msgstr "管理喜好" -#: ../src/empathy-main-window-menubar.ui.h:6 +#: ../src/empathy-roster-window-menubar.ui.h:6 msgid "N_ormal Size" msgstr "正常大小(_O)" -#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 +#: ../src/empathy-roster-window-menubar.ui.h:7 +#: ../src/empathy-status-icon.ui.h:1 msgid "New _Call…" msgstr "新增通話(_C)…" -#: ../src/empathy-main-window-menubar.ui.h:8 +#: ../src/empathy-roster-window-menubar.ui.h:8 msgid "Normal Size With _Avatars" msgstr "正常大小與大頭貼(_A)" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:9 msgid "P_references" msgstr "偏好設定(_R)" -#: ../src/empathy-main-window-menubar.ui.h:10 +#: ../src/empathy-roster-window-menubar.ui.h:10 msgid "Show P_rotocols" msgstr "顯示協定(_R)" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:11 msgid "Sort by _Name" msgstr "根據名稱排序(_N)" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:12 msgid "Sort by _Status" msgstr "根據狀態排序(_S)" -#: ../src/empathy-main-window-menubar.ui.h:13 +#: ../src/empathy-roster-window-menubar.ui.h:13 msgid "_Accounts" msgstr "帳號(_A)" -#: ../src/empathy-main-window-menubar.ui.h:15 +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "_Blocked Contacts" msgstr "被封鎖的聯絡人" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:17 msgid "_Compact Size" msgstr "精簡大小(_C)" -#: ../src/empathy-main-window-menubar.ui.h:21 +#: ../src/empathy-roster-window-menubar.ui.h:21 msgid "_File Transfers" msgstr "檔案傳輸(_F)" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:23 msgid "_Join…" msgstr "參加(_J)…" -#: ../src/empathy-main-window-menubar.ui.h:24 +#: ../src/empathy-roster-window-menubar.ui.h:24 #: ../src/empathy-status-icon.ui.h:3 msgid "_New Conversation…" msgstr "新增談話(_N)…" -#: ../src/empathy-main-window-menubar.ui.h:25 +#: ../src/empathy-roster-window-menubar.ui.h:25 msgid "_Offline Contacts" msgstr "離線聯絡人(_O)" -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "個人資料(_P)" - -#: ../src/empathy-main-window-menubar.ui.h:28 +#: ../src/empathy-roster-window-menubar.ui.h:27 msgid "_Room" msgstr "聊天室(_R)" -#: ../src/empathy-main-window-menubar.ui.h:29 +#: ../src/empathy-roster-window-menubar.ui.h:28 msgid "_Search for Contacts…" msgstr "搜尋聯絡人(_S)…" @@ -4075,7 +4098,7 @@ msgstr "成員" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:623 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4088,16 +4111,16 @@ msgstr "" "需要密碼：%s\n" "成員：%s" -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "否" -#: ../src/empathy-new-chatroom-dialog.c:654 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "無法開始列出聊天室清單" -#: ../src/empathy-new-chatroom-dialog.c:664 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "無法停止列出聊天室清單" @@ -4128,79 +4151,79 @@ msgstr "聊天室清單" msgid "_Room:" msgstr "聊天室(_R)：" -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "訊息已收到" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "訊息已送出" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "新增談話" -#: ../src/empathy-preferences.c:172 -msgid "Contact goes online" +#: ../src/empathy-preferences.c:169 +msgid "Contact comes online" msgstr "聯絡人上線" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "聯絡人離線" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "帳號已連線" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "帳號已斷線" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "語言" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:726 msgid "Juliet" msgstr "祝英台" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:733 msgid "Romeo" msgstr "梁山伯" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:739 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "白玉環與蝴蝶墜，為何不能夫妻配？" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:743 msgid "Deny thy father and refuse thy name;" msgstr "豈知你我自作主，無人當它是聘媒。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:746 msgid "Or if thou wilt not, be but sworn my love" msgstr "豈知好事成虛話，棒打鴛鴦兩離分。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:749 msgid "And I'll no longer be a Capulet." msgstr "爹爹許了馬家婚，心已碎，意難伸。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:752 msgid "Shall I hear more, or shall I speak at this?" msgstr "將來有命終相見，無命今生不相逄。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" msgstr "祝英台已斷線" -#: ../src/empathy-preferences.c:1175 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "偏好設定" @@ -4256,112 +4279,112 @@ msgstr "為語言啟用拼字檢查：" msgid "General" msgstr "一般" -#: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "輸入等級：" - #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "輸入音量：" - -#: ../src/empathy-preferences.ui.h:18 msgid "Location sources:" msgstr "位置來源：" -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:17 msgid "Log conversations" msgstr "紀錄談話" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:18 msgid "Notifications" msgstr "通知" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:19 msgid "Play sound for events" msgstr "播放事件音效" -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:20 msgid "Privacy" msgstr "私隱" -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:21 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 "降低位置準確度意指除了你所在的城市、洲和國家會被公開之外，不會提供其他訊息。GPS 的座標準確度將會降為個位數。" -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:22 msgid "Show _smileys as images" msgstr "將表情符號以圖片顯示(_S)" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:23 msgid "Show contact _list in rooms" msgstr "在聊天室顯示聯絡人清單(_L)" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:24 msgid "Sounds" msgstr "音效" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:25 msgid "Spell Checking" msgstr "拼字檢查" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:26 +msgid "Start chats in:" +msgstr "開啟聊天於：" + +#: ../src/empathy-preferences.ui.h:27 msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." msgstr "這裏的語言清單只反映出你已經安裝字典的語言。" -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:28 msgid "Themes" msgstr "佈景主題" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:29 msgid "Use _echo cancellation to improve call quality" msgstr "使用回音消除來改善通話品質(_E)" -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:30 msgid "Variant:" msgstr "樣式：" -#: ../src/empathy-preferences.ui.h:32 +#: ../src/empathy-preferences.ui.h:31 msgid "_Automatically connect on startup" msgstr "啟動時自動連線(_A)" -#: ../src/empathy-preferences.ui.h:33 +#: ../src/empathy-preferences.ui.h:32 msgid "_Cellphone" msgstr "手機(_C)" -#: ../src/empathy-preferences.ui.h:34 +#: ../src/empathy-preferences.ui.h:33 msgid "_Enable bubble notifications" msgstr "啟用氣泡式通知(_E)" -#: ../src/empathy-preferences.ui.h:35 +#: ../src/empathy-preferences.ui.h:34 msgid "_Enable sound notifications" msgstr "啟用音效通知(_E)" -#: ../src/empathy-preferences.ui.h:36 +#: ../src/empathy-preferences.ui.h:35 msgid "_GPS" msgstr "_GPS" -#: ../src/empathy-preferences.ui.h:37 +#: ../src/empathy-preferences.ui.h:36 msgid "_Network (IP, Wi-Fi)" msgstr "網絡 (IP, Wi-Fi)(_N)" -#: ../src/empathy-preferences.ui.h:38 -msgid "_Open new chats in separate windows" -msgstr "在個別視窗開啟新的聊天(_O)" - -#: ../src/empathy-preferences.ui.h:39 +#: ../src/empathy-preferences.ui.h:37 msgid "_Publish location to my contacts" msgstr "對我的聯絡人公開位置(_P)" #. 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:41 +#: ../src/empathy-preferences.ui.h:39 msgid "_Reduce location accuracy" msgstr "降低位置準確度(_R)" +#: ../src/empathy-preferences.ui.h:40 +msgid "new _windows" +msgstr "新視窗(_W)" + +#: ../src/empathy-preferences.ui.h:41 +msgid "new ta_bs" +msgstr "新分頁(_B)" + #: ../src/empathy-status-icon.ui.h:2 msgid "Status" msgstr "狀態" @@ -4418,7 +4441,7 @@ msgstr "視像開啟" msgid "Video Preview" msgstr "視像預覽" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "聯絡人地圖檢視" @@ -4484,16 +4507,16 @@ msgid "" "extension." msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。" -#: ../src/empathy-invite-participant-dialog.c:197 -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "邀請參與" -#: ../src/empathy-invite-participant-dialog.c:198 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "選擇想要邀請進入談話的聯絡人：" -#: ../src/empathy-invite-participant-dialog.c:221 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "邀請" @@ -4547,13 +4570,13 @@ msgid "Respond" msgstr "回應" #: ../src/empathy-notifications-approver.c:204 -#: ../src/empathy-call-window.c:1566 +#: ../src/empathy-call-window.c:1565 msgid "Reject" msgstr "拒絕" #: ../src/empathy-notifications-approver.c:209 #: ../src/empathy-notifications-approver.c:214 -#: ../src/empathy-call-window.c:1567 +#: ../src/empathy-call-window.c:1566 msgid "Answer" msgstr "接聽" @@ -4585,38 +4608,38 @@ msgstr "%s 剛剛播打給你，但你正與他人通話。" #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196 +#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 msgid "i" msgstr "訊" -#: ../src/empathy-call-window.c:2941 +#: ../src/empathy-call-window.c:2929 msgid "On hold" msgstr "保留" -#: ../src/empathy-call-window.c:2944 +#: ../src/empathy-call-window.c:2932 msgid "Mute" msgstr "靜音" -#: ../src/empathy-call-window.c:2946 +#: ../src/empathy-call-window.c:2934 msgid "Duration" msgstr "時間" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2949 +#: ../src/empathy-call-window.c:2937 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:3219 +#: ../src/empathy-call-window.c:3207 #, c-format msgid "Your current balance is %s." msgstr "你目前的餘額為 %s。" -#: ../src/empathy-call-window.c:3223 +#: ../src/empathy-call-window.c:3211 msgid "Sorry, you don’t have enough credit for that call." msgstr "很抱歉，你的存額不足以進行該通話。" -#: ../src/empathy-call-window.c:3225 +#: ../src/empathy-call-window.c:3213 msgid "Top Up" msgstr "加值" @@ -4624,6 +4647,63 @@ msgstr "加值" msgid "_Match case" msgstr "比對大小寫(_M)" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "新增帳號" + +#~ msgid "Personal Information" +#~ msgstr "個人資訊" + +#~ msgid "_Personal Information" +#~ msgstr "個人資訊(_P)" + +#~ msgid "_Open new chats in separate windows" +#~ msgstr "在個別視窗開啟新的聊天(_O)" + +#~ msgid "Call volume" +#~ msgstr "通話音量" + +#~ msgid "Call volume, as a percentage." +#~ msgstr "通話音量，為百分比。" + +#~ msgid "Socket type not supported" +#~ msgstr "Socket 類型不支援" + +#~ msgid "My Web Accounts" +#~ msgstr "我的網路帳號" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "%s 帳號已透過 %s 修改。" + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "%s 帳號無法於 Empathy 內修改。" + +#~ msgid "Launch My Web Accounts" +#~ msgstr "啟動我的網路帳號" + +#~ msgid "Edit %s" +#~ msgstr "編輯 %s" + +#~ msgid "Ca_ncel" +#~ msgstr "取消(_N)" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "編輯(_E)" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "您即將建立新的帳號，這樣會放棄\n" +#~ "您所做的變更。確定要繼續？" + +#~ msgid "Input level:" +#~ msgstr "輸入等級：" + +#~ msgid "Input volume:" +#~ msgstr "輸入音量：" + #~ msgid "Empathy has migrated butterfly logs" #~ msgstr "Empathy 已轉移 butterfly 日誌" @@ -4843,8 +4923,5 @@ msgstr "比對大小寫(_M)" #~ msgid "Hidden" #~ msgstr "隱藏" -#~ msgid "User requested disconnect" -#~ msgstr "連接不上要求的使用者" - #~ msgid "Location" #~ msgstr "位置" diff --git a/po/zh_TW.po b/po/zh_TW.po index 26d7e05a..292ed0af 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: empathy 3.3.1\n" +"Project-Id-Version: empathy 3.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-12 19:09+0800\n" -"PO-Revision-Date: 2011-11-12 13:49+0800\n" +"POT-Creation-Date: 2012-02-04 15:09+0800\n" +"PO-Revision-Date: 2012-01-31 20:47+0800\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: Chinese (traditional) \n" "Language: zh_TW\n" @@ -40,432 +40,424 @@ msgid "Always open a separate chat window for new chats." msgstr "永遠為每個新的聊天開啟新的聊天視窗。" #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "Call volume" -msgstr "通話音量" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 -msgid "Call volume, as a percentage." -msgstr "通話音量，為百分比。" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "Camera device" msgstr "攝影機裝置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 msgid "Camera position" msgstr "攝影機位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." msgstr "在群組聊天中使用暱稱補齊 (tab) 時要加到暱稱之後的字元。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 msgid "Chat window theme" msgstr "聊天視窗佈景主題" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "Chat window theme variant" msgstr "聊天視窗佈景主題樣式" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "以逗號分隔要使用拼字檢查的語言清單 (如：「 en, fr, nl」)。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Compact contact list" msgstr "精簡連絡人清單" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 msgid "Connection managers should be used" msgstr "使用連線管理程式" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Contact list sort criterion" msgstr "連絡人清單排序準則" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 msgid "D-Bus object path of the last account selected to join a room." msgstr "上次要加入聊天室所選取帳號的 D-Bus 物件路徑。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "要用於視訊通話的預設攝影機裝置，例：/dev/video0。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Default directory to select an avatar image from" msgstr "用來選擇大頭貼圖片的預設目錄" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Disable popup notifications when away" msgstr "當狀態為離開時停用彈出式通知" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Disable sounds when away" msgstr "當狀態為離開時停用音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Display incoming events in the status area" msgstr "在狀態區域顯示收到事件" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "" "Display incoming events in the status area. If false, present them to the " "user immediately." msgstr "在狀態區域顯示收到事件。如果不啟用的話，收到事件會直接呈現給使用者。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Echo cancellation support" msgstr "回音消除支援" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy can publish the user's location" msgstr "Empathy 可以發布使用者的位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy 可以利用 GPS 來推測位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy can use the cellular network to guess the location" msgstr "Empathy 可以利用行動電話網路基地臺來推測位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy can use the network to guess the location" msgstr "Empathy 可以利用網路來推測位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Empathy default download folder" msgstr "Empathy 預設下載資料夾" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Empathy should auto-away when idle" msgstr "Empathy 當閒置時應該自動設為離開" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Empathy should auto-connect on startup" msgstr "Empathy 啟動時自動連線" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Empathy should reduce the location's accuracy" msgstr "Empathy 應降低位置的準確度" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "Empathy 要使用連絡人的大頭貼做為聊天視窗圖示" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Enable WebKit Developer Tools" msgstr "啟用 WebKit 開發者工具" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Enable popup notifications for new messages" msgstr "啟用新訊息的彈出式通知" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Enable spell checker" msgstr "啟用拼字檢查程式" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Hide main window" msgstr "隱藏主視窗" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Hide the main window." msgstr "隱藏主視窗。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Last account selected in Join Room dialog" msgstr "上次在「參加聊天室」對話盒選取的帳號" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Nick completed character" msgstr "暱稱補齊字元" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Open new chats in separate windows" msgstr "在個別視窗開啟新的聊天" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Path of the Adium theme to use" msgstr "要使用的 Adium 佈景主題路徑" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "如果聊天室使用的主題是 Adium 時要使用的 Adium 佈景主題路徑。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound for incoming messages" msgstr "收到訊息時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound for new conversations" msgstr "當開啟新的談話時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for outgoing messages" msgstr "送出訊息時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Play a sound when a contact logs in" msgstr "當連絡人登入時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound when a contact logs out" msgstr "當有連絡人登出時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Play a sound when we log in" msgstr "當我們登入時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound when we log out" msgstr "當我們登出時播放音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Pop up notifications if the chat isn't focused" msgstr "如果聊天視窗失去焦點則彈出通知" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Pop up notifications when a contact logs in" msgstr "當連絡人登入時彈出通知" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Pop up notifications when a contact logs out" msgstr "當連絡人登出時彈出通知" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Position the camera preview should be during a call." msgstr "通話時攝影機預覽應該擺放的位置。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "Show Balance in contact list" msgstr "於聯絡人清單內顯示餘額" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Show avatars" msgstr "顯示大頭貼" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Show contact list in rooms" msgstr "在聊天室顯示連絡人清單" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Show hint about closing the main window" msgstr "關閉主視窗時顯示提示" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Show offline contacts" msgstr "顯示離線連絡人" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Show protocols" msgstr "顯示協定" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Spell checking languages" msgstr "拼字檢查的語言" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "The default folder to save file transfers in." msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "The last directory that an avatar image was chosen from." msgstr "上次選擇大頭貼圖片的目錄。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "The position for the chat window side pane" msgstr "聊天視窗側窗格的位置" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "The stored position (in pixels) of the chat window side pane." msgstr "聊天視窗側窗格的儲存位置 (單位為像素)。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "The theme that is used to display the conversation in chat windows." msgstr "用來顯示在聊天視窗中談話的佈景主題。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "用來在聊天視窗顯示談話的佈景主題樣式。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Use graphical smileys" msgstr "使用圖片式表情符號" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Use notification sounds" msgstr "使用通知音效" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use theme for chat rooms" msgstr "在聊天室使用佈景主題" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "Empathy 是否要將使用者的位置發布給他的連絡人。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Empathy 是否使用 GPS 來推測位置。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "Empathy 是否使用行動電話網路來推測位置。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether Empathy can use the network to guess the location." msgstr "Empathy 是否使用網路來推測位置。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "Empathy 是否應在啟動時自動登入您的帳號。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "" "Whether Empathy should go into away mode automatically if the user is idle." msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "Empathy 是否基於隱私的理由減低位置的準確度。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "Empathy 是否使用連絡人大頭貼做為聊天視窗圖示。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "是否啟用 WebKit 開發者工具，例如 Web Inspector。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." msgstr "是否使用連線管理程式自動斷線或重新連線。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "" "Whether to check words typed against the languages you want to check with." msgstr "是否以您設定的語言檢查輸入有無錯字。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Whether to convert smileys into graphical images in conversations." msgstr "是否將談話中的表情符號轉換為圖片形式。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "是否要啟用 Pulseaudio 的回音消除過濾器。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "是否播放音效來通知有連絡人登入網路。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "是否播放音效來通知有連絡人登出網路。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Whether to play a sound to notify of events." msgstr "是否播放音效來通知有事件發生。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to play a sound to notify of incoming messages." msgstr "是否播放音效來通知有收到訊息。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Whether to play a sound to notify of new conversations." msgstr "是否播放音效來通知新的談話。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to play a sound to notify of outgoing messages." msgstr "是否播放音效來通知有送出訊息。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Whether to play a sound when logging into a network." msgstr "當登入某網路時是否播放音效。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to play a sound when logging out of a network." msgstr "當登出某網路時是否播放音效。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to play sound notifications when away or busy." msgstr "當狀態為離開或忙碌時是否播放音效通知。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to show a popup notification when a contact goes offline." msgstr "當連絡人離線時是否顯示彈出式通知。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Whether to show a popup notification when a contact goes online." msgstr "當連絡人上線時是否顯示彈出式通知。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." msgstr "收到新訊息時是否顯示彈出式通知 (即使已開啟聊天視窗，但沒有獲得焦點)。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Whether to show a popup notification when receiving a new message." msgstr "當收到新訊息時是否顯示彈出式通知。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Whether to show account balances in the contact list." msgstr "是否要在聯絡人清單內顯示帳戶餘額。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "是否在連絡人清單與聊天視窗顯示連絡人大頭貼。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Whether to show contacts that are offline in the contact list." msgstr "是否在連絡人清單中顯示離線的連絡人。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Whether to show popup notifications when away or busy." msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to show protocols for contacts in the contact list." msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Whether to show the contact list in chat rooms." msgstr "是否在聊天室中顯示連絡人清單。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "Whether to show the contact list in compact mode." msgstr "是否以精簡模式顯示連絡人清單。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." msgstr "是否在使用標題列的「x」按鈕關閉主視窗時，顯示訊息對話窗。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether to use the theme for chat rooms." msgstr "是否為聊天室使用佈景主題。" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." +"the contact's state with the value \"state\". A value of \"name\" will sort " +"the contact list by name." msgstr "" -"排序連絡人清單時要使用哪個準則。預設值是使用連絡人的名稱「name」(名稱) 值來排" -"序。而「state」(狀態) 值則會使用其狀態來排序連絡人清單。" +"排序連絡人清單時要使用哪個準則。預設值是使用連絡人的狀態「state」(狀態) 值來" +"排序。而「name」(名稱) 值則會依據名稱來排序連絡人清單。" #: ../data/empathy-accounts.desktop.in.in.h:1 msgid "Manage Messaging and VoIP accounts" @@ -473,23 +465,51 @@ msgstr "管理訊息與 VoIP 帳號" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2312 +#: ../src/empathy-accounts-dialog.c:2327 msgid "Messaging and VoIP Accounts" msgstr "訊息與 VoIP 帳號" -#: ../libempathy/empathy-ft-handler.c:838 +#: ../libempathy/empathy-ft-handler.c:736 +msgid "No reason was specified" +msgstr "沒有指定原因" + +#: ../libempathy/empathy-ft-handler.c:739 +msgid "The change in state was requested" +msgstr "已要求變更狀態" + +#: ../libempathy/empathy-ft-handler.c:742 +msgid "You canceled the file transfer" +msgstr "您已取消檔案傳輸" + +#: ../libempathy/empathy-ft-handler.c:745 +msgid "The other participant canceled the file transfer" +msgstr "其他的參與者取消了檔案傳輸" + +#: ../libempathy/empathy-ft-handler.c:748 +msgid "Error while trying to transfer the file" +msgstr "嘗試傳輸檔案時發生錯誤" + +#: ../libempathy/empathy-ft-handler.c:751 +msgid "The other participant is unable to transfer the file" +msgstr "其他的參與者無法傳輸該檔案" + +#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +msgid "Unknown reason" +msgstr "不明原因" + +#: ../libempathy/empathy-ft-handler.c:917 msgid "File transfer completed, but the file was corrupted" msgstr "檔案傳輸完畢，但是檔案已損毀" -#: ../libempathy/empathy-ft-handler.c:1124 +#: ../libempathy/empathy-ft-handler.c:1203 msgid "File transfer not supported by remote contact" msgstr "遠端連絡人不支援檔案傳輸" -#: ../libempathy/empathy-ft-handler.c:1180 +#: ../libempathy/empathy-ft-handler.c:1259 msgid "The selected file is not a regular file" msgstr "選取的檔案不是正規的檔案" -#: ../libempathy/empathy-ft-handler.c:1189 +#: ../libempathy/empathy-ft-handler.c:1268 msgid "The selected file is empty" msgstr "選取的檔案是空白的" @@ -509,330 +529,274 @@ msgstr "已播打 %s" msgid "Call from %s" msgstr "%s 的來電" -#: ../libempathy/empathy-tp-file.c:258 -msgid "Socket type not supported" -msgstr "Socket 類型不支援" - -#: ../libempathy/empathy-tp-file.c:377 -msgid "No reason was specified" -msgstr "沒有指定原因" - -#: ../libempathy/empathy-tp-file.c:380 -msgid "The change in state was requested" -msgstr "已要求變更狀態" - -#: ../libempathy/empathy-tp-file.c:383 -msgid "You canceled the file transfer" -msgstr "您已取消檔案傳輸" - -#: ../libempathy/empathy-tp-file.c:386 -msgid "The other participant canceled the file transfer" -msgstr "其他的參與者取消了檔案傳輸" - -#: ../libempathy/empathy-tp-file.c:389 -msgid "Error while trying to transfer the file" -msgstr "嘗試傳輸檔案時發生錯誤" - -#: ../libempathy/empathy-tp-file.c:392 -msgid "The other participant is unable to transfer the file" -msgstr "其他的參與者無法傳輸該檔案" - -#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312 -msgid "Unknown reason" -msgstr "不明原因" - -#: ../libempathy/empathy-utils.c:232 +#: ../libempathy/empathy-utils.c:233 msgid "Available" msgstr "有空" -#: ../libempathy/empathy-utils.c:234 +#: ../libempathy/empathy-utils.c:235 msgid "Busy" msgstr "忙碌" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:238 msgid "Away" msgstr "離開" -#: ../libempathy/empathy-utils.c:239 +#: ../libempathy/empathy-utils.c:240 msgid "Invisible" msgstr "隱藏" -#: ../libempathy/empathy-utils.c:241 +#: ../libempathy/empathy-utils.c:242 msgid "Offline" msgstr "離線" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:245 msgctxt "presence" msgid "Unknown" msgstr "未知" -#: ../libempathy/empathy-utils.c:284 +#: ../libempathy/empathy-utils.c:285 msgid "No reason specified" msgstr "沒有指定原因" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343 msgid "Status is set to offline" msgstr "狀態設為離線" -#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 #: ../libempathy-gtk/empathy-call-utils.c:49 -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "網路錯誤" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325 msgid "Authentication failed" msgstr "驗證失敗" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327 msgid "Encryption error" msgstr "加密發生錯誤" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:295 msgid "Name in use" msgstr "使用中的名稱" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329 msgid "Certificate not provided" msgstr "沒有提供憑證" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331 msgid "Certificate untrusted" msgstr "憑證不被信任" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333 msgid "Certificate expired" msgstr "憑證已逾期" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335 msgid "Certificate not activated" msgstr "憑證尚未使用" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337 msgid "Certificate hostname mismatch" msgstr "憑證主機名稱不符" -#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339 msgid "Certificate fingerprint mismatch" msgstr "憑證指紋檔不符" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341 msgid "Certificate self-signed" msgstr "憑證為自我簽署" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate error" msgstr "憑證錯誤" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:345 msgid "Encryption is not available" msgstr "加密無法使用" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:347 msgid "Certificate is invalid" msgstr "憑證無效" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:349 msgid "Connection has been refused" msgstr "連線遭拒" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:351 msgid "Connection can't be established" msgstr "無法建立連線" -#: ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:353 msgid "Connection has been lost" msgstr "已失去連線" -#: ../libempathy/empathy-utils.c:354 +#: ../libempathy/empathy-utils.c:355 msgid "This resource is already connected to the server" msgstr "此資源已連接至該伺服器" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:357 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "連線已被使用相同資源的新連線取代" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:360 msgid "The account already exists on the server" msgstr "該帳號已經存在於伺服器上" -#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:362 msgid "Server is currently too busy to handle the connection" msgstr "伺服器目前過於忙碌以致於無法處理該連線" -#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:364 msgid "Certificate has been revoked" msgstr "已撤銷憑證" -#: ../libempathy/empathy-utils.c:365 +#: ../libempathy/empathy-utils.c:366 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "憑證使用不安全的密碼演算法，或是密碼處理上較弱" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:369 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" msgstr "伺服器憑證的長度，或是伺服器憑證鏈的深度超過密碼函式庫所能處理的範圍" -#: ../libempathy/empathy-utils.c:372 +#: ../libempathy/empathy-utils.c:373 msgid "Your software is too old" msgstr "您的軟體過舊" -#: ../libempathy/empathy-utils.c:531 +#: ../libempathy/empathy-utils.c:375 +msgid "Internal error" +msgstr "內部錯誤" + +#: ../libempathy/empathy-utils.c:534 msgid "People Nearby" msgstr "附近的人" -#: ../libempathy/empathy-utils.c:536 +#: ../libempathy/empathy-utils.c:539 msgid "Yahoo! Japan" msgstr "Yahoo! 日本" -#: ../libempathy/empathy-utils.c:565 +#: ../libempathy/empathy-utils.c:568 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:566 +#: ../libempathy/empathy-utils.c:569 msgid "Facebook Chat" msgstr "Facebook 聊天" -#: ../libempathy/empathy-time.c:88 +#: ../libempathy/empathy-time.c:90 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "%d 秒前" -#: ../libempathy/empathy-time.c:93 +#: ../libempathy/empathy-time.c:96 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "%d 分鐘以前" -#: ../libempathy/empathy-time.c:98 +#: ../libempathy/empathy-time.c:102 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "%d 小時以前" -#: ../libempathy/empathy-time.c:103 +#: ../libempathy/empathy-time.c:108 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 天以前" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:114 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d 週前" -#: ../libempathy/empathy-time.c:113 +#: ../libempathy/empathy-time.c:120 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d 個月以前" -#: ../libempathy/empathy-time.c:136 +#: ../libempathy/empathy-time.c:142 msgid "in the future" msgstr "未來" -#: ../libempathy-gtk/empathy-account-chooser.c:688 +#: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "所有帳號" -#: ../libempathy-gtk/empathy-account-widget.c:694 -#: ../src/empathy-import-widget.c:321 +#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../src/empathy-import-widget.c:335 msgid "Account" msgstr "帳號" -#: ../libempathy-gtk/empathy-account-widget.c:695 +#: ../libempathy-gtk/empathy-account-widget.c:683 msgid "Password" msgstr "密碼" -#: ../libempathy-gtk/empathy-account-widget.c:696 +#: ../libempathy-gtk/empathy-account-widget.c:684 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "伺服器" -#: ../libempathy-gtk/empathy-account-widget.c:697 +#: ../libempathy-gtk/empathy-account-widget.c:685 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "連接埠" -#: ../libempathy-gtk/empathy-account-widget.c:776 -#: ../libempathy-gtk/empathy-account-widget.c:828 +#: ../libempathy-gtk/empathy-account-widget.c:763 +#: ../libempathy-gtk/empathy-account-widget.c:815 #, c-format msgid "%s:" msgstr "%s：" -#: ../libempathy-gtk/empathy-account-widget.c:1182 -msgid "My Web Accounts" -msgstr "我的網路帳號" - -#: ../libempathy-gtk/empathy-account-widget.c:1199 -#, c-format -msgid "The account %s is edited via %s." -msgstr "%s 帳號已透過 %s 修改。" - -#: ../libempathy-gtk/empathy-account-widget.c:1205 -#, c-format -msgid "The account %s cannot be edited in Empathy." -msgstr "%s 帳號無法於 Empathy 內修改。" - -#: ../libempathy-gtk/empathy-account-widget.c:1224 -msgid "Launch My Web Accounts" -msgstr "啟動我的網路帳號" - -#. general handler -#: ../libempathy-gtk/empathy-account-widget.c:1232 -#, c-format -msgid "Edit %s" -msgstr "編輯 %s" - -#: ../libempathy-gtk/empathy-account-widget.c:1582 +#: ../libempathy-gtk/empathy-account-widget.c:1396 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "使用者名稱：" -#: ../libempathy-gtk/empathy-account-widget.c:1900 +#: ../libempathy-gtk/empathy-account-widget.c:1708 msgid "A_pply" msgstr "套用(_A)" -#: ../libempathy-gtk/empathy-account-widget.c:1930 +#: ../libempathy-gtk/empathy-account-widget.c:1737 msgid "L_og in" msgstr "登入(_O)" -#: ../libempathy-gtk/empathy-account-widget.c:2004 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "此帳號已經存在這個伺服器上" -#: ../libempathy-gtk/empathy-account-widget.c:2007 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "在這個伺服器上建立新的帳號" -#: ../libempathy-gtk/empathy-account-widget.c:2199 -msgid "Ca_ncel" -msgstr "取消(_N)" - #. To translators: The first parameter is the login id and the #. * second one is the network. The resulting string will be something #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2477 +#: ../libempathy-gtk/empathy-account-widget.c:2239 #, c-format msgid "%1$s on %2$s" msgstr "%2$s 上的 %1$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2503 +#: ../libempathy-gtk/empathy-account-widget.c:2265 #, c-format msgid "%s Account" msgstr "%s 帳號" -#: ../libempathy-gtk/empathy-account-widget.c:2507 +#: ../libempathy-gtk/empathy-account-widget.c:2269 msgid "New account" msgstr "新增帳號" @@ -880,7 +844,7 @@ msgstr "記住密碼" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 -#: ../libempathy-gtk/empathy-password-dialog.c:311 +#: ../libempathy-gtk/empathy-base-password-dialog.c:261 msgid "Remember password" msgstr "記住密碼" @@ -1203,7 +1167,7 @@ msgid "STUN Server:" msgstr "STUN 伺服器：" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:114 msgid "Server:" msgstr "伺服器：" @@ -1309,62 +1273,62 @@ msgstr "此協定不支援緊急通話功能" msgid "You don't have enough credit in order to place this call" msgstr "您的存額不足以買下該通話。" -#: ../libempathy-gtk/empathy-chat.c:706 +#: ../libempathy-gtk/empathy-chat.c:710 msgid "Failed to open private chat" msgstr "開啟私人聊天失敗" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:768 msgid "Topic not supported on this conversation" msgstr "此談話的主題不被支援" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:774 msgid "You are not allowed to change the topic" msgstr "您不被允許變更這個主題" -#: ../libempathy-gtk/empathy-chat.c:971 +#: ../libempathy-gtk/empathy-chat.c:973 #, c-format msgid "“%s” is not a valid contact ID" msgstr "「%s」不是有效的連絡人 ID" -#: ../libempathy-gtk/empathy-chat.c:1066 +#: ../libempathy-gtk/empathy-chat.c:1068 msgid "/clear: clear all messages from the current conversation" msgstr "/clear：清除目前談話的所有訊息" -#: ../libempathy-gtk/empathy-chat.c:1069 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/topic : set the topic of the current conversation" msgstr "/topic <主題>：設置目前談話的主題" -#: ../libempathy-gtk/empathy-chat.c:1072 +#: ../libempathy-gtk/empathy-chat.c:1074 msgid "/join : join a new chat room" msgstr "/join <聊天室 ID>：參加新的聊天室" -#: ../libempathy-gtk/empathy-chat.c:1075 +#: ../libempathy-gtk/empathy-chat.c:1077 msgid "/j : join a new chat room" msgstr "/j <聊天室 ID>：參加新的聊天室" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "" "/part [] []: leave the chat room, by default the " "current one" msgstr "/part [<聊天室 ID>] [<原因>]：離開聊天室，預設為目前的聊天室" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/query []: open a private chat" msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人聊天" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/msg : open a private chat" msgstr "/msg <聯絡人 ID> <訊息>：開啟私人聊天" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/nick : change your nickname on the current server" msgstr "/nick <暱稱>：變更在目前伺服器上的您的暱稱" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/me : send an ACTION message to the current conversation" msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1097 msgid "" "/say : send to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1373,11 +1337,11 @@ msgstr "" "/say <訊息>：送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來" "說：「/say /join 是用來參加新的聊天室」" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "/whois : display information about a contact" msgstr "/whois <聯絡人 ID>：顯示聯絡人的相關資訊" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1105 msgid "" "/help []: show all supported commands. If is defined, " "show its usage." @@ -1385,120 +1349,127 @@ msgstr "" "/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用" "法。" -#: ../libempathy-gtk/empathy-chat.c:1122 +#: ../libempathy-gtk/empathy-chat.c:1124 #, c-format msgid "Usage: %s" msgstr "用法：%s" -#: ../libempathy-gtk/empathy-chat.c:1167 +#: ../libempathy-gtk/empathy-chat.c:1169 msgid "Unknown command" msgstr "未知的命令" -#: ../libempathy-gtk/empathy-chat.c:1293 +#: ../libempathy-gtk/empathy-chat.c:1295 msgid "Unknown command; see /help for the available commands" msgstr "未知的指令；請參見 /help 以取得可用的指令" -#: ../libempathy-gtk/empathy-chat.c:1457 +#: ../libempathy-gtk/empathy-chat.c:1541 msgid "insufficient balance to send message" msgstr "餘額不足以傳送訊息" -#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475 -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559 +#: ../libempathy-gtk/empathy-chat.c:1622 #, c-format msgid "Error sending message '%s': %s" msgstr "傳送訊息「%s」時發生錯誤：%s" -#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480 -#: ../libempathy-gtk/empathy-chat.c:1542 +#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564 +#: ../libempathy-gtk/empathy-chat.c:1626 #, c-format msgid "Error sending message: %s" msgstr "傳送訊息時發生錯誤：%s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1469 +#: ../libempathy-gtk/empathy-chat.c:1553 #, c-format msgid "insufficient balance to send message. Top up." msgstr "餘額不足以傳送訊息。加值。" -#: ../libempathy-gtk/empathy-chat.c:1509 +#: ../libempathy-gtk/empathy-chat.c:1593 msgid "not capable" msgstr "無法" -#: ../libempathy-gtk/empathy-chat.c:1516 +#: ../libempathy-gtk/empathy-chat.c:1600 msgid "offline" msgstr "離線" -#: ../libempathy-gtk/empathy-chat.c:1519 +#: ../libempathy-gtk/empathy-chat.c:1603 msgid "invalid contact" msgstr "無效的連絡人" -#: ../libempathy-gtk/empathy-chat.c:1522 +#: ../libempathy-gtk/empathy-chat.c:1606 msgid "permission denied" msgstr "權限被拒絕" -#: ../libempathy-gtk/empathy-chat.c:1525 +#: ../libempathy-gtk/empathy-chat.c:1609 msgid "too long message" msgstr "太長的訊息" -#: ../libempathy-gtk/empathy-chat.c:1528 +#: ../libempathy-gtk/empathy-chat.c:1612 msgid "not implemented" msgstr "未實作" -#: ../libempathy-gtk/empathy-chat.c:1532 +#: ../libempathy-gtk/empathy-chat.c:1616 msgid "unknown" msgstr "不明" -#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761 +#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916 msgid "Topic:" msgstr "主題：" -#: ../libempathy-gtk/empathy-chat.c:1611 +#: ../libempathy-gtk/empathy-chat.c:1698 #, c-format msgid "Topic set to: %s" msgstr "主題設定為: %s" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1700 +#, fuzzy, c-format +#| msgid "Topic set to: %s" +msgid "Topic set by %s to: %s" +msgstr "主題設定為: %s" + +#. No need to display this 'event' is no topic can be defined anyway +#: ../libempathy-gtk/empathy-chat.c:1705 msgid "No topic defined" msgstr "尚未定義主題" -#: ../libempathy-gtk/empathy-chat.c:2126 +#: ../libempathy-gtk/empathy-chat.c:2221 msgid "(No Suggestions)" msgstr "(沒有建議)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2194 +#: ../libempathy-gtk/empathy-chat.c:2289 #, c-format msgid "Add '%s' to Dictionary" msgstr "加入「%s」至字典" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2326 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "加入「%s」至 %s 字典" -#: ../libempathy-gtk/empathy-chat.c:2301 +#: ../libempathy-gtk/empathy-chat.c:2396 msgid "Insert Smiley" msgstr "插入表情符號" #. send button -#: ../libempathy-gtk/empathy-chat.c:2319 +#: ../libempathy-gtk/empathy-chat.c:2414 #: ../libempathy-gtk/empathy-ui-utils.c:1867 msgid "_Send" msgstr "傳送(_S)" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2376 +#: ../libempathy-gtk/empathy-chat.c:2471 msgid "_Spelling Suggestions" msgstr "拼字建議(_S)" -#: ../libempathy-gtk/empathy-chat.c:2465 +#: ../libempathy-gtk/empathy-chat.c:2560 msgid "Failed to retrieve recent logs" msgstr "無法取得最近的日誌" -#: ../libempathy-gtk/empathy-chat.c:2602 +#: ../libempathy-gtk/empathy-chat.c:2699 #, c-format msgid "%s has disconnected" msgstr "%s 已斷線" @@ -1506,12 +1477,12 @@ msgstr "%s 已斷線" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2609 +#: ../libempathy-gtk/empathy-chat.c:2706 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s 被 %2$s 踢出去" -#: ../libempathy-gtk/empathy-chat.c:2612 +#: ../libempathy-gtk/empathy-chat.c:2709 #, c-format msgid "%s was kicked" msgstr "%s 被踢出" @@ -1519,17 +1490,17 @@ msgstr "%s 被踢出" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2620 +#: ../libempathy-gtk/empathy-chat.c:2717 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s 被 %2$s 設為黑名單" -#: ../libempathy-gtk/empathy-chat.c:2623 +#: ../libempathy-gtk/empathy-chat.c:2720 #, c-format msgid "%s was banned" msgstr "%s 被設為黑名單" -#: ../libempathy-gtk/empathy-chat.c:2627 +#: ../libempathy-gtk/empathy-chat.c:2724 #, c-format msgid "%s has left the room" msgstr "%s 已經離開此聊天室" @@ -1539,17 +1510,17 @@ msgstr "%s 已經離開此聊天室" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2636 +#: ../libempathy-gtk/empathy-chat.c:2733 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2661 +#: ../libempathy-gtk/empathy-chat.c:2758 #, c-format msgid "%s has joined the room" msgstr "%s 已經參加此聊天室" -#: ../libempathy-gtk/empathy-chat.c:2686 +#: ../libempathy-gtk/empathy-chat.c:2783 #, c-format msgid "%s is now known as %s" msgstr "%s 現在被稱為 %s" @@ -1557,79 +1528,80 @@ msgstr "%s 現在被稱為 %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2839 -#: ../src/empathy-streamed-media-window.c:1886 -#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1539 -#: ../src/empathy-call-window.c:1589 ../src/empathy-call-window.c:2635 +#: ../libempathy-gtk/empathy-chat.c:2970 +#: ../src/empathy-streamed-media-window.c:1889 +#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 +#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 msgid "Disconnected" msgstr "已斷線" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3485 +#: ../libempathy-gtk/empathy-chat.c:3634 msgid "Would you like to store this password?" msgstr "您想要儲存此密碼？" -#: ../libempathy-gtk/empathy-chat.c:3491 +#: ../libempathy-gtk/empathy-chat.c:3640 msgid "Remember" msgstr "記住" -#: ../libempathy-gtk/empathy-chat.c:3501 +#: ../libempathy-gtk/empathy-chat.c:3650 msgid "Not now" msgstr "現在不要" -#: ../libempathy-gtk/empathy-chat.c:3545 +#: ../libempathy-gtk/empathy-chat.c:3694 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "重試" -#: ../libempathy-gtk/empathy-chat.c:3549 +#: ../libempathy-gtk/empathy-chat.c:3698 msgid "Wrong password; please try again:" msgstr "密碼錯誤；請再試一次：" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3679 +#: ../libempathy-gtk/empathy-chat.c:3828 msgid "This room is protected by a password:" msgstr "此聊天室已被密碼保護：" -#: ../libempathy-gtk/empathy-chat.c:3706 +#: ../libempathy-gtk/empathy-chat.c:3855 msgid "Join" msgstr "參加" -#: ../libempathy-gtk/empathy-chat.c:3894 ../src/empathy-event-manager.c:1281 +#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301 msgid "Connected" msgstr "成功連線" -#: ../libempathy-gtk/empathy-chat.c:3949 +#: ../libempathy-gtk/empathy-chat.c:4102 msgid "Conversation" msgstr "談話" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:3954 +#: ../libempathy-gtk/empathy-chat.c:4107 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Unknown or invalid identifier" msgstr "未知或無效的識別身分" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking temporarily unavailable" msgstr "聯絡人封鎖暫時無法使用" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Contact blocking unavailable" msgstr "聯絡人封鎖無法使用" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 msgid "Permission Denied" msgstr "已拒絕授權" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 msgid "Could not block contact" msgstr "無法封鎖聯絡人" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 msgid "Edit Blocked Contacts" msgstr "編輯封鎖的聯絡人" @@ -1637,7 +1609,7 @@ msgstr "編輯封鎖的聯絡人" #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1441 +#: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" @@ -1672,150 +1644,45 @@ msgstr "開啟連結(_O)" msgid "%A %B %d %Y" msgstr "%Y %B %d %A" -#: ../libempathy-gtk/empathy-contact-dialogs.c:287 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 -msgid "Edit Contact Information" -msgstr "編輯連絡人資訊" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:338 -msgid "Personal Information" -msgstr "個人資訊" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:439 -#: ../libempathy-gtk/empathy-individual-dialogs.c:119 +#: ../libempathy-gtk/empathy-contact-dialogs.c:326 +#: ../libempathy-gtk/empathy-individual-dialogs.c:118 msgid "New Contact" msgstr "新增連絡人" -#: ../libempathy-gtk/empathy-contact-dialogs.c:508 -#: ../libempathy-gtk/empathy-individual-dialogs.c:198 +#: ../libempathy-gtk/empathy-contact-dialogs.c:395 +#: ../libempathy-gtk/empathy-individual-dialogs.c:197 #, c-format msgid "Block %s?" msgstr "封鎖 %s？" -#: ../libempathy-gtk/empathy-contact-dialogs.c:513 -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 -#, c-format -msgid "Are you sure you want to block '%s' from contacting you again?" -msgstr "您確定想要封鎖「%s」讓他無法再與您聯絡嗎？" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:518 -#: ../libempathy-gtk/empathy-individual-dialogs.c:275 -msgid "_Block" -msgstr "封鎖(_B)" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:536 -#: ../libempathy-gtk/empathy-individual-dialogs.c:284 -msgid "_Report this contact as abusive" -msgid_plural "_Report these contacts as abusive" -msgstr[0] "回報這些聯絡人濫用帳號(_R)" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 -msgid "Decide _Later" -msgstr "稍後再決定(_L)" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 -msgid "Subscription Request" -msgstr "訂閱要求" - -#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 -msgid "_Block User" -msgstr "封鎖使用者(_B)" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1935 -#: ../libempathy-gtk/empathy-individual-view.c:2375 -#, c-format -msgid "Do you really want to remove the group '%s'?" -msgstr "是否想要移除群組「%s」？" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1937 -#: ../libempathy-gtk/empathy-individual-view.c:2378 -msgid "Removing group" -msgstr "正在移除群組" - -#. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1986 -#: ../libempathy-gtk/empathy-contact-list-view.c:2059 -#: ../libempathy-gtk/empathy-individual-view.c:2433 -#: ../libempathy-gtk/empathy-individual-view.c:2636 -msgid "_Remove" -msgstr "移除(_R)" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2015 -#: ../libempathy-gtk/empathy-individual-view.c:2500 -#, c-format -msgid "Do you really want to remove the contact '%s'?" -msgstr "是否想要移除連絡人「%s」？" - -#: ../libempathy-gtk/empathy-contact-list-view.c:2017 -#: ../libempathy-gtk/empathy-individual-view.c:2521 -msgid "Removing contact" -msgstr "正在移除連絡人" - -#: ../libempathy-gtk/empathy-contact-menu.c:212 -#: ../src/empathy-main-window-menubar.ui.h:14 -msgid "_Add Contact…" -msgstr "加入聯絡人(_A)…" - -#: ../libempathy-gtk/empathy-contact-menu.c:287 -msgid "_Block Contact" -msgstr "封鎖聯絡人(_B)" - -#. add chat button -#: ../libempathy-gtk/empathy-contact-menu.c:316 -#: ../libempathy-gtk/empathy-individual-menu.c:758 -#: ../libempathy-gtk/empathy-new-message-dialog.c:320 -#: ../src/empathy-main-window-menubar.ui.h:16 -msgid "_Chat" -msgstr "聊天(_C)" - -#: ../libempathy-gtk/empathy-contact-menu.c:348 -#: ../libempathy-gtk/empathy-individual-menu.c:850 -msgctxt "menu item" -msgid "_Audio Call" -msgstr "語音通話(_A)" - -#: ../libempathy-gtk/empathy-contact-menu.c:381 -#: ../libempathy-gtk/empathy-individual-menu.c:895 -msgctxt "menu item" -msgid "_Video Call" -msgstr "視訊通話(_V)" - -#: ../libempathy-gtk/empathy-contact-menu.c:427 -#: ../libempathy-gtk/empathy-individual-menu.c:948 -#: ../src/empathy-main-window-menubar.ui.h:27 -msgid "_Previous Conversations" -msgstr "過往談話(_P)" - -#: ../libempathy-gtk/empathy-contact-menu.c:449 -#: ../libempathy-gtk/empathy-individual-menu.c:989 -msgid "Send File" -msgstr "傳送檔案" +#: ../libempathy-gtk/empathy-contact-dialogs.c:400 +#: ../libempathy-gtk/empathy-individual-dialogs.c:252 +#, c-format +msgid "Are you sure you want to block '%s' from contacting you again?" +msgstr "您確定想要封鎖「%s」讓他無法再與您聯絡嗎？" -#: ../libempathy-gtk/empathy-contact-menu.c:472 -#: ../libempathy-gtk/empathy-individual-menu.c:1031 -msgid "Share My Desktop" -msgstr "分享我的桌面" +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 +#: ../libempathy-gtk/empathy-individual-dialogs.c:274 +msgid "_Block" +msgstr "封鎖(_B)" -#: ../libempathy-gtk/empathy-contact-menu.c:501 -#: ../libempathy-gtk/empathy-individual-menu.c:1094 -msgid "Infor_mation" -msgstr "資訊(_M)" +#: ../libempathy-gtk/empathy-contact-dialogs.c:423 +#: ../libempathy-gtk/empathy-individual-dialogs.c:283 +msgid "_Report this contact as abusive" +msgid_plural "_Report these contacts as abusive" +msgstr[0] "回報這些聯絡人濫用帳號(_R)" -#: ../libempathy-gtk/empathy-contact-menu.c:547 -msgctxt "Edit contact (contextual menu)" -msgid "_Edit" -msgstr "編輯(_E)" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 +msgid "Decide _Later" +msgstr "稍後再決定(_L)" -#: ../libempathy-gtk/empathy-contact-menu.c:601 -#: ../libempathy-gtk/empathy-individual-menu.c:1285 -#: ../src/empathy-chat-window.c:1011 -msgid "Inviting you to this room" -msgstr "邀請您到這個聊天室" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 +msgid "Subscription Request" +msgstr "訂閱要求" -#: ../libempathy-gtk/empathy-contact-menu.c:632 -#: ../libempathy-gtk/empathy-individual-menu.c:1331 -msgid "_Invite to Chat Room" -msgstr "邀請到聊天室(_I)" +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3 +msgid "_Block User" +msgstr "封鎖使用者(_B)" #. Title #: ../libempathy-gtk/empathy-contact-search-dialog.c:499 @@ -1842,228 +1709,223 @@ msgstr "您的訊息" msgid "Please let me see when you're online. Thanks!" msgstr "當您上線時請讓我知道。感謝！" -#: ../libempathy-gtk/empathy-contact-widget.c:504 +#: ../libempathy-gtk/empathy-contact-widget.c:568 +#: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "頻道：" -#: ../libempathy-gtk/empathy-contact-widget.c:799 -#: ../libempathy-gtk/empathy-individual-widget.c:421 +#: ../libempathy-gtk/empathy-contact-widget.c:748 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "國家 ISO 碼：" -#: ../libempathy-gtk/empathy-contact-widget.c:801 -#: ../libempathy-gtk/empathy-individual-widget.c:423 +#: ../libempathy-gtk/empathy-contact-widget.c:750 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "國家：" -#: ../libempathy-gtk/empathy-contact-widget.c:803 -#: ../libempathy-gtk/empathy-individual-widget.c:425 +#: ../libempathy-gtk/empathy-contact-widget.c:752 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "州：" -#: ../libempathy-gtk/empathy-contact-widget.c:805 -#: ../libempathy-gtk/empathy-individual-widget.c:427 +#: ../libempathy-gtk/empathy-contact-widget.c:754 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "市：" -#: ../libempathy-gtk/empathy-contact-widget.c:807 -#: ../libempathy-gtk/empathy-individual-widget.c:429 +#: ../libempathy-gtk/empathy-contact-widget.c:756 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "區域：" -#: ../libempathy-gtk/empathy-contact-widget.c:809 -#: ../libempathy-gtk/empathy-individual-widget.c:431 +#: ../libempathy-gtk/empathy-contact-widget.c:758 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "郵遞區號：" -#: ../libempathy-gtk/empathy-contact-widget.c:811 -#: ../libempathy-gtk/empathy-individual-widget.c:433 +#: ../libempathy-gtk/empathy-contact-widget.c:760 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "街：" -#: ../libempathy-gtk/empathy-contact-widget.c:813 -#: ../libempathy-gtk/empathy-individual-widget.c:435 +#: ../libempathy-gtk/empathy-contact-widget.c:762 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "建築：" -#: ../libempathy-gtk/empathy-contact-widget.c:815 -#: ../libempathy-gtk/empathy-individual-widget.c:437 +#: ../libempathy-gtk/empathy-contact-widget.c:764 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "樓層：" -#: ../libempathy-gtk/empathy-contact-widget.c:817 -#: ../libempathy-gtk/empathy-individual-widget.c:439 +#: ../libempathy-gtk/empathy-contact-widget.c:766 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "室：" -#: ../libempathy-gtk/empathy-contact-widget.c:819 -#: ../libempathy-gtk/empathy-individual-widget.c:441 +#: ../libempathy-gtk/empathy-contact-widget.c:768 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "文字：" -#: ../libempathy-gtk/empathy-contact-widget.c:821 -#: ../libempathy-gtk/empathy-individual-widget.c:443 +#: ../libempathy-gtk/empathy-contact-widget.c:770 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "描述：" -#: ../libempathy-gtk/empathy-contact-widget.c:823 -#: ../libempathy-gtk/empathy-individual-widget.c:445 +#: ../libempathy-gtk/empathy-contact-widget.c:772 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI：" -#: ../libempathy-gtk/empathy-contact-widget.c:825 -#: ../libempathy-gtk/empathy-individual-widget.c:447 +#: ../libempathy-gtk/empathy-contact-widget.c:774 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "準確度等級：" -#: ../libempathy-gtk/empathy-contact-widget.c:827 -#: ../libempathy-gtk/empathy-individual-widget.c:449 +#: ../libempathy-gtk/empathy-contact-widget.c:776 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "錯誤：" -#: ../libempathy-gtk/empathy-contact-widget.c:829 -#: ../libempathy-gtk/empathy-individual-widget.c:451 +#: ../libempathy-gtk/empathy-contact-widget.c:778 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "垂直誤差 (公尺)：" -#: ../libempathy-gtk/empathy-contact-widget.c:831 -#: ../libempathy-gtk/empathy-individual-widget.c:453 +#: ../libempathy-gtk/empathy-contact-widget.c:780 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "水平誤差 (公尺)：" -#: ../libempathy-gtk/empathy-contact-widget.c:833 -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-contact-widget.c:782 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "速度：" -#: ../libempathy-gtk/empathy-contact-widget.c:835 -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-contact-widget.c:784 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "方位：" -#: ../libempathy-gtk/empathy-contact-widget.c:837 -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-contact-widget.c:786 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "爬升速度：" -#: ../libempathy-gtk/empathy-contact-widget.c:839 -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-contact-widget.c:788 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "上次更新於：" -#: ../libempathy-gtk/empathy-contact-widget.c:841 -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-contact-widget.c:790 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "經度：" -#: ../libempathy-gtk/empathy-contact-widget.c:843 -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-contact-widget.c:792 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "緯度：" -#: ../libempathy-gtk/empathy-contact-widget.c:845 -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-contact-widget.c:794 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "緯度：" -#: ../libempathy-gtk/empathy-contact-widget.c:898 -#: ../libempathy-gtk/empathy-contact-widget.c:913 -#: ../libempathy-gtk/empathy-individual-widget.c:559 -#: ../libempathy-gtk/empathy-individual-widget.c:574 -#: ../src/empathy-preferences.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.c:847 +#: ../libempathy-gtk/empathy-contact-widget.c:862 +#: ../libempathy-gtk/empathy-individual-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../src/empathy-preferences.ui.h:15 msgid "Location" msgstr "位置" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:915 -#: ../libempathy-gtk/empathy-individual-widget.c:576 +#: ../libempathy-gtk/empathy-contact-widget.c:864 +#: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s，%s" -#: ../libempathy-gtk/empathy-contact-widget.c:967 -#: ../libempathy-gtk/empathy-individual-widget.c:625 +#: ../libempathy-gtk/empathy-contact-widget.c:916 +#: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%Y %B %e 於 %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:1049 -#: ../libempathy-gtk/empathy-individual-widget.c:867 +#: ../libempathy-gtk/empathy-contact-widget.c:998 +#: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "儲存大頭貼" -#: ../libempathy-gtk/empathy-contact-widget.c:1105 -#: ../libempathy-gtk/empathy-individual-widget.c:925 +#: ../libempathy-gtk/empathy-contact-widget.c:1054 +#: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "無法儲存大頭貼" -#: ../libempathy-gtk/empathy-contact-widget.c:1793 -#: ../libempathy-gtk/empathy-individual-menu.c:1066 -#: ../libempathy-gtk/empathy-individual-widget.c:1324 -msgid "Favorite" -msgstr "喜好" - -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 msgid "Full name" msgstr "全名" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 msgid "Phone number" msgstr "電話號碼" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 msgid "E-mail address" msgstr "電子信箱位址" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Website" msgstr "網站" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Birthday" msgstr "生日" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Last seen:" msgstr "上次看見：" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:115 msgid "Connected from:" msgstr "已連接從：" #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:119 msgid "Away message:" msgstr "離開訊息：" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "work" msgstr "工作" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 msgid "home" msgstr "住家" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 msgid "mobile" msgstr "行動" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 msgid "voice" msgstr "聲音" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 msgid "preferred" msgstr "偏好" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:137 msgid "postal" msgstr "郵遞" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:138 msgid "parcel" msgstr "包裹" @@ -2073,7 +1935,7 @@ msgstr "位置 於 (date)\t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1260 +#: ../libempathy-gtk/empathy-individual-widget.c:1293 msgid "Alias:" msgstr "別名：" @@ -2093,7 +1955,7 @@ msgstr "連絡人詳細資料" #. Identifier to connect to Instant Messaging network #. Translators: Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#: ../libempathy-gtk/empathy-individual-widget.c:1469 +#: ../libempathy-gtk/empathy-individual-widget.c:1502 msgid "Identifier:" msgstr "識別身分：" @@ -2110,114 +1972,195 @@ msgstr "OS：" msgid "Version:" msgstr "版本：" -#: ../libempathy-gtk/empathy-groups-widget.c:333 +#: ../libempathy-gtk/empathy-groups-widget.c:331 msgid "Groups" msgstr "群組" -#: ../libempathy-gtk/empathy-groups-widget.c:345 +#: ../libempathy-gtk/empathy-groups-widget.c:343 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." msgstr "" "請選擇這個連絡人要顯現在哪個群組。注意您可以選擇一個以上的群組或不選擇群組。" -#: ../libempathy-gtk/empathy-groups-widget.c:364 +#: ../libempathy-gtk/empathy-groups-widget.c:362 msgid "_Add Group" msgstr "加入群組(_G)" -#: ../libempathy-gtk/empathy-groups-widget.c:399 +#: ../libempathy-gtk/empathy-groups-widget.c:397 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "選取" -#: ../libempathy-gtk/empathy-groups-widget.c:409 -#: ../src/empathy-main-window.c:1953 +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-roster-window.c:1951 msgid "Group" msgstr "群組" -#: ../libempathy-gtk/empathy-individual-dialogs.c:258 +#: ../libempathy-gtk/empathy-individual-dialogs.c:257 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "下列識別身分將被封鎖：" -#: ../libempathy-gtk/empathy-individual-dialogs.c:265 +#: ../libempathy-gtk/empathy-individual-dialogs.c:264 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "下列識別身分無法被封鎖：" +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +msgid "Edit Contact Information" +msgstr "編輯連絡人資訊" + #. Translators: the heading at the top of the Information dialogue #: ../libempathy-gtk/empathy-individual-information-dialog.c:288 msgid "Linked Contacts" msgstr "連結聯絡群" -#: ../libempathy-gtk/empathy-individual-linker.c:370 +#: ../libempathy-gtk/empathy-individual-linker.c:372 msgid "Select contacts to link" msgstr "選取要連結的連絡人" -#: ../libempathy-gtk/empathy-individual-linker.c:444 +#: ../libempathy-gtk/empathy-individual-linker.c:447 msgid "New contact preview" msgstr "新增連絡人預覽" -#: ../libempathy-gtk/empathy-individual-linker.c:488 +#: ../libempathy-gtk/empathy-individual-linker.c:491 msgid "Contacts selected in the list on the left will be linked together." msgstr "在清單左方的所選聯絡人將連結在一起。" #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:145 +#: ../libempathy-gtk/empathy-individual-menu.c:181 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:309 +#: ../libempathy-gtk/empathy-individual-menu.c:363 msgid "Select account to use to place the call" msgstr "選取要用來放置通話的帳號" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:313 +#: ../libempathy-gtk/empathy-individual-menu.c:367 #: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1285 +#: ../src/empathy-streamed-media-window.c:1288 #: ../src/empathy-call-window.ui.h:2 msgid "Call" msgstr "通話" -#: ../libempathy-gtk/empathy-individual-menu.c:378 +#: ../libempathy-gtk/empathy-individual-menu.c:432 msgid "Mobile" msgstr "行動電話" -#: ../libempathy-gtk/empathy-individual-menu.c:380 +#: ../libempathy-gtk/empathy-individual-menu.c:434 msgid "Work" msgstr "工作" -#: ../libempathy-gtk/empathy-individual-menu.c:382 +#: ../libempathy-gtk/empathy-individual-menu.c:436 msgid "HOME" msgstr "住家" +#: ../libempathy-gtk/empathy-individual-menu.c:677 +msgid "_Block Contact" +msgstr "封鎖聯絡人(_B)" + +#. add chat button +#: ../libempathy-gtk/empathy-individual-menu.c:1055 +#: ../libempathy-gtk/empathy-new-message-dialog.c:319 +#: ../src/empathy-roster-window-menubar.ui.h:16 +msgid "_Chat" +msgstr "聊天(_C)" + #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:805 -#: ../libempathy-gtk/empathy-new-message-dialog.c:314 +#: ../libempathy-gtk/empathy-individual-menu.c:1090 +#: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1143 +#: ../libempathy-gtk/empathy-individual-menu.c:1123 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "語音通話(_A)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1156 +msgctxt "menu item" +msgid "_Video Call" +msgstr "視訊通話(_V)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1197 +#: ../src/empathy-roster-window-menubar.ui.h:26 +msgid "_Previous Conversations" +msgstr "過往談話(_P)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1226 +msgid "Send File" +msgstr "傳送檔案" + +#: ../libempathy-gtk/empathy-individual-menu.c:1256 +msgid "Share My Desktop" +msgstr "分享我的桌面" + +#: ../libempathy-gtk/empathy-individual-menu.c:1282 +#: ../libempathy-gtk/empathy-individual-widget.c:1357 +msgid "Favorite" +msgstr "喜好" + +#: ../libempathy-gtk/empathy-individual-menu.c:1310 +msgid "Infor_mation" +msgstr "資訊(_M)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1359 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "編輯(_E)" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:1169 +#: ../libempathy-gtk/empathy-individual-menu.c:1385 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "連結聯絡人(_L)…" -#: ../libempathy-gtk/empathy-individual-view.c:2340 +#: ../libempathy-gtk/empathy-individual-menu.c:1501 +#: ../src/empathy-chat-window.c:1166 +msgid "Inviting you to this room" +msgstr "邀請您到這個聊天室" + +#: ../libempathy-gtk/empathy-individual-menu.c:1547 +msgid "_Invite to Chat Room" +msgstr "邀請到聊天室(_I)" + +#: ../libempathy-gtk/empathy-individual-menu.c:1743 +#: ../src/empathy-roster-window-menubar.ui.h:14 +msgid "_Add Contact…" +msgstr "加入聯絡人(_A)…" + +#: ../libempathy-gtk/empathy-individual-view.c:2307 msgid "Delete and _Block" msgstr "刪除並封鎖(_B)" -#: ../libempathy-gtk/empathy-individual-view.c:2509 +#: ../libempathy-gtk/empathy-individual-view.c:2342 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "是否想要移除群組「%s」？" + +#: ../libempathy-gtk/empathy-individual-view.c:2345 +msgid "Removing group" +msgstr "正在移除群組" + +#. Remove +#: ../libempathy-gtk/empathy-individual-view.c:2400 +#: ../libempathy-gtk/empathy-individual-view.c:2617 +msgid "_Remove" +msgstr "移除(_R)" + +#: ../libempathy-gtk/empathy-individual-view.c:2477 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "是否想要移除連絡人「%s」？" + +#: ../libempathy-gtk/empathy-individual-view.c:2486 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2226,7 +2169,11 @@ msgstr "" "您真的想要移除連結聯絡人「%s」嗎？請注意這會移除所有構成此連結聯絡群的聯絡" "人。" -#: ../libempathy-gtk/empathy-individual-widget.c:1608 +#: ../libempathy-gtk/empathy-individual-view.c:2498 +msgid "Removing contact" +msgstr "正在移除連絡人" + +#: ../libempathy-gtk/empathy-individual-widget.c:1641 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2240,19 +2187,19 @@ msgstr "位置 於 (日期)" msgid "Online from a phone or mobile device" msgstr "從手機或行動裝置上線" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 msgid "New Network" msgstr "新增網路" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 msgid "Choose an IRC network" msgstr "選擇 IRC 網路" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 msgid "Reset _Networks List" msgstr "重設網路清單(_N)" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "選取" @@ -2307,133 +2254,133 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "取消連結(_U)" -#: ../libempathy-gtk/empathy-log-window.c:620 +#: ../libempathy-gtk/empathy-log-window.c:622 msgid "History" msgstr "歷史" -#: ../libempathy-gtk/empathy-log-window.c:675 +#: ../libempathy-gtk/empathy-log-window.c:677 msgid "Show" msgstr "顯示" -#: ../libempathy-gtk/empathy-log-window.c:697 +#: ../libempathy-gtk/empathy-log-window.c:699 msgid "Search" msgstr "搜尋" -#: ../libempathy-gtk/empathy-log-window.c:1145 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat in %s" msgstr "於 %s 內聊天" -#: ../libempathy-gtk/empathy-log-window.c:1147 +#: ../libempathy-gtk/empathy-log-window.c:1152 #, c-format msgid "Chat with %s" msgstr "與 %s 聊天中" -#: ../libempathy-gtk/empathy-log-window.c:1197 -#: ../libempathy-gtk/empathy-log-window.c:1344 +#: ../libempathy-gtk/empathy-log-window.c:1202 +#: ../libempathy-gtk/empathy-log-window.c:1349 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%Y %B %d %A" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1286 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "* %s %s" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1292 +#: ../libempathy-gtk/empathy-log-window.c:1297 #, c-format msgid "%s: %s" msgstr "%s： %s" -#: ../libempathy-gtk/empathy-log-window.c:1368 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s 秒" -#: ../libempathy-gtk/empathy-log-window.c:1375 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s 分鐘" -#: ../libempathy-gtk/empathy-log-window.c:1383 +#: ../libempathy-gtk/empathy-log-window.c:1388 #, c-format msgid "Call took %s, ended at %s" msgstr "通話時間 %s，結束於 %s" -#: ../libempathy-gtk/empathy-log-window.c:1715 +#: ../libempathy-gtk/empathy-log-window.c:1722 msgid "Today" msgstr "今日" -#: ../libempathy-gtk/empathy-log-window.c:1719 +#: ../libempathy-gtk/empathy-log-window.c:1726 msgid "Yesterday" msgstr "昨日" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1734 +#: ../libempathy-gtk/empathy-log-window.c:1741 msgid "%e %B %Y" msgstr "%Yå¹´%B%e日" -#: ../libempathy-gtk/empathy-log-window.c:1815 -#: ../libempathy-gtk/empathy-log-window.c:3430 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3489 msgid "Anytime" msgstr "任何時間" -#: ../libempathy-gtk/empathy-log-window.c:1902 -#: ../libempathy-gtk/empathy-log-window.c:2358 +#: ../libempathy-gtk/empathy-log-window.c:1918 +#: ../libempathy-gtk/empathy-log-window.c:2402 msgid "Anyone" msgstr "任一個" -#: ../libempathy-gtk/empathy-log-window.c:2671 +#: ../libempathy-gtk/empathy-log-window.c:2715 msgid "Who" msgstr "誰" -#: ../libempathy-gtk/empathy-log-window.c:2875 +#: ../libempathy-gtk/empathy-log-window.c:2924 msgid "When" msgstr "何時" -#: ../libempathy-gtk/empathy-log-window.c:2991 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Anything" msgstr "任何事" -#: ../libempathy-gtk/empathy-log-window.c:2993 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Text chats" msgstr "文字聊天" -#: ../libempathy-gtk/empathy-log-window.c:2995 +#: ../libempathy-gtk/empathy-log-window.c:3044 #: ../src/empathy-preferences.ui.h:4 msgid "Calls" msgstr "通話" -#: ../libempathy-gtk/empathy-log-window.c:3000 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Incoming calls" msgstr "來電" -#: ../libempathy-gtk/empathy-log-window.c:3001 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Outgoing calls" msgstr "播出" -#: ../libempathy-gtk/empathy-log-window.c:3002 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "Missed calls" msgstr "漏接來電" -#: ../libempathy-gtk/empathy-log-window.c:3024 +#: ../libempathy-gtk/empathy-log-window.c:3073 msgid "What" msgstr "什麼" -#: ../libempathy-gtk/empathy-log-window.c:3719 +#: ../libempathy-gtk/empathy-log-window.c:3782 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "您確定要刪除過往談話的所有紀錄嗎？" -#: ../libempathy-gtk/empathy-log-window.c:3723 +#: ../libempathy-gtk/empathy-log-window.c:3786 msgid "Clear All" msgstr "清除全部" -#: ../libempathy-gtk/empathy-log-window.c:3730 +#: ../libempathy-gtk/empathy-log-window.c:3793 msgid "Delete from:" msgstr "刪除從：" @@ -2462,7 +2409,7 @@ msgstr "視訊" #: ../libempathy-gtk/empathy-log-window.ui.h:7 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12 -#: ../src/empathy-main-window-menubar.ui.h:20 +#: ../src/empathy-roster-window-menubar.ui.h:20 msgid "_Edit" msgstr "編輯(_E)" @@ -2474,76 +2421,82 @@ msgstr "檔案(_F)" msgid "page 2" msgstr "頁面 2" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:83 msgid "The contact is offline" msgstr "聯絡人已經離線" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:85 msgid "The specified contact is either invalid or unknown" msgstr "指定的聯絡人無效或未知" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:87 msgid "The contact does not support this kind of conversation" msgstr "該聯絡人不支援這類談話" -#: ../libempathy-gtk/empathy-new-message-dialog.c:90 +#: ../libempathy-gtk/empathy-new-message-dialog.c:89 msgid "The requested functionality is not implemented for this protocol" msgstr "請求的功能尚未在此協定中實作" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:95 msgid "Could not start a conversation with the given contact" msgstr "無法啟動與給定聯絡人的談話" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:97 msgid "You are banned from this channel" msgstr "您被此頻道禁封" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:99 msgid "This channel is full" msgstr "此頻道已滿" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:101 msgid "You must be invited to join this channel" msgstr "您必須被邀請才能參加此頻道" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:103 msgid "Can't proceed while disconnected" msgstr "斷線時無法處理" -#: ../libempathy-gtk/empathy-new-message-dialog.c:106 +#: ../libempathy-gtk/empathy-new-message-dialog.c:105 msgid "Permission denied" msgstr "許可被拒絕" -#: ../libempathy-gtk/empathy-new-message-dialog.c:112 +#: ../libempathy-gtk/empathy-new-message-dialog.c:111 msgid "There was an error starting the conversation" msgstr "啟動談話時發生錯誤" -#: ../libempathy-gtk/empathy-new-message-dialog.c:291 -#: ../libempathy-gtk/empathy-new-call-dialog.c:203 +#: ../libempathy-gtk/empathy-new-message-dialog.c:290 +#: ../libempathy-gtk/empathy-new-call-dialog.c:202 msgid "Enter a contact identifier or phone number:" msgstr "請輸入聯絡人辨識身份或電話號碼：" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:334 +#: ../libempathy-gtk/empathy-new-message-dialog.c:333 msgid "New Conversation" msgstr "新增談話" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:226 +#: ../libempathy-gtk/empathy-new-call-dialog.c:225 msgid "_Video Call" msgstr "視訊通話(_V)" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:236 +#: ../libempathy-gtk/empathy-new-call-dialog.c:235 msgid "_Audio Call" msgstr "語音通話(_A)" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:246 +#: ../libempathy-gtk/empathy-new-call-dialog.c:245 msgid "New Call" msgstr "新增通話" -#: ../libempathy-gtk/empathy-password-dialog.c:274 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#, c-format +msgid "Authentification failed for account %s" +msgstr "%s 帳號驗證失敗" + +#: ../libempathy-gtk/empathy-base-password-dialog.c:224 +#: ../libempathy-gtk/empathy-password-dialog.c:134 #, c-format msgid "" "Enter your password for account\n" @@ -2658,12 +2611,12 @@ msgstr "語音通話結束" msgid "Edit Custom Messages" msgstr "編輯自訂訊息" -#: ../libempathy-gtk/empathy-theme-adium.c:1047 +#: ../libempathy-gtk/empathy-theme-adium.c:1051 #, c-format msgid "Message edited at %s" msgstr "訊息編輯於 %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1752 +#: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "一般" @@ -2743,14 +2696,18 @@ msgid "Continue" msgstr "繼續" #: ../libempathy-gtk/empathy-tls-dialog.c:287 +msgid "Untrusted connection" +msgstr "未受信任的連線" + +#: ../libempathy-gtk/empathy-tls-dialog.c:288 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "此連線未受信任。您無論如何都要繼續嗎？" -#: ../libempathy-gtk/empathy-tls-dialog.c:297 +#: ../libempathy-gtk/empathy-tls-dialog.c:298 msgid "Remember this choice for future connections" msgstr "請記住此選擇以供未來連線使用" -#: ../libempathy-gtk/empathy-tls-dialog.c:303 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Certificate Details" msgstr "憑證詳細資料" @@ -2945,31 +2902,31 @@ msgstr "西歐語系" msgid "Vietnamese" msgstr "越南文" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 msgid "No error message" msgstr "沒有錯誤訊息" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 msgid "Instant Message (Empathy)" msgstr "即時通訊 (Empathy)" -#: ../src/empathy.c:433 +#: ../src/empathy.c:437 msgid "Don't connect on startup" msgstr "啟動時不要自動連線" -#: ../src/empathy.c:437 +#: ../src/empathy.c:441 msgid "Don't display the contact list or any other dialogs on startup" msgstr "啟動時不顯示連絡人清單或任何其他對話窗" -#: ../src/empathy.c:452 +#: ../src/empathy.c:456 msgid "- Empathy IM Client" msgstr "- Empathy 即時通用戶端" -#: ../src/empathy.c:639 +#: ../src/empathy.c:643 msgid "Error contacting the Account Manager" msgstr "聯絡帳號管理程式時發生錯誤" -#: ../src/empathy.c:641 +#: ../src/empathy.c:645 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3012,11 +2969,11 @@ msgstr "" "給： Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " "Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:107 +#: ../src/empathy-about-dialog.c:109 msgid "An Instant Messaging client for GNOME" msgstr "GNOME 的即時訊息用戶端程式" -#: ../src/empathy-about-dialog.c:113 +#: ../src/empathy-about-dialog.c:115 msgid "translator-credits" msgstr "" "如對翻譯有任何意見，請送一封電子郵件給\n" @@ -3058,35 +3015,36 @@ msgstr "" "號。" #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1271 +#: ../src/empathy-account-assistant.c:1276 msgid "An error occurred" msgstr "發生錯誤" -#: ../src/empathy-account-assistant.c:467 +#: ../src/empathy-account-assistant.c:469 +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 msgid "What kind of chat account do you have?" msgstr "您的聊天帳號是哪一種？" -#: ../src/empathy-account-assistant.c:473 +#: ../src/empathy-account-assistant.c:475 msgid "Do you have any other chat accounts you want to set up?" msgstr "您還想要設定其他的聊天帳號嗎？" -#: ../src/empathy-account-assistant.c:479 +#: ../src/empathy-account-assistant.c:481 msgid "Enter your account details" msgstr "請輸入您的帳號詳細資料" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:486 msgid "What kind of chat account do you want to create?" msgstr "您想要建立何種聊天帳號？" -#: ../src/empathy-account-assistant.c:490 +#: ../src/empathy-account-assistant.c:492 msgid "Do you want to create other chat accounts?" msgstr "是否想要建立其他聊天帳號？" -#: ../src/empathy-account-assistant.c:497 +#: ../src/empathy-account-assistant.c:499 msgid "Enter the details for the new account" msgstr "請輸入新帳號的詳細資料" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:614 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -3097,41 +3055,41 @@ msgstr "" "Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以進行語音或視" "訊通話。" -#: ../src/empathy-account-assistant.c:629 +#: ../src/empathy-account-assistant.c:631 msgid "Do you have an account you've been using with another chat program?" msgstr "您是否有使用其他聊天程式的帳號？" -#: ../src/empathy-account-assistant.c:652 +#: ../src/empathy-account-assistant.c:655 msgid "Yes, import my account details from " msgstr "是的，請匯入我的帳號詳細資料於" -#: ../src/empathy-account-assistant.c:673 +#: ../src/empathy-account-assistant.c:676 msgid "Yes, I'll enter my account details now" msgstr "是的，我現在要輸入帳號的詳細資料" -#: ../src/empathy-account-assistant.c:695 +#: ../src/empathy-account-assistant.c:698 msgid "No, I want a new account" msgstr "不，我想要新的帳號" -#: ../src/empathy-account-assistant.c:705 +#: ../src/empathy-account-assistant.c:708 msgid "No, I just want to see people online nearby for now" msgstr "不，我現在只想看看附近有誰上線" -#: ../src/empathy-account-assistant.c:726 +#: ../src/empathy-account-assistant.c:729 msgid "Select the accounts you want to import:" msgstr "選擇要匯入的帳號：" -#: ../src/empathy-account-assistant.c:813 -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-account-assistant.c:816 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "是" -#: ../src/empathy-account-assistant.c:820 +#: ../src/empathy-account-assistant.c:823 msgid "No, that's all for now" msgstr "不，目前就這樣" -#: ../src/empathy-account-assistant.c:1085 +#: ../src/empathy-account-assistant.c:1088 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 " @@ -3142,16 +3100,16 @@ msgstr "" "用此功能，請檢查下列詳細資料是否正確。您也可以在以後簡單地變更這些細節，或是" "用「帳號」對話窗來停用此功能" -#: ../src/empathy-account-assistant.c:1091 -#: ../src/empathy-account-assistant.c:1147 +#: ../src/empathy-account-assistant.c:1094 +#: ../src/empathy-account-assistant.c:1152 msgid "Edit->Accounts" msgstr "編輯 -> 帳號" -#: ../src/empathy-account-assistant.c:1107 +#: ../src/empathy-account-assistant.c:1110 msgid "I do _not want to enable this feature for now" msgstr "我現在不想要啟用這項功能(_N)" -#: ../src/empathy-account-assistant.c:1143 +#: ../src/empathy-account-assistant.c:1148 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -3162,85 +3120,93 @@ msgstr "" "啟用此功能，請安裝 telepathy-salut 套件，並從「帳號」對話窗建立「附近的人」帳" "號" -#: ../src/empathy-account-assistant.c:1149 +#: ../src/empathy-account-assistant.c:1154 msgid "telepathy-salut not installed" msgstr "telepathy-salut 尚未安裝" -#: ../src/empathy-account-assistant.c:1195 +#: ../src/empathy-account-assistant.c:1200 msgid "Messaging and VoIP Accounts Assistant" msgstr "訊息與 VoIP 帳號助理" -#: ../src/empathy-account-assistant.c:1229 +#: ../src/empathy-account-assistant.c:1234 msgid "Welcome to Empathy" msgstr "歡迎使用 Empathy" -#: ../src/empathy-account-assistant.c:1238 +#: ../src/empathy-account-assistant.c:1243 msgid "Import your existing accounts" msgstr "匯入現有的帳號" -#: ../src/empathy-account-assistant.c:1256 +#: ../src/empathy-account-assistant.c:1261 msgid "Please enter personal details" msgstr "請輸入個人詳細資料" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:64 +#: ../src/empathy-accounts-dialog.c:69 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "有與您的 %s 帳號相關的修改尚未儲存。" #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:73 msgid "Your new account has not been saved yet." msgstr "尚未儲存您的新帳號。" -#: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:755 -#: ../src/empathy-call-window.c:1326 +#: ../src/empathy-accounts-dialog.c:344 +#: ../src/empathy-streamed-media-window.c:757 +#: ../src/empathy-call-window.c:1325 msgid "Connecting…" msgstr "連線中…" -#: ../src/empathy-accounts-dialog.c:386 +#: ../src/empathy-accounts-dialog.c:385 #, c-format msgid "Offline — %s" msgstr "離線 — %s" -#: ../src/empathy-accounts-dialog.c:398 +#: ../src/empathy-accounts-dialog.c:397 #, c-format msgid "Disconnected — %s" msgstr "已斷線 — %s" -#: ../src/empathy-accounts-dialog.c:409 +#: ../src/empathy-accounts-dialog.c:408 msgid "Offline — No Network Connection" msgstr "離線 — 無網路連線" -#: ../src/empathy-accounts-dialog.c:416 +#: ../src/empathy-accounts-dialog.c:415 msgid "Unknown Status" msgstr "未知的狀態" -#: ../src/empathy-accounts-dialog.c:428 +#: ../src/empathy-accounts-dialog.c:427 msgid "Offline — Account Disabled" msgstr "離線 — 帳號已停用" -#: ../src/empathy-accounts-dialog.c:831 -msgid "" -"You are about to create a new account, which will discard\n" -"your changes. Are you sure you want to proceed?" -msgstr "" -"您即將建立新的帳號，這樣會放棄\n" -"您所做的變更。確定要繼續？" +#: ../src/empathy-accounts-dialog.c:530 +msgid "Edit Connection Parameters" +msgstr "編輯連線參數" + +#: ../src/empathy-accounts-dialog.c:693 +msgid "Failed to retrieve your personal information from the server." +msgstr "無法從伺服器擷取您的個人資訊。" + +#: ../src/empathy-accounts-dialog.c:699 +msgid "Go online to edit your personal information." +msgstr "上線以編輯您的個人資訊。" -#: ../src/empathy-accounts-dialog.c:1192 +#: ../src/empathy-accounts-dialog.c:784 +msgid "_Edit Connection Parameters..." +msgstr "編輯連線參數(_E)..." + +#: ../src/empathy-accounts-dialog.c:1289 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "是否想要從您的電腦上移除群組 %s？" -#: ../src/empathy-accounts-dialog.c:1196 +#: ../src/empathy-accounts-dialog.c:1293 msgid "This will not remove your account on the server." msgstr "這不會移除伺服器上的您的帳號。" -#: ../src/empathy-accounts-dialog.c:1432 +#: ../src/empathy-accounts-dialog.c:1529 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3249,15 +3215,15 @@ msgstr "" "您所做的變更。確定要繼續？" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1643 +#: ../src/empathy-accounts-dialog.c:1705 msgid "_Enable" msgstr "啟用(_E)" -#: ../src/empathy-accounts-dialog.c:1644 +#: ../src/empathy-accounts-dialog.c:1706 msgid "_Disable" msgstr "停用(_D)" -#: ../src/empathy-accounts-dialog.c:2154 +#: ../src/empathy-accounts-dialog.c:2176 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3291,11 +3257,11 @@ msgstr "要加入新的帳號，您必須先安裝每個會用到的通訊協定 msgid "_Import…" msgstr "匯入(_I)…" -#: ../src/empathy-auth-client.c:251 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr "- Empathy 認證用戶端" -#: ../src/empathy-auth-client.c:267 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Empathy 認證用戶端" @@ -3311,137 +3277,137 @@ msgstr "- Empathy 音訊視訊用戶端" msgid "Empathy Audio/Video Client" msgstr "Empathy 音訊視訊用戶端" -#: ../src/empathy-streamed-media-window.c:432 +#: ../src/empathy-streamed-media-window.c:433 msgid "Contrast" msgstr "對比" -#: ../src/empathy-streamed-media-window.c:435 +#: ../src/empathy-streamed-media-window.c:436 msgid "Brightness" msgstr "亮度" -#: ../src/empathy-streamed-media-window.c:438 +#: ../src/empathy-streamed-media-window.c:439 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-streamed-media-window.c:543 +#: ../src/empathy-streamed-media-window.c:545 msgid "Volume" msgstr "音量" -#: ../src/empathy-streamed-media-window.c:1094 +#: ../src/empathy-streamed-media-window.c:1097 msgid "_Sidebar" msgstr "側邊欄(_S)" -#: ../src/empathy-streamed-media-window.c:1114 +#: ../src/empathy-streamed-media-window.c:1117 msgid "Audio input" msgstr "音效輸入" -#: ../src/empathy-streamed-media-window.c:1118 +#: ../src/empathy-streamed-media-window.c:1121 msgid "Video input" msgstr "視訊輸入" -#: ../src/empathy-streamed-media-window.c:1126 +#: ../src/empathy-streamed-media-window.c:1129 msgid "Dialpad" msgstr "播號盤" -#: ../src/empathy-streamed-media-window.c:1137 +#: ../src/empathy-streamed-media-window.c:1140 msgid "Details" msgstr "詳細資料" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-streamed-media-window.c:1206 -#: ../src/empathy-call-window.c:1932 +#: ../src/empathy-streamed-media-window.c:1209 +#: ../src/empathy-call-window.c:1927 #, c-format msgid "Call with %s" msgstr "與 %s 通話中" -#: ../src/empathy-streamed-media-window.c:1439 -#: ../src/empathy-call-window.c:2176 +#: ../src/empathy-streamed-media-window.c:1442 +#: ../src/empathy-call-window.c:2171 msgid "The IP address as seen by the machine" msgstr "機器看見的 IP 位址" -#: ../src/empathy-streamed-media-window.c:1441 -#: ../src/empathy-call-window.c:2178 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2173 msgid "The IP address as seen by a server on the Internet" msgstr "網際網路上的伺服器看見的 IP 位址" -#: ../src/empathy-streamed-media-window.c:1443 -#: ../src/empathy-call-window.c:2180 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2175 msgid "The IP address of the peer as seen by the other side" msgstr "其他端看見的點的 IP 位址" -#: ../src/empathy-streamed-media-window.c:1445 -#: ../src/empathy-call-window.c:2182 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2177 msgid "The IP address of a relay server" msgstr "中繼伺服器的 IP 位址" -#: ../src/empathy-streamed-media-window.c:1447 -#: ../src/empathy-call-window.c:2184 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2179 msgid "The IP address of the multicast group" msgstr "多點廣播群組的 IP 位址" -#: ../src/empathy-streamed-media-window.c:1835 #: ../src/empathy-streamed-media-window.c:1838 #: ../src/empathy-streamed-media-window.c:1841 #: ../src/empathy-streamed-media-window.c:1844 +#: ../src/empathy-streamed-media-window.c:1847 msgctxt "codec" msgid "Unknown" msgstr "未知" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2136 +#: ../src/empathy-streamed-media-window.c:2139 #, c-format msgid "Connected — %d:%02dm" msgstr "已連線 — %d:%02dm" -#: ../src/empathy-streamed-media-window.c:2197 -#: ../src/empathy-call-window.c:3045 +#: ../src/empathy-streamed-media-window.c:2200 +#: ../src/empathy-call-window.c:3033 msgid "Technical Details" msgstr "技術細節" -#: ../src/empathy-streamed-media-window.c:2235 -#: ../src/empathy-call-window.c:3084 +#: ../src/empathy-streamed-media-window.c:2238 +#: ../src/empathy-call-window.c:3072 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " "computer" msgstr "%s 的軟體不瞭解任何您電腦上所支援的音訊格式" -#: ../src/empathy-streamed-media-window.c:2240 -#: ../src/empathy-call-window.c:3089 +#: ../src/empathy-streamed-media-window.c:2243 +#: ../src/empathy-call-window.c:3077 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " "computer" msgstr "%s 的軟體不瞭解任何您電腦上所支援的視訊格式" -#: ../src/empathy-streamed-media-window.c:2246 -#: ../src/empathy-call-window.c:3095 +#: ../src/empathy-streamed-media-window.c:2249 +#: ../src/empathy-call-window.c:3083 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " "does not allow direct connections." msgstr "無法和 %s 建立連線。您們其中之一可能在一個不允許直接連線的網路之上。" -#: ../src/empathy-streamed-media-window.c:2252 -#: ../src/empathy-call-window.c:3101 +#: ../src/empathy-streamed-media-window.c:2255 +#: ../src/empathy-call-window.c:3089 msgid "There was a failure on the network" msgstr "這個網路上有錯誤發生" -#: ../src/empathy-streamed-media-window.c:2256 -#: ../src/empathy-call-window.c:3105 +#: ../src/empathy-streamed-media-window.c:2259 +#: ../src/empathy-call-window.c:3093 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝" -#: ../src/empathy-streamed-media-window.c:2259 -#: ../src/empathy-call-window.c:3108 +#: ../src/empathy-streamed-media-window.c:2262 +#: ../src/empathy-call-window.c:3096 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝" -#: ../src/empathy-streamed-media-window.c:2269 -#: ../src/empathy-call-window.c:3120 +#: ../src/empathy-streamed-media-window.c:2272 +#: ../src/empathy-call-window.c:3108 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please 回報這個錯誤並附上" "從求助選單內的「除錯」視窗中所收集的紀錄。" -#: ../src/empathy-streamed-media-window.c:2277 -#: ../src/empathy-call-window.c:3129 +#: ../src/empathy-streamed-media-window.c:2280 +#: ../src/empathy-call-window.c:3117 msgid "There was a failure in the call engine" msgstr "通話引擎內有錯誤發生" -#: ../src/empathy-streamed-media-window.c:2280 -#: ../src/empathy-call-window.c:3132 +#: ../src/empathy-streamed-media-window.c:2283 +#: ../src/empathy-call-window.c:3120 msgid "The end of the stream was reached" msgstr "已達串流末端" -#: ../src/empathy-streamed-media-window.c:2320 -#: ../src/empathy-call-window.c:3172 +#: ../src/empathy-streamed-media-window.c:2323 +#: ../src/empathy-call-window.c:3160 msgid "Can't establish audio stream" msgstr "無法建立音訊串流" -#: ../src/empathy-streamed-media-window.c:2330 -#: ../src/empathy-call-window.c:3182 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:3170 msgid "Can't establish video stream" msgstr "無法建立視訊串流" @@ -3558,8 +3524,8 @@ msgstr "切換視訊傳播" #: ../src/empathy-call-window.ui.h:21 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../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.c:2580 ../src/empathy-call-window.c:2581 +#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 msgid "Unknown" msgstr "不明" @@ -3577,17 +3543,17 @@ msgid "_Camera" msgstr "攝影機(_C)" #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9 -#: ../src/empathy-main-window-menubar.ui.h:18 +#: ../src/empathy-roster-window-menubar.ui.h:18 msgid "_Contents" msgstr "內容(_C)" #: ../src/empathy-call-window.ui.h:27 -#: ../src/empathy-main-window-menubar.ui.h:19 +#: ../src/empathy-roster-window-menubar.ui.h:19 msgid "_Debug" msgstr "偵錯(_D)" #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14 -#: ../src/empathy-main-window-menubar.ui.h:22 +#: ../src/empathy-roster-window-menubar.ui.h:22 msgid "_Help" msgstr "求助(_H)" @@ -3600,46 +3566,87 @@ msgid "_Settings" msgstr "設定值(_S)" #: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-main-window-menubar.ui.h:30 +#: ../src/empathy-roster-window-menubar.ui.h:29 #: ../src/empathy-streamed-media-window.ui.h:25 msgid "_View" msgstr "檢視(_V)" -#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501 +#: ../src/empathy-chat-window.c:285 +msgid "Close this window?" +msgstr "要關閉這個視窗？" + +#: ../src/empathy-chat-window.c:290 +#, c-format +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "關閉此視窗會離開 %s。您將無法接收到之後的訊息，除非您再次參與。" + +#: ../src/empathy-chat-window.c:301 +#, 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] "" +"關閉此視窗會離開 %u 個聊天室。您將無法接收到之後的訊息，除非您再次參與。" + +#: ../src/empathy-chat-window.c:310 +#, c-format +msgid "Leave %s?" +msgstr "離開 %s？" + +#: ../src/empathy-chat-window.c:311 +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "您將無法接收到此聊天室之後的訊息，除非您再次參與。" + +#: ../src/empathy-chat-window.c:330 +msgid "Close window" +msgstr "關閉視窗" + +#: ../src/empathy-chat-window.c:330 +msgid "Leave room" +msgstr "離開聊天室" + +#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d 個未讀)" -#: ../src/empathy-chat-window.c:493 +#: ../src/empathy-chat-window.c:648 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (與 %u 其他的)" -#: ../src/empathy-chat-window.c:509 +#: ../src/empathy-chat-window.c:664 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (來自其他人的 %d 個未讀)" -#: ../src/empathy-chat-window.c:518 +#: ../src/empathy-chat-window.c:673 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (來自所有人的 %d 個未讀)" -#: ../src/empathy-chat-window.c:733 +#: ../src/empathy-chat-window.c:888 msgid "SMS:" msgstr "SMS：" -#: ../src/empathy-chat-window.c:743 +#: ../src/empathy-chat-window.c:898 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "正在傳送 %d 個訊息" -#: ../src/empathy-chat-window.c:765 +#: ../src/empathy-chat-window.c:920 msgid "Typing a message." msgstr "正在輸入訊息。" @@ -3719,96 +3726,96 @@ msgstr "自動連線" msgid "Manage Favorite Rooms" msgstr "管理喜好的聊天室" -#: ../src/empathy-event-manager.c:521 +#: ../src/empathy-event-manager.c:523 msgid "Incoming video call" msgstr "傳入的視訊通話" -#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1556 +#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 msgid "Incoming call" msgstr "來電" -#: ../src/empathy-event-manager.c:525 +#: ../src/empathy-event-manager.c:527 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s 要與您進行視訊通話。您是否要接聽？" -#: ../src/empathy-event-manager.c:526 +#: ../src/empathy-event-manager.c:528 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s 要與您進行通話。您是否要接聽？" -#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730 -#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1562 +#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732 +#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming call from %s" msgstr "%s 的來電" -#: ../src/empathy-event-manager.c:554 +#: ../src/empathy-event-manager.c:556 msgid "_Reject" msgstr "拒絕(_R)" -#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 msgid "_Answer" msgstr "接聽(_A)" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:572 msgid "_Answer with video" msgstr "以視訊接聽(_A)" -#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763 -#: ../src/empathy-call-window.c:1562 +#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 +#: ../src/empathy-call-window.c:1561 #, c-format msgid "Incoming video call from %s" msgstr "來自 %s 的視訊通話" -#: ../src/empathy-event-manager.c:836 +#: ../src/empathy-event-manager.c:838 msgid "Room invitation" msgstr "聊天室邀請" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:840 #, c-format msgid "Invitation to join %s" msgstr "邀請參加 %s" -#: ../src/empathy-event-manager.c:845 +#: ../src/empathy-event-manager.c:847 #, c-format msgid "%s is inviting you to join %s" msgstr "%s 正在邀請您參加 %s" -#: ../src/empathy-event-manager.c:853 +#: ../src/empathy-event-manager.c:855 msgid "_Decline" msgstr "拒絕(_D)" -#: ../src/empathy-event-manager.c:858 +#: ../src/empathy-event-manager.c:860 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "參加(_J)" -#: ../src/empathy-event-manager.c:885 +#: ../src/empathy-event-manager.c:887 #, c-format msgid "%s invited you to join %s" msgstr "%s 曾邀請您參加 %s" -#: ../src/empathy-event-manager.c:891 +#: ../src/empathy-event-manager.c:893 #, c-format msgid "You have been invited to join %s" msgstr "您被邀請參加 %s" -#: ../src/empathy-event-manager.c:942 +#: ../src/empathy-event-manager.c:944 #, c-format msgid "Incoming file transfer from %s" msgstr "收到來自 %s 的檔案傳輸" -#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378 +#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372 msgid "Password required" msgstr "需要密碼" -#: ../src/empathy-event-manager.c:1210 +#: ../src/empathy-event-manager.c:1217 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s 想要得到查看您是否上線的許可" -#: ../src/empathy-event-manager.c:1214 +#: ../src/empathy-event-manager.c:1223 #, c-format msgid "" "\n" @@ -3818,105 +3825,105 @@ msgstr "" "訊息：%s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "不明" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s / %s 於 %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s / %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "正在接收 %2$s 送出的「%1$s」" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "正在傳送「%s」給 %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "從 %2$s 接收「%1$s」時發生錯誤" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "接收檔案時發生錯誤" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "傳送「%s」給 %s 時發生錯誤" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "傳送檔案時發生錯誤" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "「%s」接收自 %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "「%s」傳送給 %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "檔案傳輸完畢" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 msgid "Waiting for the other participant's response" msgstr "正在等待其他參與者的回應" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "正在檢查檔案「%s」的完整性" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "正在計算「%s」雜湊值" -#: ../src/empathy-ft-manager.c:1026 +#: ../src/empathy-ft-manager.c:1025 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1038 +#: ../src/empathy-ft-manager.c:1037 msgid "File" msgstr "檔案" -#: ../src/empathy-ft-manager.c:1060 +#: ../src/empathy-ft-manager.c:1059 msgid "Remaining" msgstr "剩餘" @@ -3939,161 +3946,178 @@ msgid "Import Accounts" msgstr "匯入帳號" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:315 msgid "Import" msgstr "匯入" -#: ../src/empathy-import-widget.c:310 +#: ../src/empathy-import-widget.c:324 msgid "Protocol" msgstr "通訊協定" -#: ../src/empathy-import-widget.c:334 +#: ../src/empathy-import-widget.c:348 msgid "Source" msgstr "來源" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-roster-window.c:389 msgid "Provide Password" msgstr "提供密碼" -#: ../src/empathy-main-window.c:401 +#: ../src/empathy-roster-window.c:395 msgid "Disconnect" msgstr "斷線" -#: ../src/empathy-main-window.c:638 +#: ../src/empathy-roster-window.c:644 +msgid "You need to setup an account to see contacts here." +msgstr "" + +#: ../src/empathy-roster-window.c:660 msgid "No match found" msgstr "找不到符合項目" -#: ../src/empathy-main-window.c:746 +#: ../src/empathy-roster-window.c:765 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "很抱歉，%s 帳號無法使用，除非您的 %s 軟體已更新。" -#: ../src/empathy-main-window.c:814 +#: ../src/empathy-roster-window.c:831 msgid "Update software..." msgstr "更新軟體..." -#: ../src/empathy-main-window.c:820 ../src/empathy-main-window.c:941 +#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954 msgid "Close" msgstr "關閉" -#: ../src/empathy-main-window.c:929 +#: ../src/empathy-roster-window.c:942 msgid "Reconnect" msgstr "重新連接" -#: ../src/empathy-main-window.c:935 +#: ../src/empathy-roster-window.c:948 msgid "Edit Account" msgstr "編輯帳號" #. Translators: this string will be something like: -#. * Top up My Account ($1.23)..." -#: ../src/empathy-main-window.c:1074 +#. * Top up My Account ($1.23)..." +#: ../src/empathy-roster-window.c:1092 #, c-format msgid "Top up %s (%s)..." msgstr "加值 %s (%s)..." -#: ../src/empathy-main-window.c:1121 +#: ../src/empathy-roster-window.c:1138 msgid "Top up account credit" msgstr "加值帳號存額" #. top up button -#: ../src/empathy-main-window.c:1192 +#: ../src/empathy-roster-window.c:1210 msgid "Top Up..." msgstr "加值..." -#: ../src/empathy-main-window.c:1935 +#: ../src/empathy-roster-window.c:1933 msgid "Contact" msgstr "連絡人" -#: ../src/empathy-main-window.c:2310 +#: ../src/empathy-roster-window.c:2131 +msgid "You need to enable one of your accounts to see contacts here." +msgstr "" + +#. translators: argument is an account name +#: ../src/empathy-roster-window.c:2139 +#, c-format +msgid "You need to enable %s to see contacts here." +msgstr "" + +#: ../src/empathy-roster-window.c:2419 msgid "Contact List" msgstr "連絡人清單" -#: ../src/empathy-main-window-menubar.ui.h:1 +#: ../src/empathy-roster-window.ui.h:1 +#, fuzzy +#| msgid "_Accounts" +msgid "Account settings" +msgstr "帳號(_A)" + +#: ../src/empathy-roster-window-menubar.ui.h:1 msgid "Contacts on a _Map" msgstr "連絡人地圖(_M)" -#: ../src/empathy-main-window-menubar.ui.h:2 +#: ../src/empathy-roster-window-menubar.ui.h:2 msgid "Credit Balance" msgstr "儲值餘額" -#: ../src/empathy-main-window-menubar.ui.h:3 +#: ../src/empathy-roster-window-menubar.ui.h:3 msgid "Find in Contact _List" msgstr "於連絡人清單內尋找(_L)" -#: ../src/empathy-main-window-menubar.ui.h:4 +#: ../src/empathy-roster-window-menubar.ui.h:4 msgid "Join _Favorites" msgstr "參加喜好聊天室(_F)" -#: ../src/empathy-main-window-menubar.ui.h:5 +#: ../src/empathy-roster-window-menubar.ui.h:5 msgid "Manage Favorites" msgstr "管理喜好" -#: ../src/empathy-main-window-menubar.ui.h:6 +#: ../src/empathy-roster-window-menubar.ui.h:6 msgid "N_ormal Size" msgstr "正常大小(_O)" -#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1 +#: ../src/empathy-roster-window-menubar.ui.h:7 +#: ../src/empathy-status-icon.ui.h:1 msgid "New _Call…" msgstr "新增通話(_C)…" -#: ../src/empathy-main-window-menubar.ui.h:8 +#: ../src/empathy-roster-window-menubar.ui.h:8 msgid "Normal Size With _Avatars" msgstr "正常大小與大頭貼(_A)" -#: ../src/empathy-main-window-menubar.ui.h:9 +#: ../src/empathy-roster-window-menubar.ui.h:9 msgid "P_references" msgstr "偏好設定(_R)" -#: ../src/empathy-main-window-menubar.ui.h:10 +#: ../src/empathy-roster-window-menubar.ui.h:10 msgid "Show P_rotocols" msgstr "顯示協定(_R)" -#: ../src/empathy-main-window-menubar.ui.h:11 +#: ../src/empathy-roster-window-menubar.ui.h:11 msgid "Sort by _Name" msgstr "依名稱排序(_N)" -#: ../src/empathy-main-window-menubar.ui.h:12 +#: ../src/empathy-roster-window-menubar.ui.h:12 msgid "Sort by _Status" msgstr "依狀態排序(_S)" -#: ../src/empathy-main-window-menubar.ui.h:13 +#: ../src/empathy-roster-window-menubar.ui.h:13 msgid "_Accounts" msgstr "帳號(_A)" -#: ../src/empathy-main-window-menubar.ui.h:15 +#: ../src/empathy-roster-window-menubar.ui.h:15 msgid "_Blocked Contacts" msgstr "被封鎖的聯絡人" -#: ../src/empathy-main-window-menubar.ui.h:17 +#: ../src/empathy-roster-window-menubar.ui.h:17 msgid "_Compact Size" msgstr "精簡大小(_C)" -#: ../src/empathy-main-window-menubar.ui.h:21 +#: ../src/empathy-roster-window-menubar.ui.h:21 msgid "_File Transfers" msgstr "檔案傳輸(_F)" -#: ../src/empathy-main-window-menubar.ui.h:23 +#: ../src/empathy-roster-window-menubar.ui.h:23 msgid "_Join…" msgstr "參加(_J)…" -#: ../src/empathy-main-window-menubar.ui.h:24 +#: ../src/empathy-roster-window-menubar.ui.h:24 #: ../src/empathy-status-icon.ui.h:3 msgid "_New Conversation…" msgstr "新增談話(_N)…" -#: ../src/empathy-main-window-menubar.ui.h:25 +#: ../src/empathy-roster-window-menubar.ui.h:25 msgid "_Offline Contacts" msgstr "離線連絡人(_O)" -#: ../src/empathy-main-window-menubar.ui.h:26 -msgid "_Personal Information" -msgstr "個人資訊(_P)" - -#: ../src/empathy-main-window-menubar.ui.h:28 +#: ../src/empathy-roster-window-menubar.ui.h:27 msgid "_Room" msgstr "聊天室(_R)" -#: ../src/empathy-main-window-menubar.ui.h:29 +#: ../src/empathy-roster-window-menubar.ui.h:28 msgid "_Search for Contacts…" msgstr "搜尋聯絡人(_S)…" @@ -4107,7 +4131,7 @@ msgstr "成員" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:623 +#: ../src/empathy-new-chatroom-dialog.c:637 #, c-format msgid "" "%s\n" @@ -4120,16 +4144,16 @@ msgstr "" "需要密碼：%s\n" "成員：%s" -#: ../src/empathy-new-chatroom-dialog.c:625 -#: ../src/empathy-new-chatroom-dialog.c:626 +#: ../src/empathy-new-chatroom-dialog.c:639 +#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "否" -#: ../src/empathy-new-chatroom-dialog.c:654 +#: ../src/empathy-new-chatroom-dialog.c:668 msgid "Could not start room listing" msgstr "無法開始列出聊天室清單" -#: ../src/empathy-new-chatroom-dialog.c:664 +#: ../src/empathy-new-chatroom-dialog.c:678 msgid "Could not stop room listing" msgstr "無法停止列出聊天室清單" @@ -4161,79 +4185,79 @@ msgstr "聊天室清單" msgid "_Room:" msgstr "聊天室(_R)：" -#: ../src/empathy-preferences.c:169 +#: ../src/empathy-preferences.c:166 msgid "Message received" msgstr "訊息已收到" -#: ../src/empathy-preferences.c:170 +#: ../src/empathy-preferences.c:167 msgid "Message sent" msgstr "訊息已送出" -#: ../src/empathy-preferences.c:171 +#: ../src/empathy-preferences.c:168 msgid "New conversation" msgstr "新增談話" -#: ../src/empathy-preferences.c:172 -msgid "Contact goes online" +#: ../src/empathy-preferences.c:169 +msgid "Contact comes online" msgstr "連絡人上線" -#: ../src/empathy-preferences.c:173 +#: ../src/empathy-preferences.c:170 msgid "Contact goes offline" msgstr "連絡人離線" -#: ../src/empathy-preferences.c:174 +#: ../src/empathy-preferences.c:171 msgid "Account connected" msgstr "帳號已連線" -#: ../src/empathy-preferences.c:175 +#: ../src/empathy-preferences.c:172 msgid "Account disconnected" msgstr "帳號已斷線" -#: ../src/empathy-preferences.c:484 +#: ../src/empathy-preferences.c:475 msgid "Language" msgstr "語言" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:734 +#: ../src/empathy-preferences.c:726 msgid "Juliet" msgstr "祝英台" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:741 +#: ../src/empathy-preferences.c:733 msgid "Romeo" msgstr "梁山伯" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:747 +#: ../src/empathy-preferences.c:739 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "白玉環與蝴蝶墜，為何不能夫妻配？" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:750 +#: ../src/empathy-preferences.c:743 msgid "Deny thy father and refuse thy name;" msgstr "豈知你我自作主，無人當它是聘媒。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:753 +#: ../src/empathy-preferences.c:746 msgid "Or if thou wilt not, be but sworn my love" msgstr "豈知好事成虛話，棒打鴛鴦兩離分。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:756 +#: ../src/empathy-preferences.c:749 msgid "And I'll no longer be a Capulet." msgstr "爹爹許了馬家婚，心已碎，意難伸。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:759 +#: ../src/empathy-preferences.c:752 msgid "Shall I hear more, or shall I speak at this?" msgstr "將來有命終相見，無命今生不相逄。" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:762 +#: ../src/empathy-preferences.c:755 msgid "Juliet has disconnected" msgstr "祝英台已斷線" -#: ../src/empathy-preferences.c:1175 +#: ../src/empathy-preferences.c:1159 msgid "Preferences" msgstr "偏好設定" @@ -4292,35 +4316,27 @@ msgstr "為語言啟用拼字檢查：" msgid "General" msgstr "一般" -#: ../src/empathy-preferences.ui.h:15 -msgid "Input level:" -msgstr "輸入等級：" - #: ../src/empathy-preferences.ui.h:16 -msgid "Input volume:" -msgstr "輸入音量：" - -#: ../src/empathy-preferences.ui.h:18 msgid "Location sources:" msgstr "位置來源：" -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:17 msgid "Log conversations" msgstr "紀錄談話" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:18 msgid "Notifications" msgstr "通知" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:19 msgid "Play sound for events" msgstr "播放事件音效" -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:20 msgid "Privacy" msgstr "隱私" -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:21 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 " @@ -4329,77 +4345,85 @@ msgstr "" "降低位置準確度意指除了您所在的城市、洲和國家會被公開之外，不會提供其他訊息。" "GPS 的座標準確度將會降為個位數。" -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:22 msgid "Show _smileys as images" msgstr "將表情符號以圖片顯示(_S)" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:23 msgid "Show contact _list in rooms" msgstr "在聊天室顯示連絡人清單(_L)" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:24 msgid "Sounds" msgstr "音效" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:25 msgid "Spell Checking" msgstr "拼字檢查" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:26 +msgid "Start chats in:" +msgstr "開啟聊天於：" + +#: ../src/empathy-preferences.ui.h:27 msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." msgstr "這裡的語言清單只反映出您已經安裝字典的語言。" -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:28 msgid "Themes" msgstr "佈景主題" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:29 msgid "Use _echo cancellation to improve call quality" msgstr "使用回音消除來改善通話品質(_E)" -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:30 msgid "Variant:" msgstr "樣式：" -#: ../src/empathy-preferences.ui.h:32 +#: ../src/empathy-preferences.ui.h:31 msgid "_Automatically connect on startup" msgstr "啟動時自動連線(_A)" -#: ../src/empathy-preferences.ui.h:33 +#: ../src/empathy-preferences.ui.h:32 msgid "_Cellphone" msgstr "手機(_C)" -#: ../src/empathy-preferences.ui.h:34 +#: ../src/empathy-preferences.ui.h:33 msgid "_Enable bubble notifications" msgstr "啟用氣泡式通知(_E)" -#: ../src/empathy-preferences.ui.h:35 +#: ../src/empathy-preferences.ui.h:34 msgid "_Enable sound notifications" msgstr "啟用音效通知(_E)" -#: ../src/empathy-preferences.ui.h:36 +#: ../src/empathy-preferences.ui.h:35 msgid "_GPS" msgstr "_GPS" -#: ../src/empathy-preferences.ui.h:37 +#: ../src/empathy-preferences.ui.h:36 msgid "_Network (IP, Wi-Fi)" msgstr "網路 (IP, Wi-Fi)(_N)" -#: ../src/empathy-preferences.ui.h:38 -msgid "_Open new chats in separate windows" -msgstr "在個別視窗開啟新的聊天(_O)" - -#: ../src/empathy-preferences.ui.h:39 +#: ../src/empathy-preferences.ui.h:37 msgid "_Publish location to my contacts" msgstr "對我的連絡人公開位置(_P)" #. 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:41 +#: ../src/empathy-preferences.ui.h:39 msgid "_Reduce location accuracy" msgstr "降低位置準確度(_R)" +#: ../src/empathy-preferences.ui.h:40 +msgid "new _windows" +msgstr "新視窗(_W)" + +#: ../src/empathy-preferences.ui.h:41 +msgid "new ta_bs" +msgstr "新分頁(_B)" + #: ../src/empathy-status-icon.ui.h:2 msgid "Status" msgstr "狀態" @@ -4456,7 +4480,7 @@ msgstr "視訊開啟" msgid "Video Preview" msgstr "視訊預覽" -#: ../src/empathy-map-view.c:448 +#: ../src/empathy-map-view.c:471 msgid "Contact Map View" msgstr "連絡人地圖檢視" @@ -4522,16 +4546,16 @@ msgid "" "extension." msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。" -#: ../src/empathy-invite-participant-dialog.c:197 -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "邀請參與" -#: ../src/empathy-invite-participant-dialog.c:198 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "選擇想要邀請進入談話的聯絡人：" -#: ../src/empathy-invite-participant-dialog.c:221 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "邀請" @@ -4585,13 +4609,13 @@ msgid "Respond" msgstr "回應" #: ../src/empathy-notifications-approver.c:204 -#: ../src/empathy-call-window.c:1566 +#: ../src/empathy-call-window.c:1565 msgid "Reject" msgstr "拒絕" #: ../src/empathy-notifications-approver.c:209 #: ../src/empathy-notifications-approver.c:214 -#: ../src/empathy-call-window.c:1567 +#: ../src/empathy-call-window.c:1566 msgid "Answer" msgstr "接聽" @@ -4623,38 +4647,38 @@ msgstr "%s 剛剛播打給您，但您正與他人通話。" #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196 +#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 msgid "i" msgstr "訊" -#: ../src/empathy-call-window.c:2941 +#: ../src/empathy-call-window.c:2929 msgid "On hold" msgstr "保留" -#: ../src/empathy-call-window.c:2944 +#: ../src/empathy-call-window.c:2932 msgid "Mute" msgstr "靜音" -#: ../src/empathy-call-window.c:2946 +#: ../src/empathy-call-window.c:2934 msgid "Duration" msgstr "時間" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2949 +#: ../src/empathy-call-window.c:2937 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:3219 +#: ../src/empathy-call-window.c:3207 #, c-format msgid "Your current balance is %s." msgstr "您目前的餘額為 %s。" -#: ../src/empathy-call-window.c:3223 +#: ../src/empathy-call-window.c:3211 msgid "Sorry, you don’t have enough credit for that call." msgstr "很抱歉，您的存額不足以進行該通話。" -#: ../src/empathy-call-window.c:3225 +#: ../src/empathy-call-window.c:3213 msgid "Top Up" msgstr "加值" @@ -4662,6 +4686,63 @@ msgstr "加值" msgid "_Match case" msgstr "比對大小寫(_M)" +#: ../libempathy-gtk/empathy-new-account-dialog.c:166 +msgid "Adding new account" +msgstr "新增帳號" + +#~ msgid "Personal Information" +#~ msgstr "個人資訊" + +#~ msgid "_Personal Information" +#~ msgstr "個人資訊(_P)" + +#~ msgid "_Open new chats in separate windows" +#~ msgstr "在個別視窗開啟新的聊天(_O)" + +#~ msgid "Call volume" +#~ msgstr "通話音量" + +#~ msgid "Call volume, as a percentage." +#~ msgstr "通話音量，為百分比。" + +#~ msgid "Socket type not supported" +#~ msgstr "Socket 類型不支援" + +#~ msgid "My Web Accounts" +#~ msgstr "我的網路帳號" + +#~ msgid "The account %s is edited via %s." +#~ msgstr "%s 帳號已透過 %s 修改。" + +#~ msgid "The account %s cannot be edited in Empathy." +#~ msgstr "%s 帳號無法於 Empathy 內修改。" + +#~ msgid "Launch My Web Accounts" +#~ msgstr "啟動我的網路帳號" + +#~ msgid "Edit %s" +#~ msgstr "編輯 %s" + +#~ msgid "Ca_ncel" +#~ msgstr "取消(_N)" + +#~ msgctxt "Edit contact (contextual menu)" +#~ msgid "_Edit" +#~ msgstr "編輯(_E)" + +#~ msgid "" +#~ "You are about to create a new account, which will discard\n" +#~ "your changes. Are you sure you want to proceed?" +#~ msgstr "" +#~ "您即將建立新的帳號，這樣會放棄\n" +#~ "您所做的變更。確定要繼續？" + +#~ msgid "Input level:" +#~ msgstr "輸入等級：" + +#~ msgid "Input volume:" +#~ msgstr "輸入音量：" + #~ msgid "Empathy has migrated butterfly logs" #~ msgstr "Empathy 已轉移 butterfly 日誌" @@ -4881,8 +4962,5 @@ msgstr "比對大小寫(_M)" #~ msgid "Hidden" #~ msgstr "隱藏" -#~ msgid "User requested disconnect" -#~ msgstr "連接不上要求的使用者" - #~ msgid "Location" #~ msgstr "位置" diff --git a/src/Makefile.am b/src/Makefile.am index c6855d33..8623ac2d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,9 +32,7 @@ noinst_LTLIBRARIES = libempathy-accounts-common.la libempathy_accounts_common_la_SOURCES = \ empathy-accounts-common.c empathy-accounts-common.h \ - empathy-account-assistant.c empathy-account-assistant.h \ empathy-accounts-dialog.c empathy-accounts-dialog.h \ - empathy-auto-salut-account-helper.c empathy-auto-salut-account-helper.h \ empathy-import-dialog.c empathy-import-dialog.h \ empathy-import-pidgin.c empathy-import-pidgin.h \ empathy-import-widget.c empathy-import-widget.h \ @@ -166,7 +164,7 @@ empathy_handwritten_source = \ empathy-event-manager.c empathy-event-manager.h \ empathy-ft-manager.c empathy-ft-manager.h \ empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \ - empathy-main-window.c empathy-main-window.h \ + empathy-roster-window.c empathy-roster-window.h \ empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h \ empathy-notifications-approver.c empathy-notifications-approver.h \ empathy-call-observer.c empathy-call-observer.h \ @@ -207,8 +205,8 @@ ui_DATA = \ empathy-chatrooms-window.ui \ empathy-ft-manager.ui \ empathy-import-dialog.ui \ - empathy-main-window.ui \ - empathy-main-window-menubar.ui \ + empathy-roster-window.ui \ + empathy-roster-window-menubar.ui \ empathy-new-chatroom-dialog.ui \ empathy-preferences.ui \ empathy-status-icon.ui diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c index 04b2753b..3204d0f0 100644 --- a/src/empathy-about-dialog.c +++ b/src/empathy-about-dialog.c @@ -88,24 +88,26 @@ static const char *license[] = { "GNU General Public License for more details."), N_("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") + "51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"), + NULL }; void empathy_about_dialog_new (GtkWindow *parent) { - gchar *license_trans; + GString *license_trans = g_string_new (NULL); + int i; - license_trans = g_strconcat (_(license[0]), "\n\n", - _(license[1]), "\n\n", - _(license[2]), "\n\n", - NULL); + for (i = 0; license[i] != NULL; i++) { + g_string_append (license_trans, _(license[i])); + g_string_append (license_trans, "\n\n"); + } gtk_show_about_dialog (parent, "artists", artists, "authors", authors, "comments", _("An Instant Messaging client for GNOME"), - "license", license_trans, + "license", license_trans->str, "wrap-license", TRUE, "copyright", "Imendio AB 2002-2007\nCollabora Ltd 2007-2011", "documenters", documenters, @@ -115,7 +117,7 @@ empathy_about_dialog_new (GtkWindow *parent) "website", WEB_SITE, NULL); - g_free (license_trans); + g_string_free (license_trans, TRUE); } diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c deleted file mode 100644 index ecfd7834..00000000 --- a/src/empathy-account-assistant.c +++ /dev/null @@ -1,1307 +0,0 @@ -/* - * Copyright (C) 2009 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Cosimo Cecchi - */ - -/* empathy-account-assistant.c */ - -#include -#include -#include -#include - -#include "empathy-account-assistant.h" -#include "empathy-import-widget.h" -#include "empathy-import-utils.h" -#include "empathy-auto-salut-account-helper.h" - -#include -#include - -#include -#include -#include - -#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include - -G_DEFINE_TYPE (EmpathyAccountAssistant, empathy_account_assistant, - GTK_TYPE_ASSISTANT) - -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountAssistant) - -typedef enum { - RESPONSE_IMPORT = 1, - RESPONSE_ENTER_ACCOUNT = 2, - RESPONSE_CREATE_ACCOUNT = 3, - RESPONSE_SALUT_ONLY = 4 -} FirstPageResponse; - -typedef enum { - RESPONSE_CREATE_AGAIN = 1, - RESPONSE_CREATE_STOP = 2 -} CreateEnterPageResponse; - -typedef enum { - PAGE_INTRO = 0, - PAGE_IMPORT = 1, - PAGE_ENTER_CREATE = 2, - PAGE_SALUT = 3, -} PageID; - -enum { - PROP_PARENT = 1, - PROP_CONNECTION_MGRS, -}; - -typedef struct { - FirstPageResponse first_resp; - CreateEnterPageResponse create_enter_resp; - gboolean enter_create_forward; - TpAccountManager *account_mgr; - EmpathyConnectionManagers *connection_mgrs; - PageID current_page_id; - - /* enter or create page */ - GtkWidget *enter_or_create_page; - GtkWidget *current_account_widget; - EmpathyAccountWidget *current_widget_object; - GtkWidget *first_label; - GtkWidget *second_label; - GtkWidget *chooser; - GtkWidget *create_again_radio; - EmpathyAccountSettings *settings; - gboolean is_creating; - - /* import page */ - EmpathyImportWidget *iw; - GtkWidget *import_page; - - /* salut page */ - GtkWidget *salut_page; - EmpathyAccountSettings *salut_settings; - GtkWidget *salut_account_widget; - gboolean create_salut_account; - gboolean display_salut_page; - - GtkWindow *parent_window; - - gboolean dispose_run; -} EmpathyAccountAssistantPriv; - -static GtkWidget * account_assistant_build_enter_or_create_page ( - EmpathyAccountAssistant *self); -static void account_assistant_finish_enter_or_create_page ( - EmpathyAccountAssistant *self, - gboolean is_enter); - -static void do_constructed (GObject *object); - -static GtkWidget * -build_error_vbox (const gchar *primary_message, - const gchar *secondary_message) -{ - GtkWidget *main_vbox, *w, *hbox; - PangoAttrList *list; - - main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_widget_show (main_vbox); - - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); - - w = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, - GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0); - gtk_widget_show (w); - - w = gtk_label_new (primary_message); - gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0); - list = pango_attr_list_new (); - pango_attr_list_insert (list, pango_attr_scale_new (PANGO_SCALE_LARGE)); - pango_attr_list_insert (list, pango_attr_weight_new (PANGO_WEIGHT_BOLD)); - gtk_label_set_attributes (GTK_LABEL (w), list); - gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5); - gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); - gtk_widget_show (w); - - pango_attr_list_unref (list); - - w = gtk_label_new (secondary_message); - gtk_label_set_use_markup (GTK_LABEL (w), TRUE); - gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5); - gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); - gtk_widget_show (w); - - return main_vbox; -} - -static GtkWidget * -account_assistant_build_error_page (EmpathyAccountAssistant *self, - GError *error, gint page_num) -{ - GtkWidget *main_vbox, *w; - const char *primary_message; - gchar *secondary_message, *markup; - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - - if (page_num == PAGE_IMPORT) - primary_message = _("There was an error while importing the accounts."); - else if (page_num >= PAGE_ENTER_CREATE && - priv->first_resp == RESPONSE_ENTER_ACCOUNT) - primary_message = _("There was an error while parsing the account details."); - else if (page_num >= PAGE_ENTER_CREATE && - priv->first_resp == RESPONSE_CREATE_ACCOUNT) - primary_message = _("There was an error while creating the account."); - else - primary_message = _("There was an error."); - - markup = g_markup_printf_escaped ("%s", - error->message); - secondary_message = g_strdup_printf (_("The error message was: %s"), markup); - - main_vbox = build_error_vbox (primary_message, secondary_message); - - w = gtk_label_new (_("You can either go back and try to enter your " - "accounts' details again or quit this assistant and add accounts " - "later from the Edit menu.")); - gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 6); - gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5); - gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); - gtk_widget_show (w); - - g_free (markup); - g_free (secondary_message); - return main_vbox; -} - -static void -account_assistant_back_button_clicked_cb (GtkButton *button, - EmpathyAccountAssistant *self) -{ - gint page_num; - - page_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), - "page-num")); - gtk_assistant_remove_action_widget (GTK_ASSISTANT (self), - GTK_WIDGET (button)); - gtk_assistant_set_current_page (GTK_ASSISTANT (self), page_num); -} - -static void -account_assistant_present_error_page (EmpathyAccountAssistant *self, - GError *error, gint page_num) -{ - GtkWidget *error_page, *back_button; - gint num; - - error_page = account_assistant_build_error_page (self, error, - page_num); - num = gtk_assistant_append_page (GTK_ASSISTANT (self), error_page); - gtk_assistant_set_page_title (GTK_ASSISTANT (self), error_page, - _("An error occurred")); - gtk_assistant_set_page_type (GTK_ASSISTANT (self), error_page, - GTK_ASSISTANT_PAGE_SUMMARY); - - back_button = gtk_button_new_from_stock (GTK_STOCK_GO_BACK); - gtk_assistant_add_action_widget (GTK_ASSISTANT (self), back_button); - g_object_set_data (G_OBJECT (back_button), - "page-num", GINT_TO_POINTER (page_num)); - g_signal_connect (back_button, "clicked", - G_CALLBACK (account_assistant_back_button_clicked_cb), self); - gtk_widget_show (back_button); - - gtk_assistant_set_current_page (GTK_ASSISTANT (self), num); -} - -static void -update_create_page_buttons (EmpathyAccountAssistant *self) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - GtkAssistantPageType type; - - if (priv->display_salut_page || - priv->create_enter_resp == RESPONSE_CREATE_AGAIN) - type = GTK_ASSISTANT_PAGE_CONTENT; - else - type = GTK_ASSISTANT_PAGE_CONFIRM; - - gtk_assistant_set_page_type (GTK_ASSISTANT (self), priv->enter_or_create_page, - type); -} - -static void -account_assistant_reset_enter_create_page (EmpathyAccountAssistant *self) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - GtkWidget *page; - gint idx; - - page = account_assistant_build_enter_or_create_page (self); - idx = gtk_assistant_append_page (GTK_ASSISTANT (self), page); - priv->enter_or_create_page = page; - update_create_page_buttons (self); - - gtk_assistant_set_current_page (GTK_ASSISTANT (self), idx); - - account_assistant_finish_enter_or_create_page (self, - priv->first_resp == RESPONSE_ENTER_ACCOUNT ? - TRUE : FALSE); -} - -static void -account_assistant_account_enabled_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GError *error = NULL; - EmpathyAccountAssistant *self = user_data; - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - const gchar *protocol; - TpAccount *account = TP_ACCOUNT (source); - gint current_idx; - gboolean salut_created = FALSE; - - tp_account_set_enabled_finish (account, result, &error); - - if (error) - { - g_warning ("Error enabling an account: %s", error->message); - g_error_free (error); - } - - protocol = tp_account_get_protocol (account); - if (!tp_strdiff (protocol, "local-xmpp")) - { - salut_created = TRUE; - } - - empathy_connect_new_account (account, priv->account_mgr); - - current_idx = gtk_assistant_get_current_page (GTK_ASSISTANT (self)); - if (current_idx == PAGE_SALUT && !salut_created) - /* We are on the Salut page and aren't creating the salut account so don't - * terminate the assistant. */ - return; - - if (priv->create_enter_resp == RESPONSE_CREATE_STOP) - g_signal_emit_by_name (self, "close"); - else - account_assistant_reset_enter_create_page (self); -} - -static void -account_assistant_apply_account_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GError *error = NULL; - EmpathyAccountAssistant *self = user_data; - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source); - TpAccount *account; - - empathy_account_settings_apply_finish (settings, result, NULL, &error); - - priv->is_creating = FALSE; - - if (error != NULL) - { - account_assistant_present_error_page (self, error, - gtk_assistant_get_current_page (GTK_ASSISTANT (self))); - g_error_free (error); - return; - } - - /* enable the newly created account */ - account = empathy_account_settings_get_account (settings); - tp_account_set_enabled_async (account, TRUE, - account_assistant_account_enabled_cb, self); -} - -static void -account_assistant_apply_account_and_finish (EmpathyAccountAssistant *self, - EmpathyAccountSettings *settings, - gboolean set_display_name) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - - if (settings == NULL) - return; - - priv->is_creating = TRUE; - - if (set_display_name) - { - gchar *display_name; - - display_name = empathy_account_widget_get_default_display_name ( - priv->current_widget_object); - - empathy_account_settings_set_display_name_async (settings, - display_name, NULL, NULL); - - g_free (display_name); - } - - empathy_account_settings_apply_async (settings, - account_assistant_apply_account_cb, self); -} - -static void -account_assistant_handle_apply_cb (EmpathyAccountWidget *widget_object, - gboolean is_valid, - EmpathyAccountAssistant *self) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - - gtk_assistant_set_page_complete (GTK_ASSISTANT (self), - priv->enter_or_create_page, is_valid); -} - -static void -account_assistant_protocol_changed_cb (GtkComboBox *chooser, - EmpathyAccountAssistant *self) -{ - EmpathyAccountSettings *settings; - EmpathyAccountAssistantPriv *priv; - GtkWidget *account_widget; - EmpathyAccountWidget *widget_object = NULL; - - priv = GET_PRIV (self); - - settings = empathy_protocol_chooser_create_account_settings ( - EMPATHY_PROTOCOL_CHOOSER (chooser)); - - if (settings == NULL) - return; - - if (priv->first_resp == RESPONSE_CREATE_ACCOUNT) - empathy_account_settings_set_boolean (settings, "register", TRUE); - - widget_object = empathy_account_widget_new_for_protocol (settings, TRUE); - account_widget = empathy_account_widget_get_widget (widget_object); - - if (priv->current_account_widget != NULL) - { - g_signal_handlers_disconnect_by_func (priv->current_widget_object, - account_assistant_handle_apply_cb, self); - gtk_widget_destroy (priv->current_account_widget); - } - - priv->current_account_widget = account_widget; - priv->current_widget_object = widget_object; - - if (priv->settings != NULL) - g_object_unref (priv->settings); - - priv->settings = settings; - - g_signal_connect (priv->current_widget_object, "handle-apply", - G_CALLBACK (account_assistant_handle_apply_cb), self); - - if (empathy_account_settings_is_valid (settings)) - { - gtk_assistant_set_page_complete (GTK_ASSISTANT (self), - priv->enter_or_create_page, TRUE); - } - - gtk_box_pack_start (GTK_BOX (priv->enter_or_create_page), account_widget, - FALSE, FALSE, 0); - gtk_widget_show (account_widget); -} - -static gboolean -account_assistant_chooser_enter_details_filter_func ( - TpConnectionManager *cm, - TpConnectionManagerProtocol *protocol, - const gchar *service, - gpointer user_data) -{ - if (!tp_strdiff (protocol->name, "local-xmpp")) - return FALSE; - - return TRUE; -} - -static gboolean -account_assistant_chooser_create_account_filter_func ( - TpConnectionManager *cm, - TpConnectionManagerProtocol *protocol, - const gchar *service, - gpointer user_data) -{ - if (service != NULL) - return FALSE; - - return tp_connection_manager_protocol_can_register (protocol); -} - -static void -account_assistant_finish_enter_or_create_page (EmpathyAccountAssistant *self, - gboolean is_enter) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - - if (is_enter) - { - gtk_label_set_label (GTK_LABEL (priv->first_label), - _("What kind of chat account do you have?")); - /* gtk_label_set_label (GTK_LABEL (priv->second_label), - _("If you have other accounts to set up, you can do " - "that at any time from the Edit menu.")); - */ - gtk_label_set_label (GTK_LABEL (priv->second_label), - _("Do you have any other chat accounts you want to set up?")); - empathy_protocol_chooser_set_visible ( - EMPATHY_PROTOCOL_CHOOSER (priv->chooser), - account_assistant_chooser_enter_details_filter_func, self); - - gtk_assistant_set_page_title (GTK_ASSISTANT (self), - priv->enter_or_create_page, _("Enter your account details")); - } - else - { - gtk_label_set_label (GTK_LABEL (priv->first_label), - _("What kind of chat account do you want to create?")); - /* gtk_label_set_label (GTK_LABEL (priv->second_label), - _("You can register other accounts, or setup " - "an existing one at any time from the Edit menu.")); - */ - gtk_label_set_label (GTK_LABEL (priv->second_label), - _("Do you want to create other chat accounts?")); - empathy_protocol_chooser_set_visible ( - EMPATHY_PROTOCOL_CHOOSER (priv->chooser), - account_assistant_chooser_create_account_filter_func, self); - - gtk_assistant_set_page_title (GTK_ASSISTANT (self), - priv->enter_or_create_page, - _("Enter the details for the new account")); - } - - g_signal_connect (priv->chooser, "changed", - G_CALLBACK (account_assistant_protocol_changed_cb), self); - - /* trigger show the first account widget */ - account_assistant_protocol_changed_cb (GTK_COMBO_BOX (priv->chooser), self); -} - -static gint -account_assistant_page_forward_func (gint current_page, - gpointer user_data) -{ - EmpathyAccountAssistant *self = user_data; - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - gint retval; - - retval = current_page; - - if (current_page == PAGE_INTRO) - { - if (priv->first_resp == RESPONSE_ENTER_ACCOUNT || - priv->first_resp == RESPONSE_CREATE_ACCOUNT) - retval = PAGE_ENTER_CREATE; - else if (priv->first_resp == RESPONSE_IMPORT) - retval = PAGE_IMPORT; - else if (priv->first_resp == RESPONSE_SALUT_ONLY) - retval = PAGE_SALUT; - } - else if (current_page == PAGE_IMPORT) - { - if (priv->display_salut_page) - retval = PAGE_SALUT; - else - /* Don't go forward */ - retval = -1; - } - else if (current_page == PAGE_SALUT) - { - /* Don't go forward */ - retval = -1; - } - else if (current_page >= PAGE_ENTER_CREATE) - { - if (priv->create_enter_resp == RESPONSE_CREATE_AGAIN) - { - priv->enter_create_forward = TRUE; - retval = current_page; - } - else if (priv->display_salut_page) - { - retval = PAGE_SALUT; - } - else - { - /* Don't go forward */ - retval = -1; - } - } - - return retval; -} - -static void -update_intro_page_buttons (EmpathyAccountAssistant *self) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - GtkWidget *intro_page; - - intro_page = gtk_assistant_get_nth_page (GTK_ASSISTANT (self), - PAGE_INTRO); - - if (priv->first_resp == RESPONSE_SALUT_ONLY && - !priv->display_salut_page) - gtk_assistant_set_page_type (GTK_ASSISTANT (self), intro_page, - GTK_ASSISTANT_PAGE_SUMMARY); - else - gtk_assistant_set_page_type (GTK_ASSISTANT (self), intro_page, - GTK_ASSISTANT_PAGE_INTRO); -} - -static void -account_assistant_radio_choice_toggled_cb (GtkToggleButton *button, - EmpathyAccountAssistant *self) -{ - FirstPageResponse response; - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - - response = GPOINTER_TO_INT (g_object_get_data - (G_OBJECT (button), "response")); - - priv->first_resp = response; - - update_intro_page_buttons (self); -} - -static GtkWidget * -account_assistant_build_introduction_page (EmpathyAccountAssistant *self) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - GtkWidget *main_vbox, *hbox_1, *w, *vbox_1; - GtkWidget *radio = NULL; - GdkPixbuf *pix; - const gchar *str; - - main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_widget_show (main_vbox); - gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - - hbox_1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - gtk_box_pack_start (GTK_BOX (main_vbox), hbox_1, TRUE, TRUE, 0); - gtk_widget_show (hbox_1); - - w = gtk_label_new ( - _("With Empathy you can chat with people " - "online nearby and with friends and colleagues " - "who use Google Talk, AIM, Windows Live " - "and many other chat programs. With a microphone " - "or a webcam you can also have audio or video calls.")); - gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5); - gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); - gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 0); - gtk_widget_show (w); - - pix = empathy_pixbuf_from_icon_name_sized ("empathy", 80); - w = gtk_image_new_from_pixbuf (pix); - gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 6); - gtk_widget_show (w); - - g_object_unref (pix); - - w = gtk_label_new (_("Do you have an account you've been using " - "with another chat program?")); - gtk_misc_set_alignment (GTK_MISC (w), 0, 0); - gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); - gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0); - gtk_widget_show (w); - - w = gtk_alignment_new (0, 0, 0, 0); - gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0); - gtk_box_pack_start (GTK_BOX (main_vbox), w, TRUE, TRUE, 0); - gtk_widget_show (w); - - vbox_1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_set_homogeneous (GTK_BOX (vbox_1), TRUE); - gtk_container_add (GTK_CONTAINER (w), vbox_1); - gtk_widget_show (vbox_1); - - if (empathy_import_accounts_to_import ()) - { - hbox_1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (vbox_1), hbox_1, TRUE, TRUE, 0); - gtk_widget_show (hbox_1); - - radio = gtk_radio_button_new_with_label (NULL, - _("Yes, import my account details from ")); - gtk_box_pack_start (GTK_BOX (hbox_1), radio, TRUE, TRUE, 0); - g_object_set_data (G_OBJECT (radio), "response", - GINT_TO_POINTER (RESPONSE_IMPORT)); - gtk_widget_show (radio); - - w = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w), "Pidgin"); - gtk_box_pack_start (GTK_BOX (hbox_1), w, TRUE, TRUE, 0); - gtk_combo_box_set_active (GTK_COMBO_BOX (w), 0); - gtk_widget_show (w); - - g_signal_connect (radio, "clicked", - G_CALLBACK (account_assistant_radio_choice_toggled_cb), self); - priv->first_resp = RESPONSE_IMPORT; - } - else - { - priv->first_resp = RESPONSE_ENTER_ACCOUNT; - } - - str = _("Yes, I'll enter my account details now"); - - if (radio == NULL) - { - radio = gtk_radio_button_new_with_label (NULL, str); - w = radio; - } - else - { - w = gtk_radio_button_new_with_label_from_widget ( - GTK_RADIO_BUTTON (radio), str); - } - - gtk_box_pack_start (GTK_BOX (vbox_1), w, TRUE, TRUE, 0); - g_object_set_data (G_OBJECT (w), "response", - GINT_TO_POINTER (RESPONSE_ENTER_ACCOUNT)); - gtk_widget_show (w); - - g_signal_connect (w, "clicked", - G_CALLBACK (account_assistant_radio_choice_toggled_cb), self); - - w = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio), - _("No, I want a new account")); - gtk_box_pack_start (GTK_BOX (vbox_1), w, TRUE, TRUE, 0); - g_object_set_data (G_OBJECT (w), "response", - GINT_TO_POINTER (RESPONSE_CREATE_ACCOUNT)); - gtk_widget_show (w); - - g_signal_connect (w, "clicked", - G_CALLBACK (account_assistant_radio_choice_toggled_cb), self); - - w = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio), - _("No, I just want to see people online nearby for now")); - gtk_box_pack_start (GTK_BOX (vbox_1), w, TRUE, TRUE, 0); - g_object_set_data (G_OBJECT (w), "response", - GINT_TO_POINTER (RESPONSE_SALUT_ONLY)); - gtk_widget_show (w); - - g_signal_connect (w, "clicked", - G_CALLBACK (account_assistant_radio_choice_toggled_cb), self); - - return main_vbox; -} - -static GtkWidget * -account_assistant_build_import_page (EmpathyAccountAssistant *self) -{ - GtkWidget *main_vbox, *w, *import; - EmpathyImportWidget *iw; - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - - main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - w = gtk_label_new (_("Select the accounts you want to import:")); - gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5); - gtk_widget_show (w); - gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 6); - - w = gtk_alignment_new (0, 0, 1, 1); - gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0); - gtk_box_pack_start (GTK_BOX (main_vbox), w, TRUE, TRUE, 0); - gtk_widget_show (w); - - /* NOTE: this is hardcoded as we support pidgin only */ - iw = empathy_import_widget_new (EMPATHY_IMPORT_APPLICATION_PIDGIN); - import = empathy_import_widget_get_widget (iw); - gtk_container_add (GTK_CONTAINER (w), import); - gtk_widget_show (import); - - priv->iw = iw; - - gtk_widget_show (main_vbox); - - return main_vbox; -} - -static void -account_assistant_radio_create_again_clicked_cb (GtkButton *button, - EmpathyAccountAssistant *self) -{ - CreateEnterPageResponse response; - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - - response = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), - "response")); - - priv->create_enter_resp = response; - - update_create_page_buttons (self); -} - -static GtkWidget * -account_assistant_build_enter_or_create_page (EmpathyAccountAssistant *self) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - GtkWidget *main_vbox, *w, *chooser, *vbox, *hbox, *radio; - - main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_widget_show (main_vbox); - - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); - - w = gtk_label_new (NULL); - gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0); - gtk_widget_show (w); - priv->first_label = w; - - w = gtk_alignment_new (0, 0, 0, 0); - gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0); - gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0); - gtk_widget_show (w); - - chooser = empathy_protocol_chooser_new (); - gtk_box_pack_start (GTK_BOX (hbox), chooser, FALSE, FALSE, 0); - gtk_widget_show (chooser); - priv->chooser = chooser; - - vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - gtk_box_pack_end (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0); - gtk_widget_show (vbox); - - w = gtk_label_new (NULL); - gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0); - gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); - gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5); - gtk_widget_show (w); - priv->second_label = w; - - w = gtk_alignment_new (0, 0, 0, 0); - gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0); - gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0); - gtk_widget_show (w); - - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_container_add (GTK_CONTAINER (w), hbox); - gtk_widget_show (hbox); - - radio = gtk_radio_button_new_with_label (NULL, _("Yes")); - gtk_box_pack_start (GTK_BOX (hbox), radio, FALSE, FALSE, 0); - g_object_set_data (G_OBJECT (radio), "response", - GINT_TO_POINTER (RESPONSE_CREATE_AGAIN)); - gtk_widget_show (radio); - - w = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio), - _("No, that's all for now")); - gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0); - g_object_set_data (G_OBJECT (w), "response", - GINT_TO_POINTER (RESPONSE_CREATE_STOP)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE); - priv->create_enter_resp = RESPONSE_CREATE_STOP; - priv->create_again_radio = w; - gtk_widget_show (w); - - g_signal_connect (w, "clicked", - G_CALLBACK (account_assistant_radio_create_again_clicked_cb), self); - g_signal_connect (radio, "clicked", - G_CALLBACK (account_assistant_radio_create_again_clicked_cb), self); - - return main_vbox; -} - -static void -account_assistant_close_cb (GtkAssistant *assistant, - gpointer user_data) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (assistant); - - if (priv->is_creating) - return; - - gtk_widget_destroy (GTK_WIDGET (assistant)); -} - -static void -impl_signal_apply (GtkAssistant *assistant) -{ - EmpathyAccountAssistant *self = EMPATHY_ACCOUNT_ASSISTANT (assistant); - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - gint current_page; - - current_page = gtk_assistant_get_current_page (assistant); - - if (current_page == PAGE_SALUT) - { - if (priv->create_salut_account) - /* create_salut_account_settings() already set the display name of the - * account so there is no need to set it again. */ - account_assistant_apply_account_and_finish (self, priv->salut_settings, - FALSE); - return; - } - else if (current_page >= PAGE_ENTER_CREATE && - priv->settings != NULL && - empathy_account_settings_is_valid (priv->settings)) - { - account_assistant_apply_account_and_finish (self, priv->settings, TRUE); - g_object_unref (priv->settings); - priv->settings = NULL; - } - else if (current_page == PAGE_IMPORT) - { - empathy_import_widget_add_selected_accounts (priv->iw); - } -} - -static void -impl_signal_cancel (GtkAssistant *assistant) -{ - gtk_widget_destroy (GTK_WIDGET (assistant)); -} - -static void -impl_signal_prepare (GtkAssistant *assistant, - GtkWidget *current_page) -{ - EmpathyAccountAssistant *self = EMPATHY_ACCOUNT_ASSISTANT (assistant); - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - gint current_idx; - - /* check from which page we are coming from */ - if (priv->current_page_id == PAGE_IMPORT) - empathy_import_widget_add_selected_accounts (priv->iw); - - current_idx = gtk_assistant_get_current_page (assistant); - priv->current_page_id = current_idx; - - if (current_idx >= PAGE_ENTER_CREATE) - { - if (!priv->enter_create_forward && current_idx != PAGE_SALUT) - { - account_assistant_finish_enter_or_create_page (self, - priv->first_resp == RESPONSE_ENTER_ACCOUNT ? - TRUE : FALSE); - } - else - { - priv->enter_create_forward = FALSE; - } - - if (priv->settings != NULL && - empathy_account_settings_is_valid (priv->settings)) - { - account_assistant_apply_account_and_finish (self, priv->settings, - TRUE); - g_object_unref (priv->settings); - priv->settings = NULL; - } - } -} - -static void -do_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (object); - - switch (property_id) - { - case PROP_PARENT: - g_value_set_object (value, priv->parent_window); - break; - case PROP_CONNECTION_MGRS: - g_value_set_object (value, priv->connection_mgrs); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } -} - -static void -do_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (object); - - switch (property_id) - { - case PROP_PARENT: - priv->parent_window = g_value_get_object (value); - break; - case PROP_CONNECTION_MGRS: - priv->connection_mgrs = g_value_dup_object (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } -} - -static void -do_dispose (GObject *obj) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (obj); - - if (priv->dispose_run) - return; - - priv->dispose_run = TRUE; - - if (priv->settings != NULL) - { - g_object_unref (priv->settings); - priv->settings = NULL; - } - - g_object_unref (priv->account_mgr); - priv->account_mgr = NULL; - - g_object_unref (priv->connection_mgrs); - priv->connection_mgrs = NULL; - - if (G_OBJECT_CLASS (empathy_account_assistant_parent_class)->dispose != NULL) - G_OBJECT_CLASS (empathy_account_assistant_parent_class)->dispose (obj); -} - -static void -empathy_account_assistant_class_init (EmpathyAccountAssistantClass *klass) -{ - GObjectClass *oclass = G_OBJECT_CLASS (klass); - GtkAssistantClass *gtkclass = GTK_ASSISTANT_CLASS (klass); - GParamSpec *param_spec; - - oclass->get_property = do_get_property; - oclass->set_property = do_set_property; - oclass->constructed = do_constructed; - oclass->dispose = do_dispose; - - gtkclass->apply = impl_signal_apply; - gtkclass->prepare = impl_signal_prepare; - gtkclass->cancel = impl_signal_cancel; - - param_spec = g_param_spec_object ("parent-window", - "parent-window", "The parent window", - GTK_TYPE_WINDOW, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); - g_object_class_install_property (oclass, PROP_PARENT, param_spec); - - param_spec = g_param_spec_object ("connection-managers", - "connection-managers", "A EmpathyConnectionManagers", - EMPATHY_TYPE_CONNECTION_MANAGERS, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); - g_object_class_install_property (oclass, PROP_CONNECTION_MGRS, param_spec); - - g_type_class_add_private (klass, sizeof (EmpathyAccountAssistantPriv)); -} - -static void -create_salut_check_box_toggled_cb (GtkWidget *widget, - EmpathyAccountAssistant *self) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - gboolean sensitive; - gboolean page_valid; - - sensitive = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - - gtk_widget_set_sensitive (priv->salut_account_widget, sensitive); - - if (!sensitive) - { - page_valid = TRUE; - priv->create_salut_account = FALSE; - } - else - { - /* page is complete if the account is valid */ - page_valid = empathy_account_settings_is_valid (priv->salut_settings); - priv->create_salut_account = TRUE; - } - - gtk_assistant_set_page_complete (GTK_ASSISTANT (self), priv->salut_page, - page_valid); -} - -static void -account_assistant_salut_handle_apply_cb (EmpathyAccountWidget *widget_object, - gboolean is_valid, - EmpathyAccountAssistant *self) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - - gtk_assistant_set_page_complete (GTK_ASSISTANT (self), - priv->salut_page, is_valid); -} - -static GtkWidget * -account_assistant_build_salut_page (EmpathyAccountAssistant *self) -{ - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - GtkWidget *main_vbox, *hbox_1, *w; - GdkPixbuf *pix; - EmpathyAccountSettings *settings; - GtkWidget *account_widget; - EmpathyAccountWidget *widget_object; - gchar *markup; - - main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_widget_show (main_vbox); - gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - - hbox_1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - gtk_box_pack_start (GTK_BOX (main_vbox), hbox_1, TRUE, TRUE, 0); - gtk_widget_show (hbox_1); - - w = gtk_label_new (NULL); - markup = g_strdup_printf ("%s (%s).", - _("Empathy can automatically discover and chat with the people " - "connected on the same network as you. " - "If you want to use this feature, please check that the " - "details below are correct. " - "You can easily change these details later or disable this feature " - "by using the 'Accounts' dialog"), - _("Edit->Accounts")); - gtk_label_set_markup (GTK_LABEL (w), markup); - g_free (markup); - gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5); - gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); - gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 0); - gtk_widget_show (w); - - pix = empathy_pixbuf_from_icon_name_sized ("im-local-xmpp", 80); - w = gtk_image_new_from_pixbuf (pix); - gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 6); - gtk_widget_show (w); - - g_object_unref (pix); - - w = gtk_check_button_new_with_mnemonic ( - _("I do _not want to enable this feature for now")); - gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0); - g_signal_connect (w, "toggled", - G_CALLBACK (create_salut_check_box_toggled_cb), self); - gtk_widget_show (w); - - w = gtk_alignment_new (0, 0, 0, 0); - gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0); - gtk_box_pack_start (GTK_BOX (main_vbox), w, TRUE, TRUE, 0); - gtk_widget_show (w); - - settings = create_salut_account_settings (); - - widget_object = empathy_account_widget_new_for_protocol (settings, TRUE); - account_widget = empathy_account_widget_get_widget (widget_object); - - priv->salut_settings = settings; - priv->salut_account_widget = account_widget; - - g_signal_connect (widget_object, "handle-apply", - G_CALLBACK (account_assistant_salut_handle_apply_cb), self); - - gtk_box_pack_start (GTK_BOX (main_vbox), account_widget, - FALSE, FALSE, 0); - gtk_widget_show (account_widget); - - return main_vbox; -} - -static GtkWidget * -account_assistant_build_salut_error_page (EmpathyAccountAssistant *self) -{ - GtkWidget *vbox; - gchar *markup; - - markup = g_strdup_printf ("%s (%s).", - _("You won't be able to chat with people connected to your local " - "network, as telepathy-salut is not installed. If you want to enable " - "this feature, please install the telepathy-salut package and create " - "a People Nearby account from the Accounts dialog"), - _("Edit->Accounts")); - - vbox = build_error_vbox (_("telepathy-salut not installed"), markup); - g_free (markup); - return vbox; -} - -static void -account_mgr_prepare_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - EmpathyAccountAssistant *self = user_data; - EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object); - GError *error = NULL; - - if (!tp_proxy_prepare_finish (manager, result, &error)) - { - DEBUG ("Failed to prepare account manager: %s", error->message); - g_error_free (error); - return; - } - - if (!should_create_salut_account (manager)) - { - DEBUG ("No need to create a Salut account"); - priv->display_salut_page = FALSE; - - update_intro_page_buttons (self); - - gtk_assistant_set_page_type (GTK_ASSISTANT (self), priv->import_page, - GTK_ASSISTANT_PAGE_CONFIRM); - - update_create_page_buttons (self); - } -} - -static void -empathy_account_assistant_init (EmpathyAccountAssistant *self) -{ - EmpathyAccountAssistantPriv *priv; - - priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_ACCOUNT_ASSISTANT, - EmpathyAccountAssistantPriv); - self->priv = priv; - - gtk_window_set_title (GTK_WINDOW (self), - _("Messaging and VoIP Accounts Assistant")); - - priv->account_mgr = tp_account_manager_dup (); -} - -static void -do_constructed (GObject *object) -{ - GtkAssistant *assistant = GTK_ASSISTANT (object); - EmpathyAccountAssistant *self = EMPATHY_ACCOUNT_ASSISTANT (object); - EmpathyAccountAssistantPriv *priv = GET_PRIV (object); - GtkWidget *page; - - /* set us as transient for the parent window if any */ - if (priv->parent_window) - gtk_window_set_transient_for (GTK_WINDOW (object), - priv->parent_window); - - /* set the dialog hint, so this will be centered over the parent window */ - gtk_window_set_type_hint (GTK_WINDOW (object), GDK_WINDOW_TYPE_HINT_DIALOG); - - g_assert (priv->connection_mgrs != NULL); - g_assert (empathy_connection_managers_is_ready (priv->connection_mgrs)); - - g_signal_connect (self, "close", - G_CALLBACK (account_assistant_close_cb), NULL); - - gtk_assistant_set_forward_page_func (assistant, - account_assistant_page_forward_func, self, NULL); - - /* first page (introduction) */ - page = account_assistant_build_introduction_page (self); - gtk_assistant_append_page (assistant, page); - gtk_assistant_set_page_title (assistant, page, - _("Welcome to Empathy")); - gtk_assistant_set_page_type (assistant, page, - GTK_ASSISTANT_PAGE_INTRO); - gtk_assistant_set_page_complete (assistant, page, TRUE); - - /* second page (import accounts) */ - page = account_assistant_build_import_page (self); - gtk_assistant_append_page (assistant, page); - gtk_assistant_set_page_title (assistant, page, - _("Import your existing accounts")); - gtk_assistant_set_page_complete (assistant, page, TRUE); - gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT); - priv->import_page = page; - - /* third page (enter account details) */ - page = account_assistant_build_enter_or_create_page (self); - gtk_assistant_append_page (assistant, page); - gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT); - priv->enter_or_create_page = page; - - /* fourth page (salut details) */ - if (empathy_connection_managers_get_cm (priv->connection_mgrs, "salut") - != NULL) - { - page = account_assistant_build_salut_page (self); - gtk_assistant_append_page (assistant, page); - gtk_assistant_set_page_title (assistant, page, - _("Please enter personal details")); - gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONFIRM); - - priv->create_salut_account = TRUE; - - if (empathy_account_settings_is_valid (priv->salut_settings)) - { - gtk_assistant_set_page_complete (GTK_ASSISTANT (self), - page, TRUE); - } - } - else - { - page = account_assistant_build_salut_error_page (self); - gtk_assistant_append_page (assistant, page); - gtk_assistant_set_page_title (assistant, page, _("An error occurred")); - gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_SUMMARY); - - priv->create_salut_account = FALSE; - } - - priv->salut_page = page; - priv->display_salut_page = TRUE; - - tp_proxy_prepare_async (priv->account_mgr, NULL, - account_mgr_prepare_cb, self); - - gtk_window_set_resizable (GTK_WINDOW (self), FALSE); -} - -GtkWidget * -empathy_account_assistant_show (GtkWindow *window, - EmpathyConnectionManagers *connection_mgrs) -{ - static GtkWidget *dialog = NULL; - - if (dialog == NULL) - { - dialog = g_object_new (EMPATHY_TYPE_ACCOUNT_ASSISTANT, - "parent-window", window, - "connection-managers", connection_mgrs, - NULL); - g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer *) &dialog); - } - - gtk_window_present (GTK_WINDOW (dialog)); - - return dialog; -} - - diff --git a/src/empathy-account-assistant.h b/src/empathy-account-assistant.h deleted file mode 100644 index d99475fe..00000000 --- a/src/empathy-account-assistant.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2009 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Cosimo Cecchi - */ - -/* empathy-account-assistant.h */ - -#ifndef __EMPATHY_ACCOUNT_ASSISTANT_H__ -#define __EMPATHY_ACCOUNT_ASSISTANT_H__ - -#include -#include - -#include - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_ACCOUNT_ASSISTANT empathy_account_assistant_get_type() -#define EMPATHY_ACCOUNT_ASSISTANT(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_ACCOUNT_ASSISTANT,\ - EmpathyAccountAssistant)) -#define EMPATHY_ACCOUNT_ASSISTANT_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_ACCOUNT_ASSISTANT,\ - EmpathyAccountAssistantClass)) -#define EMPATHY_IS_ACCOUNT_ASSISTANT(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_ACCOUNT_ASSISTANT)) -#define EMPATHY_IS_ACCOUNT_ASSISTANT_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_ACCOUNT_ASSISTANT)) -#define EMPATHY_ACCOUNT_ASSISTANT_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ACCOUNT_ASSISTANT,\ - EmpathyAccountAssistantClass)) - -typedef struct { - GtkAssistant parent; - - /* private */ - gpointer priv; -} EmpathyAccountAssistant; - -typedef struct { - GtkAssistantClass parent_class; -} EmpathyAccountAssistantClass; - -GType empathy_account_assistant_get_type (void); - -GtkWidget *empathy_account_assistant_show (GtkWindow *parent, - EmpathyConnectionManagers *connection_mgrs); - -G_END_DECLS - -#endif /* __EMPATHY_ACCOUNT_ASSISTANT_H__ */ diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c index 88d14c32..f6bb4027 100644 --- a/src/empathy-accounts-common.c +++ b/src/empathy-accounts-common.c @@ -41,8 +41,6 @@ #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" -#include "empathy-account-assistant.h" -#include "empathy-auto-salut-account-helper.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT #include @@ -82,13 +80,16 @@ empathy_accounts_has_accounts (TpAccountManager *manager) return has_accounts; } -static void -do_show_accounts_ui (TpAccountManager *manager, +void +empathy_accounts_show_accounts_ui (TpAccountManager *manager, TpAccount *account, GApplication *app) { static GtkWidget *accounts_window = NULL; + g_return_if_fail (TP_IS_ACCOUNT_MANAGER (manager)); + g_return_if_fail (!account || TP_IS_ACCOUNT (account)); + if (accounts_window == NULL) { accounts_window = empathy_accounts_dialog_show (NULL, account); @@ -99,63 +100,3 @@ do_show_accounts_ui (TpAccountManager *manager, gtk_window_present (GTK_WINDOW (accounts_window)); } - -static GtkWidget * -show_account_assistant (EmpathyConnectionManagers *connection_mgrs, - GApplication *app) -{ - GtkWidget *assistant; - - assistant = empathy_account_assistant_show (NULL, connection_mgrs); - - gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (assistant)); - - return assistant; -} - -static void -connection_managers_prepare_for_accounts (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - EmpathyConnectionManagers *cm_mgr = EMPATHY_CONNECTION_MANAGERS (source); - GApplication *app = user_data; - - if (!empathy_connection_managers_prepare_finish (cm_mgr, result, NULL)) - goto out; - - show_account_assistant (cm_mgr, app); - DEBUG ("would show the account assistant"); - -out: - g_object_unref (cm_mgr); - g_application_release (app); -} - -void -empathy_accounts_show_accounts_ui (TpAccountManager *manager, - TpAccount *account, - gboolean assistant, - GApplication *app) -{ - g_return_if_fail (TP_IS_ACCOUNT_MANAGER (manager)); - g_return_if_fail (!account || TP_IS_ACCOUNT (account)); - - if ((empathy_accounts_has_non_salut_accounts (manager) && !assistant) || - account != NULL) - { - do_show_accounts_ui (manager, account, app); - } - else - { - EmpathyConnectionManagers *cm_mgr; - - cm_mgr = empathy_connection_managers_dup_singleton (); - - /* Hold the application while preparing cm_mgr */ - g_application_hold (app); - - empathy_connection_managers_prepare_async (cm_mgr, - connection_managers_prepare_for_accounts, app); - } -} diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h index f9294fbd..39d094d2 100644 --- a/src/empathy-accounts-common.h +++ b/src/empathy-accounts-common.h @@ -28,7 +28,6 @@ gboolean empathy_accounts_has_accounts (TpAccountManager *manager); void empathy_accounts_show_accounts_ui (TpAccountManager *manager, TpAccount *account, - gboolean assistant, GApplication *app); #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */ diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 9e2fea78..b2b57dec 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -21,6 +21,7 @@ * Xavier Claessens * Cosimo Cecchi * Jonathan Tellier + * Danielle Madeley */ #include @@ -31,6 +32,7 @@ #include #include #include +#include #include #include @@ -39,6 +41,7 @@ #include #include #include +#include #include #include @@ -46,8 +49,12 @@ #include #include #include +#include #include +#include +#include +#include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" #include "empathy-import-dialog.h" #include "empathy-import-utils.h" @@ -73,7 +80,8 @@ G_DEFINE_TYPE (EmpathyAccountsDialog, empathy_accounts_dialog, GTK_TYPE_DIALOG); enum { NOTEBOOK_PAGE_ACCOUNT = 0, - NOTEBOOK_PAGE_LOADING + NOTEBOOK_PAGE_LOADING, + NOTEBOOK_PAGE_NO_PROTOCOL }; typedef struct { @@ -86,7 +94,6 @@ typedef struct { GtkWidget *image_status; GtkWidget *throbber; GtkWidget *enabled_switch; - GtkWidget *frame_no_protocol; GtkWidget *treeview; @@ -94,13 +101,10 @@ typedef struct { GtkWidget *button_remove; GtkWidget *button_import; - GtkWidget *combobox_protocol; - GtkWidget *hbox_protocol; - GtkWidget *image_type; GtkWidget *label_name; GtkWidget *label_type; - GtkWidget *settings_widget; + GtkWidget *dialog_content; GtkWidget *notebook_account; GtkWidget *spinner; @@ -157,21 +161,13 @@ enum { static EmpathyAccountSettings * accounts_dialog_model_get_selected_settings ( EmpathyAccountsDialog *dialog); -static gboolean accounts_dialog_get_settings_iter ( - EmpathyAccountsDialog *dialog, - EmpathyAccountSettings *settings, - GtkTreeIter *iter); - static void accounts_dialog_model_select_first (EmpathyAccountsDialog *dialog); static void accounts_dialog_update_settings (EmpathyAccountsDialog *dialog, EmpathyAccountSettings *settings); -static void accounts_dialog_add (EmpathyAccountsDialog *dialog, - EmpathyAccountSettings *settings); - static void accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog, - EmpathyAccountSettings *settings); + TpAccount *account); static void accounts_dialog_connection_changed_cb (TpAccount *account, guint old_status, @@ -191,6 +187,9 @@ static void accounts_dialog_model_selection_changed ( GtkTreeSelection *selection, EmpathyAccountsDialog *dialog); +static gboolean accounts_dialog_has_pending_change ( + EmpathyAccountsDialog *dialog, TpAccount **account); + static void accounts_dialog_update_name_label (EmpathyAccountsDialog *dialog, const gchar *display_name) @@ -213,6 +212,9 @@ accounts_dialog_status_infobar_set_message (EmpathyAccountsDialog *dialog, message_markup = g_markup_printf_escaped ("%s", message); gtk_label_set_markup (GTK_LABEL (priv->label_status), message_markup); + + gtk_widget_set_tooltip_text (priv->label_status, message); + g_free (message_markup); } @@ -497,28 +499,6 @@ empathy_account_dialog_widget_cancelled_cb ( empathy_account_dialog_cancel (dialog); } -static void -empathy_account_dialog_account_created_cb (EmpathyAccountWidget *widget_object, - TpAccount *account, - EmpathyAccountsDialog *dialog) -{ - EmpathyAccountSettings *settings = - accounts_dialog_model_get_selected_settings (dialog); - EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); - - accounts_dialog_update_settings (dialog, settings); - accounts_dialog_update_status_infobar (dialog, - empathy_account_settings_get_account (settings)); - - gtk_widget_set_sensitive (priv->treeview, TRUE); - gtk_widget_set_sensitive (priv->button_add, TRUE); - gtk_widget_set_sensitive (priv->button_remove, TRUE); - gtk_widget_set_sensitive (priv->button_import, TRUE); - - if (settings) - g_object_unref (settings); -} - static gboolean accounts_dialog_has_valid_accounts (EmpathyAccountsDialog *dialog) { @@ -542,19 +522,21 @@ accounts_dialog_has_valid_accounts (EmpathyAccountsDialog *dialog) } static void -account_dialog_create_settings_widget (EmpathyAccountsDialog *dialog, - EmpathyAccountSettings *settings) +account_dialog_create_edit_params_dialog (EmpathyAccountsDialog *dialog) { EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); - const gchar *icon_name; - TpAccount *account; + EmpathyAccountSettings *settings; + GtkWidget *subdialog, *content, *content_area, *align; - if (priv->setting_widget_object != NULL) - g_object_remove_weak_pointer (G_OBJECT (priv->setting_widget_object), - (gpointer *) &priv->setting_widget_object); + settings = accounts_dialog_model_get_selected_settings (dialog); + + subdialog = gtk_dialog_new_with_buttons (_("Edit Connection Parameters"), + GTK_WINDOW (dialog), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + NULL, NULL); priv->setting_widget_object = - empathy_account_widget_new_for_protocol (settings, FALSE); + empathy_account_widget_new_for_protocol (settings, FALSE); g_object_add_weak_pointer (G_OBJECT (priv->setting_widget_object), (gpointer *) &priv->setting_widget_object); @@ -563,17 +545,250 @@ account_dialog_create_settings_widget (EmpathyAccountsDialog *dialog, empathy_account_widget_set_other_accounts_exist ( priv->setting_widget_object, TRUE); - priv->settings_widget = - empathy_account_widget_get_widget (priv->setting_widget_object); + content = empathy_account_widget_get_widget (priv->setting_widget_object); - g_signal_connect (priv->setting_widget_object, "account-created", - G_CALLBACK (empathy_account_dialog_account_created_cb), dialog); g_signal_connect (priv->setting_widget_object, "cancelled", G_CALLBACK (empathy_account_dialog_widget_cancelled_cb), dialog); + g_signal_connect_swapped (priv->setting_widget_object, "close", + G_CALLBACK (gtk_widget_destroy), subdialog); + + content_area = gtk_dialog_get_content_area (GTK_DIALOG (subdialog)); + + align = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 0, 6, 6); + + gtk_container_add (GTK_CONTAINER (align), content); + gtk_box_pack_start (GTK_BOX (content_area), align, TRUE, TRUE, 0); + + gtk_widget_show (content); + gtk_widget_show (align); + gtk_widget_show (subdialog); +} + +static void +start_external_app (GAppInfo *app_info) +{ + GError *error = NULL; + GdkAppLaunchContext *context = NULL; + GdkDisplay *display; + + display = gdk_display_get_default (); + context = gdk_display_get_app_launch_context (display); + + if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context, + &error)) + { + g_critical ("Failed to bisho: %s", error->message); + g_clear_error (&error); + } + + tp_clear_object (&context); +} + +static void +use_external_storage_provider (EmpathyAccountsDialog *self, + TpAccount *account) +{ + const gchar *provider; + + provider = tp_account_get_storage_provider (account); + if (!tp_strdiff (provider, "com.meego.libsocialweb")) + { + GDesktopAppInfo *desktop_info; + gchar *cmd; + GAppInfo *app_info; + GError *error = NULL; + + desktop_info = g_desktop_app_info_new ("gnome-control-center.desktop"); + if (desktop_info == NULL) + { + g_critical ("Could not locate 'gnome-control-center.desktop'"); + return; + } + + /* glib doesn't have API to start a desktop file with args... (#637875) */ + cmd = g_strdup_printf ("%s bisho.desktop", g_app_info_get_commandline ( + (GAppInfo *) desktop_info)); + + app_info = g_app_info_create_from_commandline (cmd, NULL, 0, &error); + + if (app_info == NULL) + { + DEBUG ("Failed to create app info: %s", error->message); + g_error_free (error); + } + else + { + start_external_app (app_info); + g_object_unref (app_info); + } + + g_object_unref (desktop_info); + g_free (cmd); + return; + } + else if (!tp_strdiff (provider, "org.gnome.OnlineAccounts")) + { + GDesktopAppInfo *desktop_info; + + desktop_info = g_desktop_app_info_new ( + "gnome-online-accounts-panel.desktop"); + if (desktop_info == NULL) + { + g_critical ("Could not locate 'gnome-online-accounts-panel.desktop'"); + } + else + { + start_external_app (G_APP_INFO (desktop_info)); + g_object_unref (desktop_info); + } + + return; + } + else + { + DEBUG ("Don't know how to handle %s", provider); + return; + } +} + +static void +account_dialow_show_edit_params_dialog (EmpathyAccountsDialog *dialog, + GtkButton *button) +{ + EmpathyAccountSettings *settings; + TpAccount *account; + TpStorageRestrictionFlags storage_restrictions; + + settings = accounts_dialog_model_get_selected_settings (dialog); + + account = empathy_account_settings_get_account (settings); + g_return_if_fail (account != NULL); + + storage_restrictions = tp_account_get_storage_restrictions (account); + + /* Empathy can only edit accounts without the Cannot_Set_Parameters flag */ + if (storage_restrictions & TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS) + { + DEBUG ("Account is provided by an external storage provider"); + + use_external_storage_provider (dialog, account); + } + else + { + account_dialog_create_edit_params_dialog (dialog); + } +} + +static void +account_dialog_show_contact_details_failed (EmpathyAccountsDialog *dialog, + gboolean error) +{ + EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); + GtkWidget *infobar, *label; + + infobar = gtk_info_bar_new (); + + if (error) + { + gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), GTK_MESSAGE_ERROR); + label = gtk_label_new (_("Failed to retrieve your personal information " + "from the server.")); + } + else + { + gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), GTK_MESSAGE_INFO); + label = gtk_label_new (_("Go online to edit your personal information.")); + } + + gtk_container_add ( + GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar))), + label); + gtk_box_pack_start (GTK_BOX (priv->dialog_content), infobar, FALSE, FALSE, 0); + gtk_widget_show_all (infobar); +} + +static void +account_dialog_got_self_contact (TpConnection *conn, + EmpathyContact *contact, + const GError *in_error, + gpointer user_data, + GObject *dialog) +{ + EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); + GtkWidget *editor, *alig; + + if (in_error != NULL) + { + DEBUG ("Failed to get self-contact: %s", in_error->message); + account_dialog_show_contact_details_failed ( + EMPATHY_ACCOUNTS_DIALOG (dialog), TRUE); + return; + } + + alig = gtk_alignment_new (0.5, 0, 1, 1); + + /* create the contact info editor for this account */ + editor = empathy_contact_widget_new (contact, + EMPATHY_CONTACT_WIDGET_EDIT_ALIAS | + EMPATHY_CONTACT_WIDGET_EDIT_AVATAR | + EMPATHY_CONTACT_WIDGET_NO_STATUS | + EMPATHY_CONTACT_WIDGET_EDIT_DETAILS); + + gtk_box_pack_start (GTK_BOX (priv->dialog_content), alig, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (alig), editor); + gtk_widget_show (alig); + gtk_widget_show (editor); +} + +static void +account_dialog_create_dialog_content (EmpathyAccountsDialog *dialog, + EmpathyAccountSettings *settings) +{ + EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); + const gchar *icon_name; + TpAccount *account; + TpConnection *conn = NULL; + GtkWidget *bbox, *button; + + account = empathy_account_settings_get_account (settings); + + // if (priv->setting_widget_object != NULL) + // g_object_remove_weak_pointer (G_OBJECT (priv->setting_widget_object), + // (gpointer *) &priv->setting_widget_object); + + priv->dialog_content = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (priv->alignment_settings), - priv->settings_widget); - gtk_widget_show (priv->settings_widget); + priv->dialog_content); + gtk_widget_show (priv->dialog_content); + + /* request the self contact */ + if (account != NULL) + conn = tp_account_get_connection (account); + + if (conn != NULL) + { + empathy_tp_contact_factory_get_from_handle (conn, + tp_connection_get_self_handle (conn), + account_dialog_got_self_contact, + NULL, NULL, G_OBJECT (dialog)); + } + else + { + account_dialog_show_contact_details_failed (dialog, FALSE); + } + + bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END); + gtk_box_pack_end (GTK_BOX (priv->dialog_content), bbox, FALSE, TRUE, 0); + gtk_widget_show (bbox); + + button = gtk_button_new_with_mnemonic (_("_Edit Connection Parameters...")); + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, TRUE, 0); + gtk_widget_show (button); + g_signal_connect_swapped (button, "clicked", + G_CALLBACK (account_dialow_show_edit_params_dialog), dialog); icon_name = empathy_account_settings_get_icon_name (settings); @@ -594,7 +809,6 @@ account_dialog_create_settings_widget (EmpathyAccountsDialog *dialog, accounts_dialog_update_name_label (dialog, empathy_account_settings_get_display_name (settings)); - account = empathy_account_settings_get_account (settings); accounts_dialog_update_status_infobar (dialog, account); } @@ -604,7 +818,7 @@ account_dialog_settings_ready_cb (EmpathyAccountSettings *settings, EmpathyAccountsDialog *dialog) { if (empathy_account_settings_is_ready (settings)) - account_dialog_create_settings_widget (dialog, settings); + account_dialog_create_dialog_content (dialog, settings); } static void @@ -650,97 +864,6 @@ accounts_dialog_has_pending_change (EmpathyAccountsDialog *dialog, priv->setting_widget_object); } -static void -accounts_dialog_setup_ui_to_add_account (EmpathyAccountsDialog *dialog) -{ - EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); - EmpathyAccountSettings *settings; - - settings = empathy_protocol_chooser_create_account_settings ( - EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol)); - if (settings == NULL) - return; - - accounts_dialog_add (dialog, settings); - accounts_dialog_model_set_selected (dialog, settings); - - gtk_widget_show_all (priv->hbox_protocol); - - g_object_unref (settings); -} - -static void -accounts_dialog_protocol_changed_cb (GtkWidget *widget, - EmpathyAccountsDialog *dialog) -{ - EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - gboolean creating; - EmpathyAccountSettings *settings; - gchar *account = NULL, *password = NULL; - - /* The "changed" signal is fired during the initiation of the - * EmpathyProtocolChooser while populating the widget. Such signals should - * be ignored so we check if we are actually creating a new account. */ - if (priv->setting_widget_object == NULL) - return; - - g_object_get (priv->setting_widget_object, - "creating-account", &creating, NULL); - if (!creating) - return; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview)); - - if (!gtk_tree_selection_get_selected (selection, &model, &iter)) - return; - - /* Save "account" and "password" parameters */ - g_object_get (priv->setting_widget_object, "settings", &settings, NULL); - - if (settings != NULL) - { - account = g_strdup (empathy_account_settings_get_string (settings, - "account")); - password = g_strdup (empathy_account_settings_get_string (settings, - "password")); - g_object_unref (settings); - } - - /* We are creating a new widget to replace the current one, don't ask - * confirmation to the user. */ - priv->force_change_row = TRUE; - - /* We'll update the selection after we create the new account widgets; - * updating it right now causes problems for the # of accounts = zero case */ - g_signal_handlers_block_by_func (selection, - accounts_dialog_model_selection_changed, dialog); - - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); - - g_signal_handlers_unblock_by_func (selection, - accounts_dialog_model_selection_changed, dialog); - - accounts_dialog_setup_ui_to_add_account (dialog); - - /* Restore "account" and "password" parameters in the new widget */ - if (account != NULL) - { - empathy_account_widget_set_account_param (priv->setting_widget_object, - account); - g_free (account); - } - - if (password != NULL) - { - empathy_account_widget_set_password_param (priv->setting_widget_object, - password); - g_free (password); - } -} - static void accounts_dialog_show_question_dialog (EmpathyAccountsDialog *dialog, const gchar *primary_text, @@ -781,24 +904,6 @@ accounts_dialog_show_question_dialog (EmpathyAccountsDialog *dialog, gtk_widget_show (message_dialog); } -static void -accounts_dialog_add_pending_changes_response_cb (GtkDialog *message_dialog, - gint response_id, - gpointer *user_data) -{ - EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (user_data); - EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); - - gtk_widget_destroy (GTK_WIDGET (message_dialog)); - - if (response_id == GTK_RESPONSE_YES) - { - empathy_account_widget_discard_pending_changes ( - priv->setting_widget_object); - accounts_dialog_setup_ui_to_add_account (dialog); - } -} - static gchar * get_dialog_primary_text (TpAccount *account) { @@ -817,37 +922,32 @@ get_dialog_primary_text (TpAccount *account) static void accounts_dialog_button_add_clicked_cb (GtkWidget *button, - EmpathyAccountsDialog *dialog) + EmpathyAccountsDialog *self) { - TpAccount *account = NULL; - EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); + GtkWidget *dialog; + gint response; - if (accounts_dialog_has_pending_change (dialog, &account)) - { - gchar *question_dialog_primary_text = get_dialog_primary_text (account); + dialog = empathy_new_account_dialog_new (GTK_WINDOW (self)); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - accounts_dialog_show_question_dialog (dialog, - question_dialog_primary_text, - _("You are about to create a new account, which will discard\n" - "your changes. Are you sure you want to proceed?"), - G_CALLBACK (accounts_dialog_add_pending_changes_response_cb), - dialog, - GTK_STOCK_CANCEL, GTK_RESPONSE_NO, - GTK_STOCK_DISCARD, GTK_RESPONSE_YES, NULL); + response = gtk_dialog_run (GTK_DIALOG (dialog)); - g_free (question_dialog_primary_text); - } - else + if (response == GTK_RESPONSE_OK) { - accounts_dialog_setup_ui_to_add_account (dialog); - gtk_widget_set_sensitive (priv->treeview, FALSE); - gtk_widget_set_sensitive (priv->button_add, FALSE); - gtk_widget_set_sensitive (priv->button_remove, FALSE); - gtk_widget_set_sensitive (priv->button_import, FALSE); + EmpathyAccountSettings *settings; + TpAccount *account; + + settings = empathy_new_account_dialog_get_settings ( + EMPATHY_NEW_ACCOUNT_DIALOG (dialog)); + + /* The newly created account has already been added by + * accounts_dialog_account_validity_changed_cb so we just + * have to select it. */ + account = empathy_account_settings_get_account (settings); + accounts_dialog_model_set_selected (self, account); } - if (account != NULL) - g_object_unref (account); + gtk_widget_destroy (dialog); } static void @@ -883,38 +983,29 @@ accounts_dialog_update_settings (EmpathyAccountsDialog *dialog, return; } - if (empathy_connection_managers_get_cms_num (priv->cms) > 0) - { - /* We have no account configured but we have some - * profiles installed. The user obviously wants to add - * an account. Click on the Add button for him. */ - accounts_dialog_button_add_clicked_cb (priv->button_add, - dialog); - return; - } /* No account and no profile, warn the user */ gtk_widget_hide (priv->vbox_details); - gtk_widget_show (priv->frame_no_protocol); gtk_widget_set_sensitive (priv->button_add, FALSE); + + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook_account), + NOTEBOOK_PAGE_NO_PROTOCOL); return; } /* We have an account selected, destroy old settings and create a new * one for the account selected */ - gtk_widget_hide (priv->frame_no_protocol); gtk_widget_show (priv->vbox_details); - gtk_widget_hide (priv->hbox_protocol); - if (priv->settings_widget) + if (priv->dialog_content) { - gtk_widget_destroy (priv->settings_widget); - priv->settings_widget = NULL; + gtk_widget_destroy (priv->dialog_content); + priv->dialog_content = NULL; } if (empathy_account_settings_is_ready (settings)) { - account_dialog_create_settings_widget (dialog, settings); + account_dialog_create_dialog_content (dialog, settings); } else { @@ -1483,41 +1574,6 @@ accounts_dialog_model_setup (EmpathyAccountsDialog *dialog) g_object_unref (store); } -static gboolean -accounts_dialog_get_settings_iter (EmpathyAccountsDialog *dialog, - EmpathyAccountSettings *settings, - GtkTreeIter *iter) -{ - GtkTreeView *view; - GtkTreeModel *model; - gboolean ok; - EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); - - /* Update the status in the model */ - view = GTK_TREE_VIEW (priv->treeview); - model = gtk_tree_view_get_model (view); - - for (ok = gtk_tree_model_get_iter_first (model, iter); - ok; - ok = gtk_tree_model_iter_next (model, iter)) - { - EmpathyAccountSettings *this_settings; - gboolean equal; - - gtk_tree_model_get (model, iter, - COL_ACCOUNT_SETTINGS, &this_settings, - -1); - - equal = (this_settings == settings); - g_object_unref (this_settings); - - if (equal) - return TRUE; - } - - return FALSE; -} - static gboolean accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog, TpAccount *account, @@ -1536,15 +1592,15 @@ accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog, ok; ok = gtk_tree_model_iter_next (model, iter)) { - EmpathyAccountSettings *settings; + TpAccount *this_account; gboolean equal; gtk_tree_model_get (model, iter, - COL_ACCOUNT_SETTINGS, &settings, + COL_ACCOUNT, &this_account, -1); - equal = empathy_account_settings_has_account (settings, account); - g_object_unref (settings); + equal = (this_account == account); + g_object_unref (this_account); if (equal) return TRUE; @@ -1577,11 +1633,11 @@ select_and_scroll_to_iter (EmpathyAccountsDialog *dialog, static void accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog, - EmpathyAccountSettings *settings) + TpAccount *account) { GtkTreeIter iter; - if (accounts_dialog_get_settings_iter (dialog, settings, &iter)) + if (accounts_dialog_get_account_iter (dialog, account, &iter)) select_and_scroll_to_iter (dialog, &iter); } @@ -1679,27 +1735,6 @@ finally: return FALSE; } -static void -accounts_dialog_add (EmpathyAccountsDialog *dialog, - EmpathyAccountSettings *settings) -{ - GtkTreeModel *model; - GtkTreeIter iter; - const gchar *name; - EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview)); - name = empathy_account_settings_get_display_name (settings); - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - COL_NAME, name, - COL_STATUS, TP_CONNECTION_STATUS_DISCONNECTED, - COL_ACCOUNT_SETTINGS, settings, - -1); -} - static void accounts_dialog_connection_changed_cb (TpAccount *account, guint old_status, @@ -1824,6 +1859,7 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog, const gchar *name; EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); gboolean selected = FALSE; + GtkTreeSelection *selection; model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview)); status = tp_account_get_connection_status (account, NULL); @@ -1831,15 +1867,18 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog, settings = empathy_account_settings_new_for_account (account); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview)); + if (!accounts_dialog_get_account_iter (dialog, account, &iter)) { + /* Select the account if it's the first added */ + if (gtk_tree_selection_count_selected_rows (selection) == 0) + selected = TRUE; + gtk_list_store_append (GTK_LIST_STORE (model), &iter); } else { - GtkTreeSelection *selection; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview)); selected = gtk_tree_selection_iter_is_selected (selection, &iter); } @@ -1878,32 +1917,13 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog, g_object_unref (settings); } -static void -account_prepare_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (user_data); - TpAccount *account = TP_ACCOUNT (source_object); - GError *error = NULL; - - if (!tp_proxy_prepare_finish (account, result, &error)) - { - DEBUG ("Failed to prepare account: %s", error->message); - g_error_free (error); - return; - } - - accounts_dialog_add_account (dialog, account); -} - static void accounts_dialog_account_validity_changed_cb (TpAccountManager *manager, TpAccount *account, gboolean valid, EmpathyAccountsDialog *dialog) { - tp_proxy_prepare_async (account, NULL, account_prepare_cb, dialog); + accounts_dialog_add_account (dialog, account); } static void @@ -1982,15 +2002,24 @@ accounts_dialog_account_enabled_cb (TpAccountManager *manager, enable_or_disable_account (dialog, account, TRUE); } -static void -accounts_dialog_button_import_clicked_cb (GtkWidget *button, - EmpathyAccountsDialog *dialog) +static GtkWidget * +display_import_dialog (EmpathyAccountsDialog *dialog) { + EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); GtkWidget *import_dialog; import_dialog = empathy_import_dialog_new (GTK_WINDOW (dialog), - FALSE); + FALSE, priv->cms); gtk_widget_show (import_dialog); + + return import_dialog; +} + +static void +accounts_dialog_button_import_clicked_cb (GtkWidget *button, + EmpathyAccountsDialog *dialog) +{ + display_import_dialog (dialog); } static void @@ -2025,6 +2054,85 @@ accounts_dialog_set_selected_account (EmpathyAccountsDialog *dialog, select_and_scroll_to_iter (dialog, &iter); } +static void +salut_valid_cb (GtkWidget *widget, + gboolean valid, + GtkWidget *button) +{ + gtk_widget_set_sensitive (button, valid); +} + +static void +maybe_show_salut_dialog (EmpathyAccountsDialog *self) +{ + EmpathyAccountsDialogPriv *priv = GET_PRIV (self); + GtkWidget *dialog, *widget, *content, *button; + gint response; + + if (!empathy_local_xmpp_assistant_widget_should_create_account ( + priv->account_manager)) + return; + + widget = empathy_local_xmpp_assistant_widget_new (); + gtk_widget_show (widget); + + dialog = gtk_dialog_new (); + + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + + gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Skip"), + GTK_RESPONSE_NO); + + button = gtk_dialog_add_button (GTK_DIALOG (dialog), + _("_Connect"), GTK_RESPONSE_YES); + gtk_widget_set_sensitive (button, FALSE); + + g_signal_connect (widget, "valid", G_CALLBACK (salut_valid_cb), + button); + + content = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_box_pack_start (GTK_BOX (content), widget, TRUE, TRUE, 0); + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + if (response == GTK_RESPONSE_YES) + { + empathy_local_xmpp_assistant_widget_create_account ( + EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET (widget)); + } + + gtk_widget_destroy (dialog); +} + +static void +import_dialog_response_cb (GtkDialog *dialog, + gint response_id, + EmpathyAccountsDialog *self) +{ + maybe_show_salut_dialog (self); +} + +static void +maybe_show_import_dialog (EmpathyAccountsDialog *self) +{ + EmpathyAccountsDialogPriv *priv = GET_PRIV (self); + GtkWidget *dialog; + + if (empathy_accounts_has_non_salut_accounts (priv->account_manager)) + return; + + if (!empathy_import_accounts_to_import ()) + { + maybe_show_salut_dialog (self); + return; + } + + dialog = display_import_dialog (self); + + tp_g_signal_connect_object (dialog, "response", + G_CALLBACK (import_dialog_response_cb), self, 0); +} + static void finished_loading (EmpathyAccountsDialog *self) { @@ -2046,6 +2154,8 @@ finished_loading (EmpathyAccountsDialog *self) gtk_spinner_stop (GTK_SPINNER (priv->spinner)); gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook_account), NOTEBOOK_PAGE_ACCOUNT); + + maybe_show_import_dialog (self); } static void @@ -2188,14 +2298,12 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog) gui = empathy_builder_get_file (filename, "accounts_dialog_hbox", &top_hbox, "vbox_details", &priv->vbox_details, - "frame_no_protocol", &priv->frame_no_protocol, "alignment_settings", &priv->alignment_settings, "alignment_infobar", &priv->alignment_infobar, "treeview", &priv->treeview, "button_add", &priv->button_add, "button_remove", &priv->button_remove, "button_import", &priv->button_import, - "hbox_protocol", &priv->hbox_protocol, "notebook_account", &priv->notebook_account, "alignment_loading", &alig, "accounts_sw", &sw, @@ -2203,8 +2311,6 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog) NULL); g_free (filename); - gtk_widget_set_no_show_all (priv->frame_no_protocol, TRUE); - empathy_builder_connect (gui, dialog, "button_add", "clicked", accounts_dialog_button_add_clicked_cb, "button_remove", "clicked", accounts_dialog_button_remove_clicked_cb, @@ -2248,13 +2354,6 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog) gtk_widget_set_sensitive (priv->button_import, FALSE); gtk_widget_set_sensitive (priv->treeview, FALSE); - priv->combobox_protocol = empathy_protocol_chooser_new (); - gtk_box_pack_start (GTK_BOX (priv->hbox_protocol), priv->combobox_protocol, - TRUE, TRUE, 0); - g_signal_connect (priv->combobox_protocol, "changed", - G_CALLBACK (accounts_dialog_protocol_changed_cb), - dialog); - if (priv->parent_window) gtk_window_set_transient_for (GTK_WINDOW (dialog), priv->parent_window); @@ -2293,7 +2392,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog) TP_CONNECTION_PRESENCE_TYPE_OFFLINE), GTK_ICON_SIZE_SMALL_TOOLBAR); priv->label_status = gtk_label_new (NULL); - gtk_label_set_line_wrap (GTK_LABEL (priv->label_status), TRUE); + gtk_label_set_ellipsize (GTK_LABEL (priv->label_status), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (hbox), priv->throbber, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), priv->image_status, FALSE, FALSE, 0); diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui index 4a1b8bbb..549a9265 100644 --- a/src/empathy-accounts-dialog.ui +++ b/src/empathy-accounts-dialog.ui @@ -111,31 +111,6 @@ True 18 - - - True - 6 - - - True - Protocol: - - - False - False - 0 - - - - - - - - False - False - 0 - - True @@ -173,43 +148,6 @@ 1 - - - 0 - none - - - True - 6 - 12 - - - True - To add a new account, you first have to install a backend for each protocol you want to use. - True - - - - - - - True - No protocol installed - - - - - - - - False - False - 2 - - - - - @@ -254,6 +192,49 @@ 1 + + + True + 18 + + + 0 + none + + + True + 6 + 12 + + + True + To add a new account, you first have to install a backend for each protocol you want to use. + True + + + + + + + True + No protocol backends installed + + + + + + + + False + False + 2 + + + + + + + 1 diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 3b25201c..6b51820f 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -43,8 +43,6 @@ #include "empathy-accounts.h" #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" -#include "empathy-account-assistant.h" -#include "empathy-auto-salut-account-helper.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT #include @@ -54,7 +52,6 @@ static gboolean only_if_needed = FALSE; static gboolean hidden = FALSE; static gchar *selected_account_name = NULL; -static gboolean assistant = FALSE; static void maybe_show_accounts_ui (TpAccountManager *manager, @@ -66,7 +63,7 @@ maybe_show_accounts_ui (TpAccountManager *manager, if (only_if_needed && empathy_accounts_has_non_salut_accounts (manager)) return; - empathy_accounts_show_accounts_ui (manager, NULL, assistant, app); + empathy_accounts_show_accounts_ui (manager, NULL, app); } static TpAccount * @@ -123,7 +120,7 @@ account_manager_ready_for_accounts_cb (GObject *source_object, if (account != NULL) { - empathy_accounts_show_accounts_ui (manager, account, assistant, app); + empathy_accounts_show_accounts_ui (manager, account, app); goto out; } else @@ -191,10 +188,6 @@ local_cmdline (GApplication *app, N_("Initially select given account (eg, " "gabble/jabber/foo_40example_2eorg0)"), N_("") }, - { "assistant", 'a', - 0, G_OPTION_ARG_NONE, &assistant, - N_("Show account assistant"), - NULL }, { NULL } }; diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c index 5ab14b54..fbffa488 100644 --- a/src/empathy-audio-sink.c +++ b/src/empathy-audio-sink.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include @@ -222,7 +223,10 @@ create_sink (EmpathyGstAudioSink *self) /* Set latency (buffering on the PulseAudio side) of 40ms and transfer data * in 10ms chunks */ - g_object_set (sink, "buffer-time", 40000, "latency-time", 10000, NULL); + g_object_set (sink, + "buffer-time", (gint64) 40000, + "latency-time", (gint64) 10000, + NULL); return sink; } diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c index aa271fa1..9a882c14 100644 --- a/src/empathy-audio-src.c +++ b/src/empathy-audio-src.c @@ -332,7 +332,7 @@ create_src (void) empathy_call_set_stream_properties (src, TRUE); /* Set latency (buffering on the PulseAudio side) of 20ms */ - g_object_set (src, "buffer-time", 20000, NULL); + g_object_set (src, "buffer-time", (gint64) 20000, NULL); return src; } diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c index 5b3e48ce..22a62522 100644 --- a/src/empathy-auth-client.c +++ b/src/empathy-auth-client.c @@ -231,6 +231,8 @@ auth_factory_new_sasl_handler_cb (EmpathyAuthFactory *factory, /* If the handler has the password it will deal with it itself. */ if (!empathy_server_sasl_handler_has_password (handler)) { + DEBUG ("SASL handler doesn't have a password, prompt for one"); + dialog = empathy_password_dialog_new (handler); gtk_widget_show (dialog); } diff --git a/src/empathy-auto-salut-account-helper.c b/src/empathy-auto-salut-account-helper.c deleted file mode 100644 index 409b6936..00000000 --- a/src/empathy-auto-salut-account-helper.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (C) 2007-2010 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - * Guillaume Desmottes - */ - -#include - -#include -#include - -#include -#include - -#if HAVE_EDS -#include -#endif - -#include - -#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include - -#include "empathy-auto-salut-account-helper.h" - -/* Salut account creation. The TpAccountManager first argument - * must already be prepared when calling this function. */ -gboolean -should_create_salut_account (TpAccountManager *manager) -{ - gboolean salut_created = FALSE; - GList *accounts, *l; - - accounts = tp_account_manager_get_valid_accounts (manager); - - for (l = accounts; l != NULL; l = g_list_next (l)) - { - TpAccount *account = TP_ACCOUNT (l->data); - - if (!tp_strdiff (tp_account_get_protocol (account), "local-xmpp")) - { - salut_created = TRUE; - break; - } - } - - g_list_free (accounts); - - return !salut_created; -} - -EmpathyAccountSettings * -create_salut_account_settings (void) -{ - EmpathyAccountSettings *settings; -#if HAVE_EDS - EBook *book; - EContact *contact; - gchar *nickname = NULL; - gchar *first_name = NULL; - gchar *last_name = NULL; - gchar *email = NULL; - gchar *jid = NULL; - GError *error = NULL; -#endif - - settings = empathy_account_settings_new ("salut", "local-xmpp", NULL, - _("People nearby")); - -#if HAVE_EDS - /* Get self EContact from EDS */ - if (!e_book_get_self (&contact, &book, &error)) - { - DEBUG ("Failed to get self econtact: %s", error->message); - g_error_free (error); - return settings; - } - - nickname = e_contact_get (contact, E_CONTACT_NICKNAME); - first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME); - last_name = e_contact_get (contact, E_CONTACT_FAMILY_NAME); - email = e_contact_get (contact, E_CONTACT_EMAIL_1); - jid = e_contact_get (contact, E_CONTACT_IM_JABBER_HOME_1); - - if (!tp_strdiff (nickname, "nickname")) - { - g_free (nickname); - nickname = NULL; - } - - DEBUG ("Salut account created:\nnickname=%s\nfirst-name=%s\n" - "last-name=%s\nemail=%s\njid=%s\n", - nickname, first_name, last_name, email, jid); - - empathy_account_settings_set_string (settings, - "nickname", nickname ? nickname : ""); - empathy_account_settings_set_string (settings, - "first-name", first_name ? first_name : ""); - empathy_account_settings_set_string (settings, - "last-name", last_name ? last_name : ""); - empathy_account_settings_set_string (settings, "email", email ? email : ""); - empathy_account_settings_set_string (settings, "jid", jid ? jid : ""); - - g_free (nickname); - g_free (first_name); - g_free (last_name); - g_free (email); - g_free (jid); - g_object_unref (contact); - g_object_unref (book); -#endif - - return settings; -} diff --git a/src/empathy-auto-salut-account-helper.h b/src/empathy-auto-salut-account-helper.h deleted file mode 100644 index f0409d01..00000000 --- a/src/empathy-auto-salut-account-helper.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2007-2010 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - * Guillaume Desmottes - */ - -/* Helper functions to automatically create a Salut account */ - -#ifndef __AUTO_SALUT_ACCOUNT_HELPER_H__ -#define __AUTO_SALUT_ACCOUNT_HELPER_H__ - -#include - -#include -#include - -gboolean should_create_salut_account (TpAccountManager *manager); - -EmpathyAccountSettings * create_salut_account_settings (void); - -#endif diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 7a4994c9..45172283 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -439,8 +439,11 @@ create_video_output_widget (EmpathyCallWindow *self) clutter_texture_set_keep_aspect_ratio (CLUTTER_TEXTURE (priv->video_output), TRUE); - priv->video_output_sink = clutter_gst_video_sink_new ( - CLUTTER_TEXTURE (priv->video_output)); + priv->video_output_sink = gst_element_factory_make ("cluttersink", NULL); + if (priv->video_output_sink == NULL) + g_error ("Missing cluttersink"); + else + g_object_set (priv->video_output_sink, "texture", priv->video_output, NULL); clutter_container_add_actor (CLUTTER_CONTAINER (priv->video_box), priv->video_output); @@ -1113,8 +1116,12 @@ create_video_preview (EmpathyCallWindow *self) preview = empathy_rounded_texture_new (); clutter_actor_set_size (preview, SELF_VIDEO_SECTION_WIDTH, SELF_VIDEO_SECTION_HEIGHT); - priv->video_preview_sink = clutter_gst_video_sink_new ( - CLUTTER_TEXTURE (preview)); + + priv->video_preview_sink = gst_element_factory_make ("cluttersink", NULL); + if (priv->video_preview_sink == NULL) + g_error ("Missing cluttersink"); + else + g_object_set (priv->video_preview_sink, "texture", preview, NULL); /* Add a little offset to the video preview */ layout = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER, @@ -3365,7 +3372,7 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, G_CALLBACK (empathy_call_window_video_probe_cb), self); if (priv->got_video_src > 0) g_source_remove (priv->got_video_src); - priv->got_video_src = g_timeout_add_seconds (5, + priv->got_video_src = g_timeout_add_seconds (1, empathy_call_window_check_video_cb, self); break; default: diff --git a/src/empathy-call.c b/src/empathy-call.c index 2ff49a81..71d9db70 100644 --- a/src/empathy-call.c +++ b/src/empathy-call.c @@ -30,6 +30,10 @@ #include #include +#ifdef CLUTTER_WINDOWING_X11 +#include +#endif + #include #include @@ -187,6 +191,12 @@ main (int argc, /* Init */ g_thread_init (NULL); +#ifdef GDK_WINDOWING_X11 + /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice + * but to intiialise X11 threading ourself */ + XInitThreads (); +#endif + /* Clutter needs this */ gdk_disable_multidevice (); diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 9ad6b297..4e3f0480 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -212,6 +212,161 @@ chat_window_find_chat (EmpathyChat *chat) return NULL; } +static void +remove_all_chats (EmpathyChatWindow *window) +{ + EmpathyChatWindowPriv *priv; + + priv = GET_PRIV (window); + g_object_ref (window); + + while (priv->chats) { + empathy_chat_window_remove_chat (window, priv->chats->data); + } + + g_object_unref (window); +} + +static void +confirm_close_response_cb (GtkWidget *dialog, + int response, + EmpathyChatWindow *window) +{ + EmpathyChat *chat; + + chat = g_object_get_data (G_OBJECT (dialog), "chat"); + + gtk_widget_destroy (dialog); + + if (response != GTK_RESPONSE_ACCEPT) + return; + + if (chat != NULL) { + empathy_chat_window_remove_chat (window, chat); + } else { + remove_all_chats (window); + } +} + +static void +confirm_close (EmpathyChatWindow *window, + gboolean close_window, + guint n_rooms, + EmpathyChat *chat) +{ + EmpathyChatWindowPriv *priv; + GtkWidget *dialog; + gchar *primary, *secondary; + + g_return_if_fail (n_rooms > 0); + + if (n_rooms > 1) { + g_return_if_fail (chat == NULL); + } else { + g_return_if_fail (chat != NULL); + } + + priv = GET_PRIV (window); + + /* If there are no chats in this window, how could we possibly have got + * here? + */ + g_return_if_fail (priv->chats != NULL); + + /* Treat closing a window which only has one tab exactly like closing + * that tab. + */ + if (close_window && priv->chats->next == NULL) { + close_window = FALSE; + chat = priv->chats->data; + } + + if (close_window) { + primary = g_strdup (_("Close this window?")); + + if (n_rooms == 1) { + gchar *chat_name = empathy_chat_dup_name (chat); + secondary = g_strdup_printf ( + _("Closing this window will leave %s. You will " + "not receive any further messages until you " + "rejoin it."), + chat_name); + g_free (chat_name); + } else { + secondary = g_strdup_printf ( + /* Note to translators: the number of chats will + * always be at least 2. + */ + ngettext ( + "Closing this window will leave a chat room. You will " + "not receive any further messages until you rejoin it.", + "Closing this window will leave %u chat rooms. You will " + "not receive any further messages until you rejoin them.", + n_rooms), + n_rooms); + } + } else { + gchar *chat_name = empathy_chat_dup_name (chat); + primary = g_strdup_printf (_("Leave %s?"), chat_name); + secondary = g_strdup (_("You will not receive any further messages from this chat " + "room until you rejoin it.")); + g_free (chat_name); + } + + dialog = gtk_message_dialog_new ( + GTK_WINDOW (priv->dialog), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_CANCEL, + "%s", primary); + + gtk_window_set_title (GTK_WINDOW (dialog), ""); + g_object_set (dialog, "secondary-text", secondary, NULL); + + g_free (primary); + g_free (secondary); + + gtk_dialog_add_button (GTK_DIALOG (dialog), + close_window ? _("Close window") : _("Leave room"), + GTK_RESPONSE_ACCEPT); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT); + + if (!close_window) { + g_object_set_data (G_OBJECT (dialog), "chat", chat); + } + + g_signal_connect (dialog, "response", + G_CALLBACK (confirm_close_response_cb), window); + + gtk_window_present (GTK_WINDOW (dialog)); +} + +/* Returns TRUE if we should check if the user really wants to leave. If it's + * a multi-user chat, and it has a TpChat (so there's an underlying channel, so + * the user is actually in the room as opposed to having been kicked or gone + * offline or something), then we should check. + */ +static gboolean +chat_needs_close_confirmation (EmpathyChat *chat) +{ + return (empathy_chat_is_room (chat) + && empathy_chat_get_tp_chat (chat) != NULL); +} + +static void +maybe_close_chat (EmpathyChatWindow *window, + EmpathyChat *chat) +{ + g_return_if_fail (chat != NULL); + + if (chat_needs_close_confirmation (chat)) { + confirm_close (window, FALSE, 1, chat); + } else { + empathy_chat_window_remove_chat (window, chat); + } +} + static void chat_window_close_clicked_cb (GtkAction *action, EmpathyChat *chat) @@ -219,7 +374,7 @@ chat_window_close_clicked_cb (GtkAction *action, EmpathyChatWindow *window; window = chat_window_find_chat (chat); - empathy_chat_window_remove_chat (window, chat); + maybe_close_chat (window, chat); } static void @@ -773,10 +928,19 @@ chat_window_update_chat_tab_full (EmpathyChat *chat, g_free (markup); /* Update tab and menu label */ + if (empathy_chat_is_highlighted (chat)) { + markup = g_markup_printf_escaped ( + "%s", + name); + } else { + markup = g_markup_escape_text (name, -1); + } + widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label"); - gtk_label_set_text (GTK_LABEL (widget), name); + gtk_label_set_markup (GTK_LABEL (widget), markup); widget = g_object_get_data (G_OBJECT (chat), "chat-window-menu-label"); - gtk_label_set_text (GTK_LABEL (widget), name); + gtk_label_set_markup (GTK_LABEL (widget), markup); + g_free (markup); /* Update the window if it's the current chat */ if (priv->current_chat == chat) { @@ -1027,7 +1191,7 @@ chat_window_close_activate_cb (GtkAction *action, g_return_if_fail (priv->current_chat != NULL); - empathy_chat_window_remove_chat (window, priv->current_chat); + maybe_close_chat (window, priv->current_chat); } static void @@ -1271,14 +1435,25 @@ chat_window_delete_event_cb (GtkWidget *dialog, EmpathyChatWindow *window) { EmpathyChatWindowPriv *priv = GET_PRIV (window); + EmpathyChat *chat = NULL; + guint n_rooms = 0; + GList *l; DEBUG ("Delete event received"); - g_object_ref (window); - while (priv->chats) { - empathy_chat_window_remove_chat (window, priv->chats->data); + for (l = priv->chats; l != NULL; l = l->next) { + if (chat_needs_close_confirmation (l->data)) { + chat = l->data; + n_rooms++; + } + } + + if (n_rooms > 0) { + confirm_close (window, TRUE, n_rooms, + (n_rooms == 1 ? chat : NULL)); + } else { + remove_all_chats (window); } - g_object_unref (window); return TRUE; } @@ -1394,30 +1569,6 @@ chat_window_show_or_update_notification (EmpathyChatWindow *window, g_free (escaped); } -static void -chat_window_set_highlight_room_labels (EmpathyChat *chat) -{ - gchar *markup, *name; - GtkWidget *widget; - - if (!empathy_chat_is_room (chat)) - return; - - name = empathy_chat_dup_name (chat); - markup = g_markup_printf_escaped ( - "%s", - name); - - widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label"); - gtk_label_set_markup (GTK_LABEL (widget), markup); - - widget = g_object_get_data (G_OBJECT (chat), "chat-window-menu-label"); - gtk_label_set_markup (GTK_LABEL (widget), markup); - - g_free (name); - g_free (markup); -} - static gboolean empathy_chat_window_has_focus (EmpathyChatWindow *window) { @@ -1437,6 +1588,7 @@ static void chat_window_new_message_cb (EmpathyChat *chat, EmpathyMessage *message, gboolean pending, + gboolean should_highlight, EmpathyChatWindow *window) { EmpathyChatWindowPriv *priv; @@ -1496,15 +1648,13 @@ chat_window_new_message_cb (EmpathyChat *chat, if (chatroom != NULL && empathy_chatroom_is_always_urgent (chatroom)) { needs_urgency = TRUE; } else { - needs_urgency = empathy_message_should_highlight (message); + needs_urgency = should_highlight; } } else { needs_urgency = TRUE; } if (needs_urgency) { - chat_window_set_highlight_room_labels (chat); - if (!has_focus) { chat_window_set_urgency_hint (window, TRUE); } @@ -2488,8 +2638,12 @@ empathy_chat_window_present_chat (EmpathyChat *chat, } empathy_chat_window_switch_to_chat (window, chat); - empathy_window_present_with_time (GTK_WINDOW (priv->dialog), - x_timestamp); + + /* Don't use empathy_window_present_with_time () which would move the window + * to our current desktop but move to the window's desktop instead. This is + * more coherent with Shell's 'app is ready' notication which moves the view + * to the app desktop rather than moving the app itself. */ + empathy_move_to_window_desktop (GTK_WINDOW (priv->dialog), x_timestamp); gtk_widget_grab_focus (chat->input_text_view); } diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui index 25749861..bf95bff1 100644 --- a/src/empathy-chat-window.ui +++ b/src/empathy-chat-window.ui @@ -205,8 +205,8 @@ Chat chat - 350 - 250 + 580 + 480 True diff --git a/src/empathy-chat.c b/src/empathy-chat.c index 43ab0027..bebca438 100644 --- a/src/empathy-chat.c +++ b/src/empathy-chat.c @@ -31,6 +31,7 @@ #include #include +#include #include #include @@ -100,6 +101,7 @@ main (int argc, EmpathyPresenceManager *presence_mgr; EmpathyThemeManager *theme_mgr; gint retval; + EmpathyIndividualManager *individual_mgr; /* Init */ g_thread_init (NULL); @@ -143,6 +145,10 @@ main (int argc, /* Keep the theme manager alive as it does some caching */ theme_mgr = empathy_theme_manager_dup_singleton (); + /* Keep the individual manager alive so we won't fetch everything from Folks + * each time we need to use it. */ + individual_mgr = empathy_individual_manager_dup_singleton (); + if (g_getenv ("EMPATHY_PERSIST") != NULL) { DEBUG ("Disable timer"); @@ -163,6 +169,7 @@ main (int argc, g_object_unref (presence_mgr); g_object_unref (theme_mgr); tp_clear_object (&chat_mgr); + g_object_unref (individual_mgr); #ifdef ENABLE_DEBUG g_object_unref (debug_sender); diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index da677d42..321cd1cc 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -33,10 +33,9 @@ #include #include -#include +#include #include #include -#include #include #include @@ -48,7 +47,7 @@ #include #include "empathy-event-manager.h" -#include "empathy-main-window.h" +#include "empathy-roster-window.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER #include @@ -81,7 +80,7 @@ typedef struct { typedef struct { TpBaseClient *approver; TpBaseClient *auth_approver; - EmpathyContactManager *contact_manager; + EmpathyConnectionAggregator *conn_aggregator; GSList *events; /* Ongoing approvals */ GSList *approvals; @@ -92,6 +91,9 @@ typedef struct { GSettings *gsettings_ui; EmpathySoundManager *sound_mgr; + + /* TpContact -> EmpathyContact */ + GHashTable *contacts; } EmpathyEventManagerPriv; typedef struct _EventPriv EventPriv; @@ -422,9 +424,9 @@ reject_channel_claim_cb (GObject *source, { empathy_tp_chat_leave (user_data, ""); } - else if (EMPATHY_IS_TP_FILE (user_data)) + else if (TP_IS_FILE_TRANSFER_CHANNEL (user_data)) { - empathy_tp_file_close (user_data); + tp_channel_close_async (user_data, NULL, NULL); } out: @@ -615,7 +617,7 @@ event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat, EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE, header, msg, approval, event_text_channel_process_func, NULL); - window = empathy_main_window_dup (); + window = empathy_roster_window_dup (); empathy_sound_manager_play (priv->sound_mgr, window, EMPATHY_SOUND_CONVERSATION_NEW); @@ -721,7 +723,7 @@ event_manager_call_channel_got_contact_cb (TpConnection *connection, approval->handler = g_signal_connect (call, "state-changed", G_CALLBACK (event_manager_call_state_changed_cb), approval); - window = empathy_main_window_dup (); + window = empathy_roster_window_dup (); approval->contact = g_object_ref (contact); g_object_get (G_OBJECT (call), "initial-video", &video, NULL); @@ -750,7 +752,7 @@ static void event_manager_media_channel_got_contact (EventManagerApproval *approval) { EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager); - GtkWidget *window = empathy_main_window_dup (); + GtkWidget *window = empathy_roster_window_dup (); gchar *header; EmpathyTpStreamedMedia *call; gboolean video; @@ -870,7 +872,7 @@ event_room_channel_process_func (EventPriv *event) static void display_invite_room_dialog (EventManagerApproval *approval) { - GtkWidget *window = empathy_main_window_dup (); + GtkWidget *window = empathy_roster_window_dup (); const gchar *invite_msg; gchar *msg; TpHandle self_handle; @@ -933,7 +935,7 @@ event_manager_ft_got_contact_cb (TpConnection *connection, GObject *object) { EventManagerApproval *approval = (EventManagerApproval *) user_data; - GtkWidget *window = empathy_main_window_dup (); + GtkWidget *window = empathy_roster_window_dup (); char *header; EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager); @@ -1115,7 +1117,7 @@ approve_channels (TpSimpleApprover *approver, event_manager_call_channel_got_contact_cb, approval, NULL, G_OBJECT (self)); } - else if (EMPATHY_IS_TP_FILE (channel)) + else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER) { TpHandle handle; @@ -1179,15 +1181,20 @@ event_pending_subscribe_func (EventPriv *event) } static void -event_manager_pendings_changed_cb (EmpathyContactList *list, - EmpathyContact *contact, EmpathyContact *actor, - guint reason, gchar *message, gboolean is_pending, - EmpathyEventManager *manager) +check_publish_state (EmpathyEventManager *self, + TpContact *tp_contact) { - EmpathyEventManagerPriv *priv = GET_PRIV (manager); - gchar *header, *event_msg; + EmpathyEventManagerPriv *priv = GET_PRIV (self); + gchar *header, *event_msg; + TpSubscriptionState state; + EmpathyContact *contact; + const gchar *message; + + state = tp_contact_get_publish_state (tp_contact); + + contact = empathy_contact_dup_from_tp_contact (tp_contact); - if (!is_pending) + if (state != TP_SUBSCRIPTION_STATE_ASK) { GSList *l; @@ -1203,24 +1210,37 @@ event_manager_pendings_changed_cb (EmpathyContactList *list, } } - return; + goto out; } header = g_strdup_printf ( _("%s would like permission to see when you are online"), empathy_contact_get_alias (contact)); + message = tp_contact_get_publish_request (tp_contact); + if (!EMP_STR_EMPTY (message)) event_msg = g_strdup_printf (_("\nMessage: %s"), message); else event_msg = NULL; - event_manager_add (manager, NULL, contact, EMPATHY_EVENT_TYPE_SUBSCRIPTION, + event_manager_add (self, NULL, contact, EMPATHY_EVENT_TYPE_SUBSCRIPTION, GTK_STOCK_DIALOG_QUESTION, header, event_msg, NULL, event_pending_subscribe_func, NULL); g_free (event_msg); g_free (header); + +out: + g_object_unref (contact); +} + +static void +event_manager_publish_state_changed_cb (TpContact *contact, + GParamSpec *spec, + EmpathyEventManager *self) +{ + check_publish_state (self, contact); } static void @@ -1232,7 +1252,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact, EmpathyEventManagerPriv *priv = GET_PRIV (manager); TpAccount *account; EmpathyPresenceManager *presence_mgr; - GtkWidget *window = empathy_main_window_dup (); + GtkWidget *window = empathy_roster_window_dup (); account = empathy_contact_get_account (contact); presence_mgr = empathy_presence_manager_dup_singleton (); @@ -1289,23 +1309,6 @@ out: g_object_unref (window); } -static void -event_manager_members_changed_cb (EmpathyContactList *list, - EmpathyContact *contact, - EmpathyContact *actor, - guint reason, - gchar *message, - gboolean is_member, - EmpathyEventManager *manager) -{ - if (is_member) - g_signal_connect (contact, "presence-changed", - G_CALLBACK (event_manager_presence_changed_cb), manager); - else - g_signal_handlers_disconnect_by_func (contact, - event_manager_presence_changed_cb, manager); -} - static GObject * event_manager_constructor (GType type, guint n_props, @@ -1338,12 +1341,13 @@ event_manager_finalize (GObject *object) g_slist_free (priv->events); g_slist_foreach (priv->approvals, (GFunc) event_manager_approval_free, NULL); g_slist_free (priv->approvals); - g_object_unref (priv->contact_manager); + g_object_unref (priv->conn_aggregator); g_object_unref (priv->approver); g_object_unref (priv->auth_approver); g_object_unref (priv->gsettings_notif); g_object_unref (priv->gsettings_ui); g_object_unref (priv->sound_mgr); + g_hash_table_unref (priv->contacts); } static void @@ -1385,6 +1389,56 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass) g_type_class_add_private (object_class, sizeof (EmpathyEventManagerPriv)); } +static void +contact_list_changed_cb (EmpathyConnectionAggregator *aggregator, + GPtrArray *added, + GPtrArray *removed, + EmpathyEventManager *self) +{ + EmpathyEventManagerPriv *priv = GET_PRIV (self); + guint i; + + for (i = 0; i < added->len; i++) + { + TpContact *tp_contact = g_ptr_array_index (added, i); + EmpathyContact *contact; + + if (g_hash_table_lookup (priv->contacts, tp_contact) != NULL) + continue; + + contact = empathy_contact_dup_from_tp_contact (tp_contact); + + tp_g_signal_connect_object (contact, "presence-changed", + G_CALLBACK (event_manager_presence_changed_cb), self, 0); + + tp_g_signal_connect_object (tp_contact, "notify::publish-state", + G_CALLBACK (event_manager_publish_state_changed_cb), self, 0); + + check_publish_state (self, tp_contact); + + /* Pass ownership to the hash table */ + g_hash_table_insert (priv->contacts, g_object_ref (tp_contact), contact); + } + + for (i = 0; i < removed->len; i++) + { + TpContact *tp_contact = g_ptr_array_index (removed, i); + EmpathyContact *contact; + + contact = g_hash_table_lookup (priv->contacts, tp_contact); + if (contact == NULL) + continue; + + g_signal_handlers_disconnect_by_func (contact, + event_manager_presence_changed_cb, self); + + g_signal_handlers_disconnect_by_func (tp_contact, + event_manager_publish_state_changed_cb, self); + + g_hash_table_remove (priv->contacts, tp_contact); + } +} + static void empathy_event_manager_init (EmpathyEventManager *manager) { @@ -1392,6 +1446,7 @@ empathy_event_manager_init (EmpathyEventManager *manager) EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerPriv); GError *error = NULL; TpAccountManager *am; + GPtrArray *contacts, *empty; manager->priv = priv; @@ -1400,12 +1455,23 @@ empathy_event_manager_init (EmpathyEventManager *manager) priv->sound_mgr = empathy_sound_manager_dup_singleton (); - priv->contact_manager = empathy_contact_manager_dup_singleton (); - g_signal_connect (priv->contact_manager, "pendings-changed", - G_CALLBACK (event_manager_pendings_changed_cb), manager); + priv->contacts = g_hash_table_new_full (NULL, NULL, g_object_unref, + g_object_unref); + + priv->conn_aggregator = empathy_connection_aggregator_dup_singleton (); + + tp_g_signal_connect_object (priv->conn_aggregator, "contact-list-changed", + G_CALLBACK (contact_list_changed_cb), manager, 0); + + contacts = empathy_connection_aggregator_dup_all_contacts ( + priv->conn_aggregator); + + empty = g_ptr_array_new (); + + contact_list_changed_cb (priv->conn_aggregator, contacts, empty, manager); - g_signal_connect (priv->contact_manager, "members-changed", - G_CALLBACK (event_manager_members_changed_cb), manager); + g_ptr_array_unref (contacts); + g_ptr_array_unref (empty); am = tp_account_manager_dup (); diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c index 606600e9..18ca1938 100644 --- a/src/empathy-ft-manager.c +++ b/src/empathy-ft-manager.c @@ -37,7 +37,6 @@ #define DEBUG_FLAG EMPATHY_DEBUG_FT #include -#include #include #include @@ -518,7 +517,7 @@ do_real_transfer_done (EmpathyFTManager *manager, static void ft_handler_transfer_done_cb (EmpathyFTHandler *handler, - EmpathyTpFile *tp_file, + TpFileTransferChannel *channel, EmpathyFTManager *manager) { if (empathy_ft_handler_is_incoming (handler) && @@ -574,7 +573,7 @@ ft_handler_transfer_progress_cb (EmpathyFTHandler *handler, static void ft_handler_transfer_started_cb (EmpathyFTHandler *handler, - EmpathyTpFile *tp_file, + TpFileTransferChannel *channel, EmpathyFTManager *manager) { guint64 transferred_bytes, total_bytes; diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index 77d11298..4e00bd11 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -39,7 +39,8 @@ enum { PROP_PARENT = 1, - PROP_SHOW_WARNING + PROP_SHOW_WARNING, + PROP_CMS, }; typedef struct { @@ -48,6 +49,7 @@ typedef struct { EmpathyImportWidget *iw; gboolean show_warning; + EmpathyConnectionManagers *cms; } EmpathyImportDialogPriv; G_DEFINE_TYPE (EmpathyImportDialog, empathy_import_dialog, GTK_TYPE_DIALOG) @@ -62,15 +64,17 @@ import_dialog_add_import_widget (EmpathyImportDialog *self) area = gtk_dialog_get_content_area (GTK_DIALOG (self)); - iw = empathy_import_widget_new (EMPATHY_IMPORT_APPLICATION_ALL); + iw = empathy_import_widget_new (EMPATHY_IMPORT_APPLICATION_ALL, priv->cms); widget = empathy_import_widget_get_widget (iw); - gtk_box_pack_start (GTK_BOX (area), widget, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (area), widget, TRUE, TRUE, 0); gtk_widget_show (widget); priv->iw = iw; - gtk_dialog_add_buttons (GTK_DIALOG (self), GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + gtk_dialog_add_buttons (GTK_DIALOG (self), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("_Import"), GTK_RESPONSE_OK, + NULL); } static void @@ -134,6 +138,9 @@ do_get_property (GObject *object, case PROP_SHOW_WARNING: g_value_set_boolean (value, priv->show_warning); break; + case PROP_CMS: + g_value_set_object (value, priv->cms); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } @@ -155,6 +162,9 @@ do_set_property (GObject *object, case PROP_SHOW_WARNING: priv->show_warning = g_value_get_boolean (value); break; + case PROP_CMS: + priv->cms = g_value_dup_object (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } @@ -199,6 +209,15 @@ empathy_import_dialog_init (EmpathyImportDialog *self) gtk_window_set_title (GTK_WINDOW (self), _("Import Accounts")); gtk_window_set_modal (GTK_WINDOW (self), TRUE); } +static void +do_dispose (GObject *obj) +{ + EmpathyImportDialogPriv *priv = GET_PRIV (obj); + + g_clear_object (&priv->cms); + + G_OBJECT_CLASS (empathy_import_dialog_parent_class)->dispose (obj); +} static void empathy_import_dialog_class_init (EmpathyImportDialogClass *klass) @@ -210,6 +229,7 @@ empathy_import_dialog_class_init (EmpathyImportDialogClass *klass) oclass->constructed = do_constructed; oclass->get_property = do_get_property; oclass->set_property = do_set_property; + oclass->dispose = do_dispose; gtkclass->response = impl_signal_response; @@ -226,13 +246,25 @@ empathy_import_dialog_class_init (EmpathyImportDialogClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_property (oclass, PROP_SHOW_WARNING, param_spec); + param_spec = g_param_spec_object ("cms", + "EmpathyConnectionManagers", "EmpathyConnectionManager", + EMPATHY_TYPE_CONNECTION_MANAGERS, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); + g_object_class_install_property (oclass, PROP_CMS, param_spec); + g_type_class_add_private (klass, sizeof (EmpathyImportDialogPriv)); } GtkWidget * empathy_import_dialog_new (GtkWindow *parent, - gboolean warning) + gboolean warning, + EmpathyConnectionManagers *cms) { - return g_object_new (EMPATHY_TYPE_IMPORT_DIALOG, "parent-window", - parent, "show-warning", warning, NULL); + g_return_val_if_fail (EMPATHY_IS_CONNECTION_MANAGERS (cms), NULL); + + return g_object_new (EMPATHY_TYPE_IMPORT_DIALOG, + "parent-window", parent, + "show-warning", warning, + "cms", cms, + NULL); } diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h index 0e9d225c..a412037d 100644 --- a/src/empathy-import-dialog.h +++ b/src/empathy-import-dialog.h @@ -25,6 +25,8 @@ #ifndef __EMPATHY_IMPORT_DIALOG_H__ #define __EMPATHY_IMPORT_DIALOG_H__ +#include + G_BEGIN_DECLS #define EMPATHY_TYPE_IMPORT_DIALOG empathy_import_dialog_get_type() @@ -56,7 +58,8 @@ typedef struct { GType empathy_import_dialog_get_type (void); GtkWidget* empathy_import_dialog_new (GtkWindow *parent_window, - gboolean show_warning); + gboolean show_warning, + EmpathyConnectionManagers *cms); G_END_DECLS diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c index 9a8917ff..041c5100 100644 --- a/src/empathy-import-widget.c +++ b/src/empathy-import-widget.c @@ -55,7 +55,8 @@ enum }; enum { - PROP_APPLICATION_ID = 1 + PROP_APPLICATION_ID = 1, + PROP_CMS }; typedef struct { @@ -200,7 +201,7 @@ import_widget_add_account (EmpathyImportWidget *self, EmpathyImportAccountData *data) { TpAccountManager *account_manager; - gchar *display_name; + gchar *display_name = NULL; GHashTable *properties; GValue *username; @@ -210,9 +211,23 @@ import_widget_add_account (EmpathyImportWidget *self, /* Set the display name of the account */ username = g_hash_table_lookup (data->settings, "account"); - display_name = g_strdup_printf ("%s (%s)", - data->protocol, - g_value_get_string (username)); + + if (!tp_strdiff (data->protocol, "irc")) + { + const gchar *server; + + server = tp_asv_get_string (data->settings, "server"); + + if (server != NULL) + display_name = g_strdup_printf ("%s on %s", + g_value_get_string (username), server); + } + + if (display_name == NULL) + { + display_name = g_strdup_printf ("%s (%s)", + data->protocol, g_value_get_string (username)); + } DEBUG ("display name: %s\n", display_name); @@ -344,20 +359,6 @@ import_widget_set_up_account_list (EmpathyImportWidget *self) import_widget_add_accounts_to_model (self); } -static void -import_widget_cms_prepare_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - EmpathyImportWidget *self = user_data; - - if (!empathy_connection_managers_prepare_finish ( - EMPATHY_CONNECTION_MANAGERS (source), result, NULL)) - return; - - import_widget_set_up_account_list (self); -} - static void import_widget_destroy_cb (GtkWidget *w, EmpathyImportWidget *self) @@ -378,6 +379,9 @@ do_get_property (GObject *object, case PROP_APPLICATION_ID: g_value_set_int (value, priv->app_id); break; + case PROP_CMS: + g_value_set_object (value, priv->cms); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } @@ -396,6 +400,9 @@ do_set_property (GObject *object, case PROP_APPLICATION_ID: priv->app_id = g_value_get_int (value); break; + case PROP_CMS: + priv->cms = g_value_dup_object (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } @@ -454,8 +461,7 @@ do_constructed (GObject *obj) g_signal_connect (priv->vbox, "destroy", G_CALLBACK (import_widget_destroy_cb), self); - empathy_connection_managers_prepare_async (priv->cms, - import_widget_cms_prepare_cb, self); + import_widget_set_up_account_list (self); } static void @@ -476,6 +482,12 @@ empathy_import_widget_class_init (EmpathyImportWidgetClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_property (oclass, PROP_APPLICATION_ID, param_spec); + param_spec = g_param_spec_object ("cms", + "EmpathyConnectionManagers", "EmpathyConnectionManager", + EMPATHY_TYPE_CONNECTION_MANAGERS, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); + g_object_class_install_property (oclass, PROP_CMS, param_spec); + g_type_class_add_private (klass, sizeof (EmpathyImportWidgetPriv)); } @@ -487,14 +499,18 @@ empathy_import_widget_init (EmpathyImportWidget *self) EmpathyImportWidgetPriv); self->priv = priv; - - priv->cms = empathy_connection_managers_dup_singleton (); } EmpathyImportWidget * -empathy_import_widget_new (EmpathyImportApplication id) +empathy_import_widget_new (EmpathyImportApplication id, + EmpathyConnectionManagers *cms) { - return g_object_new (EMPATHY_TYPE_IMPORT_WIDGET, "application-id", id, NULL); + g_return_val_if_fail (EMPATHY_IS_CONNECTION_MANAGERS (cms), NULL); + + return g_object_new (EMPATHY_TYPE_IMPORT_WIDGET, + "application-id", id, + "cms", cms, + NULL); } GtkWidget * diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h index 48f2e1d4..14a01d79 100644 --- a/src/empathy-import-widget.h +++ b/src/empathy-import-widget.h @@ -27,6 +27,8 @@ #include +#include + #include "empathy-import-utils.h" G_BEGIN_DECLS @@ -59,7 +61,8 @@ typedef struct { GType empathy_import_widget_get_type (void); -EmpathyImportWidget* empathy_import_widget_new (EmpathyImportApplication id); +EmpathyImportWidget* empathy_import_widget_new (EmpathyImportApplication id, + EmpathyConnectionManagers *cms); GtkWidget * empathy_import_widget_get_widget (EmpathyImportWidget *self); diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c index f905c827..ece86f1b 100644 --- a/src/empathy-invite-participant-dialog.c +++ b/src/empathy-invite-participant-dialog.c @@ -114,6 +114,8 @@ get_tp_contact_for_chat (EmpathyInviteParticipantDialog *self, TpConnection *chat_conn; chat_conn = tp_channel_borrow_connection (TP_CHANNEL (self->priv->tp_chat)); + if (chat_conn == NULL) + return NULL; return empathy_get_tp_contact_for_individual (individual, chat_conn); } diff --git a/src/empathy-main-window-menubar.ui b/src/empathy-main-window-menubar.ui deleted file mode 100644 index 0bb5d14f..00000000 --- a/src/empathy-main-window-menubar.ui +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - chat - _Chat - - - - - im-message-new - chat_new_message - _New Conversation… - - - - - - audio-input-microphone - chat_new_call - New _Call… - - - - - - document-open-recent - view_history - _Previous Conversations - - - - - - gtk-add - chat_add_contact - _Add Contact… - - - - - gtk-find - chat_search_contacts - _Search for Contacts… - - - - - - document-send - view_show_ft_manager - _File Transfers - - - - - view_show_offline - _Offline Contacts - - - - - - view_show_protocols - Show P_rotocols - - - - - view_balance_show_in_roster - Credit Balance - False - - - - - view_show_map - Contacts on a _Map - - - - - gtk-quit - chat_quit - - - - - - edit - _Edit - - - - - edit_context - Context - - - - - edit_accounts - _Accounts - - - - - - edit_personal_information - _Personal Information - - - - - edit_blocked_contacts - _Blocked Contacts - - - - - gtk-preferences - edit_preferences - P_references - - - - - edit_search_contacts - Find in Contact _List - - - - - - view - _View - - - - - view_sort_by_name - True - Sort by _Name - True - 1 - 1 - - - - - view_sort_by_status - True - Sort by _Status - True - view_sort_by_name - 0 - - - - - view_normal_size_with_avatars - True - Normal Size With _Avatars - True - 0 - 0 - - - - - - view_normal_size - True - N_ormal Size - True - view_normal_size_with_avatars - 1 - - - - - - view_compact_size - True - _Compact Size - True - view_normal_size_with_avatars - 2 - - - - - - room - _Room - - - - - room_join_new - _Join… - - - - - - room_join_favorites - Join _Favorites - - - - - - system-users - room_manage_favorites - Manage Favorites - - - - - help - _Help - - - - - gtk-help - help_contents - _Contents - - - - - - help_debug - _Debug - - - - - gtk-about - help_about - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - - diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c deleted file mode 100644 index 2f73acf9..00000000 --- a/src/empathy-main-window.c +++ /dev/null @@ -1,2586 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2002-2007 Imendio AB - * Copyright (C) 2007-2010 Collabora Ltd. - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - * Danielle Madeley - */ - -#include - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "empathy-accounts-dialog.h" -#include "empathy-call-observer.h" -#include "empathy-chat-manager.h" -#include "empathy-main-window.h" -#include "empathy-preferences.h" -#include "empathy-about-dialog.h" -#include "empathy-debug-window.h" -#include "empathy-new-chatroom-dialog.h" -#include "empathy-map-view.h" -#include "empathy-chatrooms-window.h" -#include "empathy-event-manager.h" -#include "empathy-ft-manager.h" - -#define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include - -/* Flashing delay for icons (milliseconds). */ -#define FLASH_TIMEOUT 500 - -/* Minimum width of roster window if something goes wrong. */ -#define MIN_WIDTH 50 - -/* Accels (menu shortcuts) can be configured and saved */ -#define ACCELS_FILENAME "accels.txt" - -/* Name in the geometry file */ -#define GEOMETRY_NAME "main-window" - -enum { - PAGE_CONTACT_LIST = 0, - PAGE_NO_MATCH -}; - -enum { - PROP_0, - PROP_SHELL_RUNNING -}; - -G_DEFINE_TYPE (EmpathyMainWindow, empathy_main_window, GTK_TYPE_WINDOW); - -#define GET_PRIV(self) ((EmpathyMainWindowPriv *)((EmpathyMainWindow *) self)->priv) - -struct _EmpathyMainWindowPriv { - EmpathyContactList *contact_manager; - EmpathyIndividualStore *individual_store; - EmpathyIndividualView *individual_view; - TpAccountManager *account_manager; - EmpathyChatroomManager *chatroom_manager; - EmpathyEventManager *event_manager; - EmpathySoundManager *sound_mgr; - EmpathyCallObserver *call_observer; - guint flash_timeout_id; - gboolean flash_on; - gboolean empty; - - GSettings *gsettings_ui; - GSettings *gsettings_contacts; - - GtkWidget *preferences; - GtkWidget *main_vbox; - GtkWidget *throbber; - GtkWidget *throbber_tool_item; - GtkWidget *presence_toolbar; - GtkWidget *presence_chooser; - GtkWidget *errors_vbox; - GtkWidget *auth_vbox; - GtkWidget *search_bar; - GtkWidget *notebook; - GtkWidget *no_entry_label; - - GtkToggleAction *show_protocols; - GtkRadioAction *sort_by_name; - GtkRadioAction *sort_by_status; - GtkRadioAction *normal_with_avatars; - GtkRadioAction *normal_size; - GtkRadioAction *compact_size; - - GtkUIManager *ui_manager; - GtkAction *view_history; - GtkAction *room_join_favorites; - GtkWidget *room_menu; - GtkWidget *room_separator; - GtkWidget *edit_context; - GtkWidget *edit_context_separator; - - GtkActionGroup *balance_action_group; - GtkAction *view_balance_show_in_roster; - GtkWidget *balance_vbox; - - guint size_timeout_id; - - /* reffed TpAccount* => visible GtkInfoBar* */ - GHashTable *errors; - - /* EmpathyEvent* => visible GtkInfoBar* */ - GHashTable *auths; - - /* stores a mapping from TpAccount to Handler ID to prevent - * to listen more than once to the status-changed signal */ - GHashTable *status_changed_handlers; - - /* Actions that are enabled when there are connected accounts */ - GList *actions_connected; - - gboolean shell_running; -}; - -static void -main_window_flash_stop (EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - if (priv->flash_timeout_id == 0) { - return; - } - - DEBUG ("Stop flashing"); - g_source_remove (priv->flash_timeout_id); - priv->flash_timeout_id = 0; - priv->flash_on = FALSE; -} - -typedef struct { - EmpathyEvent *event; - gboolean on; - EmpathyMainWindow *window; -} FlashForeachData; - -static gboolean -main_window_flash_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - FlashForeachData *data = (FlashForeachData *) user_data; - FolksIndividual *individual; - EmpathyContact *contact; - const gchar *icon_name; - GtkTreePath *parent_path = NULL; - GtkTreeIter parent_iter; - GdkPixbuf *pixbuf = NULL; - - gtk_tree_model_get (model, iter, - EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual, - -1); - - if (individual == NULL) - return FALSE; - - contact = empathy_contact_dup_from_folks_individual (individual); - if (contact != data->event->contact) - goto out; - - if (data->on) { - icon_name = data->event->icon_name; - pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - } else { - pixbuf = empathy_individual_store_get_individual_status_icon ( - GET_PRIV (data->window)->individual_store, - individual); - if (pixbuf != NULL) - g_object_ref (pixbuf); - } - - gtk_tree_store_set (GTK_TREE_STORE (model), iter, - EMPATHY_INDIVIDUAL_STORE_COL_ICON_STATUS, pixbuf, - -1); - - /* To make sure the parent is shown correctly, we emit - * the row-changed signal on the parent so it prompts - * it to be refreshed by the filter func. - */ - if (gtk_tree_model_iter_parent (model, &parent_iter, iter)) { - parent_path = gtk_tree_model_get_path (model, &parent_iter); - } - if (parent_path) { - gtk_tree_model_row_changed (model, parent_path, &parent_iter); - gtk_tree_path_free (parent_path); - } - -out: - g_object_unref (individual); - tp_clear_object (&contact); - tp_clear_object (&pixbuf); - - return FALSE; -} - -static gboolean -main_window_flash_cb (EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkTreeModel *model; - GSList *events, *l; - gboolean found_event = FALSE; - FlashForeachData data; - - priv->flash_on = !priv->flash_on; - data.on = priv->flash_on; - model = GTK_TREE_MODEL (priv->individual_store); - - events = empathy_event_manager_get_events (priv->event_manager); - for (l = events; l; l = l->next) { - data.event = l->data; - data.window = window; - if (!data.event->contact || !data.event->must_ack) { - continue; - } - - found_event = TRUE; - gtk_tree_model_foreach (model, - main_window_flash_foreach, - &data); - } - - if (!found_event) { - main_window_flash_stop (window); - } - - return TRUE; -} - -static void -main_window_flash_start (EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - if (priv->flash_timeout_id != 0) { - return; - } - - DEBUG ("Start flashing"); - priv->flash_timeout_id = g_timeout_add (FLASH_TIMEOUT, - (GSourceFunc) main_window_flash_cb, - window); - main_window_flash_cb (window); -} - -static void -main_window_remove_auth (EmpathyMainWindow *window, - EmpathyEvent *event) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkWidget *error_widget; - - error_widget = g_hash_table_lookup (priv->auths, event); - if (error_widget != NULL) { - gtk_widget_destroy (error_widget); - g_hash_table_remove (priv->auths, event); - } -} - -static void -main_window_auth_add_clicked_cb (GtkButton *button, - EmpathyMainWindow *window) -{ - EmpathyEvent *event; - - event = g_object_get_data (G_OBJECT (button), "event"); - - empathy_event_approve (event); - - main_window_remove_auth (window, event); -} - -static void -main_window_auth_close_clicked_cb (GtkButton *button, - EmpathyMainWindow *window) -{ - EmpathyEvent *event; - - event = g_object_get_data (G_OBJECT (button), "event"); - - empathy_event_decline (event); - main_window_remove_auth (window, event); -} - -static void -main_window_auth_display (EmpathyMainWindow *window, - EmpathyEvent *event) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - TpAccount *account = event->account; - GtkWidget *info_bar; - GtkWidget *content_area; - GtkWidget *image; - GtkWidget *label; - GtkWidget *add_button; - GtkWidget *close_button; - GtkWidget *action_area; - GtkWidget *action_grid; - const gchar *icon_name; - gchar *str; - - if (g_hash_table_lookup (priv->auths, event) != NULL) { - return; - } - - info_bar = gtk_info_bar_new (); - gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_QUESTION); - - gtk_widget_set_no_show_all (info_bar, TRUE); - gtk_box_pack_start (GTK_BOX (priv->auth_vbox), info_bar, FALSE, TRUE, 0); - gtk_widget_show (info_bar); - - icon_name = tp_account_get_icon_name (account); - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_widget_show (image); - - str = g_markup_printf_escaped ("%s\n%s", - tp_account_get_display_name (account), - _("Password required")); - - label = gtk_label_new (str); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - gtk_widget_show (label); - - g_free (str); - - content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); - gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0); - - image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - add_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (add_button), image); - gtk_widget_set_tooltip_text (add_button, _("Provide Password")); - gtk_widget_show (add_button); - - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON); - close_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (close_button), image); - gtk_widget_set_tooltip_text (close_button, _("Disconnect")); - gtk_widget_show (close_button); - - action_grid = gtk_grid_new (); - gtk_grid_set_column_spacing (GTK_GRID (action_grid), 6); - gtk_widget_show (action_grid); - - action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar)); - gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0); - - gtk_grid_attach (GTK_GRID (action_grid), add_button, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (action_grid), close_button, 1, 0, 1, 1); - - g_object_set_data_full (G_OBJECT (info_bar), - "event", event, NULL); - g_object_set_data_full (G_OBJECT (add_button), - "event", event, NULL); - g_object_set_data_full (G_OBJECT (close_button), - "event", event, NULL); - - g_signal_connect (add_button, "clicked", - G_CALLBACK (main_window_auth_add_clicked_cb), - window); - g_signal_connect (close_button, "clicked", - G_CALLBACK (main_window_auth_close_clicked_cb), - window); - - gtk_widget_show (priv->auth_vbox); - - g_hash_table_insert (priv->auths, event, info_bar); -} - -static void -modify_event_count (GtkTreeModel *model, - GtkTreeIter *iter, - EmpathyEvent *event, - gboolean increase) -{ - FolksIndividual *individual; - EmpathyContact *contact; - guint count; - - gtk_tree_model_get (model, iter, - EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual, - EMPATHY_INDIVIDUAL_STORE_COL_EVENT_COUNT, &count, - -1); - - if (individual == NULL) - return; - - increase ? count++ : count--; - - contact = empathy_contact_dup_from_folks_individual (individual); - if (contact == event->contact) { - gtk_tree_store_set (GTK_TREE_STORE (model), iter, - EMPATHY_INDIVIDUAL_STORE_COL_EVENT_COUNT, count, -1); - } - - tp_clear_object (&contact); - g_object_unref (individual); -} - -static gboolean -increase_event_count_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - EmpathyEvent *event = user_data; - - modify_event_count (model, iter, event, TRUE); - - return FALSE; -} - -static void -increase_event_count (EmpathyMainWindow *self, - EmpathyEvent *event) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (self); - GtkTreeModel *model; - - model = GTK_TREE_MODEL (priv->individual_store); - - gtk_tree_model_foreach (model, increase_event_count_foreach, event); -} - -static gboolean -decrease_event_count_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - EmpathyEvent *event = user_data; - - modify_event_count (model, iter, event, FALSE); - - return FALSE; -} - -static void -decrease_event_count (EmpathyMainWindow *self, - EmpathyEvent *event) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (self); - GtkTreeModel *model; - - model = GTK_TREE_MODEL (priv->individual_store); - - gtk_tree_model_foreach (model, decrease_event_count_foreach, event); -} - -static void -main_window_event_added_cb (EmpathyEventManager *manager, - EmpathyEvent *event, - EmpathyMainWindow *window) -{ - if (event->contact) { - increase_event_count (window, event); - - main_window_flash_start (window); - } else if (event->type == EMPATHY_EVENT_TYPE_AUTH) { - main_window_auth_display (window, event); - } -} - -static void -main_window_event_removed_cb (EmpathyEventManager *manager, - EmpathyEvent *event, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - FlashForeachData data; - - if (event->type == EMPATHY_EVENT_TYPE_AUTH) { - main_window_remove_auth (window, event); - return; - } - - if (!event->contact) { - return; - } - - decrease_event_count (window, event); - - data.on = FALSE; - data.event = event; - data.window = window; - gtk_tree_model_foreach (GTK_TREE_MODEL (priv->individual_store), - main_window_flash_foreach, - &data); -} - -static gboolean -main_window_load_events_idle_cb (gpointer user_data) -{ - EmpathyMainWindow *window = user_data; - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GSList *l; - - l = empathy_event_manager_get_events (priv->event_manager); - while (l) { - main_window_event_added_cb (priv->event_manager, l->data, - window); - l = l->next; - } - - return FALSE; -} - -static void -main_window_row_activated_cb (EmpathyIndividualView *view, - GtkTreePath *path, - GtkTreeViewColumn *col, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - EmpathyContact *contact = NULL; - FolksIndividual *individual; - GtkTreeModel *model; - GtkTreeIter iter; - GSList *events, *l; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->individual_view)); - gtk_tree_model_get_iter (model, &iter, path); - - gtk_tree_model_get (model, &iter, - EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, - &individual, - -1); - - if (individual != NULL) { - contact = empathy_contact_dup_from_folks_individual (individual); - } - - if (!contact) { - goto OUT; - } - - /* If the contact has an event activate it, otherwise the - * default handler of row-activated will be called. */ - events = empathy_event_manager_get_events (priv->event_manager); - for (l = events; l; l = l->next) { - EmpathyEvent *event = l->data; - - if (event->contact == contact) { - DEBUG ("Activate event"); - empathy_event_activate (event); - - /* We don't want the default handler of this signal - * (e.g. open a chat) */ - g_signal_stop_emission_by_name (view, "row-activated"); - break; - } - } - - g_object_unref (contact); -OUT: - tp_clear_object (&individual); -} - -static void -main_window_row_deleted_cb (GtkTreeModel *model, - GtkTreePath *path, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkTreeIter help_iter; - - if (!gtk_tree_model_get_iter_first (model, &help_iter)) { - priv->empty = TRUE; - - if (empathy_individual_view_is_searching ( - priv->individual_view)) { - gchar *tmp; - - tmp = g_strdup_printf ("%s", - _("No match found")); - - gtk_label_set_markup (GTK_LABEL (priv->no_entry_label), tmp); - g_free (tmp); - - gtk_label_set_line_wrap (GTK_LABEL (priv->no_entry_label), - TRUE); - - gtk_notebook_set_current_page ( - GTK_NOTEBOOK (priv->notebook), PAGE_NO_MATCH); - } - } -} - -static void -main_window_row_inserted_cb (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - if (priv->empty) { - priv->empty = FALSE; - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), - PAGE_CONTACT_LIST); - gtk_widget_grab_focus (GTK_WIDGET (priv->individual_view)); - - /* The store is being filled, it will be done after an idle cb. - * So we can then get events. If we do that too soon, event's - * contact is not yet in the store and it won't get marked as - * having events. */ - g_idle_add (main_window_load_events_idle_cb, window); - } -} - -static void -main_window_remove_error (EmpathyMainWindow *window, - TpAccount *account) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkWidget *error_widget; - - error_widget = g_hash_table_lookup (priv->errors, account); - if (error_widget != NULL) { - gtk_widget_destroy (error_widget); - g_hash_table_remove (priv->errors, account); - } -} - -static void -main_window_account_disabled_cb (TpAccountManager *manager, - TpAccount *account, - EmpathyMainWindow *window) -{ - main_window_remove_error (window, account); -} - -static void -main_window_error_retry_clicked_cb (GtkButton *button, - EmpathyMainWindow *window) -{ - TpAccount *account; - - account = g_object_get_data (G_OBJECT (button), "account"); - tp_account_reconnect_async (account, NULL, NULL); - - main_window_remove_error (window, account); -} - -static void -main_window_error_edit_clicked_cb (GtkButton *button, - EmpathyMainWindow *window) -{ - TpAccount *account; - - account = g_object_get_data (G_OBJECT (button), "account"); - - empathy_accounts_dialog_show_application ( - gtk_widget_get_screen (GTK_WIDGET (button)), - account, FALSE, FALSE); - - main_window_remove_error (window, account); -} - -static void -main_window_error_close_clicked_cb (GtkButton *button, - EmpathyMainWindow *window) -{ - TpAccount *account; - - account = g_object_get_data (G_OBJECT (button), "account"); - main_window_remove_error (window, account); -} - -static void -main_window_error_upgrade_sw_clicked_cb (GtkButton *button, - EmpathyMainWindow *window) -{ - TpAccount *account; - GtkWidget *dialog; - - account = g_object_get_data (G_OBJECT (button), "account"); - main_window_remove_error (window, account); - - dialog = gtk_message_dialog_new (GTK_WINDOW (window), - GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("Sorry, %s accounts can’t be used until your %s software is updated."), - tp_account_get_protocol (account), - tp_account_get_protocol (account)); - - g_signal_connect_swapped (dialog, "response", - G_CALLBACK (gtk_widget_destroy), - dialog); - - gtk_widget_show (dialog); -} - -static void -main_window_upgrade_software_error (EmpathyMainWindow *window, - TpAccount *account) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkWidget *info_bar; - GtkWidget *content_area; - GtkWidget *label; - GtkWidget *image; - GtkWidget *upgrade_button; - GtkWidget *close_button; - GtkWidget *action_area; - GtkWidget *action_grid; - gchar *str; - const gchar *icon_name; - const gchar *error_message; - gboolean user_requested; - - error_message = - empathy_account_get_error_message (account, &user_requested); - - if (user_requested) { - return; - } - - str = g_markup_printf_escaped ("%s\n%s", - tp_account_get_display_name (account), - error_message); - - /* If there are other errors, remove them */ - main_window_remove_error (window, account); - - info_bar = gtk_info_bar_new (); - gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_ERROR); - - gtk_widget_set_no_show_all (info_bar, TRUE); - gtk_box_pack_start (GTK_BOX (priv->errors_vbox), info_bar, FALSE, TRUE, 0); - gtk_widget_show (info_bar); - - icon_name = tp_account_get_icon_name (account); - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_widget_show (image); - - label = gtk_label_new (str); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - gtk_widget_show (label); - g_free (str); - - content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); - gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0); - - image = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON); - upgrade_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (upgrade_button), image); - gtk_widget_set_tooltip_text (upgrade_button, _("Update software...")); - gtk_widget_show (upgrade_button); - - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON); - close_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (close_button), image); - gtk_widget_set_tooltip_text (close_button, _("Close")); - gtk_widget_show (close_button); - - action_grid = gtk_grid_new (); - gtk_grid_set_column_spacing (GTK_GRID (action_grid), 2); - gtk_widget_show (action_grid); - - action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar)); - gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0); - - gtk_grid_attach (GTK_GRID (action_grid), upgrade_button, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (action_grid), close_button, 1, 0, 1, 1); - - g_object_set_data (G_OBJECT (info_bar), "label", label); - g_object_set_data_full (G_OBJECT (info_bar), - "account", g_object_ref (account), - g_object_unref); - g_object_set_data_full (G_OBJECT (upgrade_button), - "account", g_object_ref (account), - g_object_unref); - g_object_set_data_full (G_OBJECT (close_button), - "account", g_object_ref (account), - g_object_unref); - - g_signal_connect (upgrade_button, "clicked", - G_CALLBACK (main_window_error_upgrade_sw_clicked_cb), - window); - g_signal_connect (close_button, "clicked", - G_CALLBACK (main_window_error_close_clicked_cb), - window); - - gtk_widget_set_tooltip_text (priv->errors_vbox, error_message); - gtk_widget_show (priv->errors_vbox); - - g_hash_table_insert (priv->errors, g_object_ref (account), info_bar); -} - -static void -main_window_error_display (EmpathyMainWindow *window, - TpAccount *account) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkWidget *info_bar; - GtkWidget *content_area; - GtkWidget *label; - GtkWidget *image; - GtkWidget *retry_button; - GtkWidget *edit_button; - GtkWidget *close_button; - GtkWidget *action_area; - GtkWidget *action_grid; - gchar *str; - const gchar *icon_name; - const gchar *error_message; - gboolean user_requested; - - if (!tp_strdiff (TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED, - tp_account_get_detailed_error (account, NULL))) { - main_window_upgrade_software_error (window, account); - return; - } - - error_message = - empathy_account_get_error_message (account, &user_requested); - - if (user_requested) { - return; - } - - str = g_markup_printf_escaped ("%s\n%s", - tp_account_get_display_name (account), - error_message); - - info_bar = g_hash_table_lookup (priv->errors, account); - if (info_bar) { - label = g_object_get_data (G_OBJECT (info_bar), "label"); - - /* Just set the latest error and return */ - gtk_label_set_markup (GTK_LABEL (label), str); - g_free (str); - - return; - } - - info_bar = gtk_info_bar_new (); - gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_ERROR); - - gtk_widget_set_no_show_all (info_bar, TRUE); - gtk_box_pack_start (GTK_BOX (priv->errors_vbox), info_bar, FALSE, TRUE, 0); - gtk_widget_show (info_bar); - - icon_name = tp_account_get_icon_name (account); - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_widget_show (image); - - label = gtk_label_new (str); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - gtk_widget_show (label); - g_free (str); - - content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); - gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0); - - image = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON); - retry_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (retry_button), image); - gtk_widget_set_tooltip_text (retry_button, _("Reconnect")); - gtk_widget_show (retry_button); - - image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON); - edit_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (edit_button), image); - gtk_widget_set_tooltip_text (edit_button, _("Edit Account")); - gtk_widget_show (edit_button); - - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON); - close_button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (close_button), image); - gtk_widget_set_tooltip_text (close_button, _("Close")); - gtk_widget_show (close_button); - - action_grid = gtk_grid_new (); - gtk_grid_set_column_spacing (GTK_GRID (action_grid), 2); - gtk_widget_show (action_grid); - - action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar)); - gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0); - - gtk_grid_attach (GTK_GRID (action_grid), retry_button, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (action_grid), edit_button, 1, 0, 1, 1); - gtk_grid_attach (GTK_GRID (action_grid), close_button, 2, 0, 1, 1); - - g_object_set_data (G_OBJECT (info_bar), "label", label); - g_object_set_data_full (G_OBJECT (info_bar), - "account", g_object_ref (account), - g_object_unref); - g_object_set_data_full (G_OBJECT (edit_button), - "account", g_object_ref (account), - g_object_unref); - g_object_set_data_full (G_OBJECT (close_button), - "account", g_object_ref (account), - g_object_unref); - g_object_set_data_full (G_OBJECT (retry_button), - "account", g_object_ref (account), - g_object_unref); - - g_signal_connect (edit_button, "clicked", - G_CALLBACK (main_window_error_edit_clicked_cb), - window); - g_signal_connect (close_button, "clicked", - G_CALLBACK (main_window_error_close_clicked_cb), - window); - g_signal_connect (retry_button, "clicked", - G_CALLBACK (main_window_error_retry_clicked_cb), - window); - - gtk_widget_set_tooltip_text (priv->errors_vbox, error_message); - gtk_widget_show (priv->errors_vbox); - - g_hash_table_insert (priv->errors, g_object_ref (account), info_bar); -} - -static void -main_window_update_status (EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - gboolean connected, connecting; - GList *l, *children; - - connected = empathy_account_manager_get_accounts_connected (&connecting); - - /* Update the spinner state */ - if (connecting) { - gtk_spinner_start (GTK_SPINNER (priv->throbber)); - gtk_widget_show (priv->throbber_tool_item); - } else { - gtk_spinner_stop (GTK_SPINNER (priv->throbber)); - gtk_widget_hide (priv->throbber_tool_item); - } - - /* Update widgets sensibility */ - for (l = priv->actions_connected; l; l = l->next) { - gtk_action_set_sensitive (l->data, connected); - } - - /* Update favourite rooms sensitivity */ - children = gtk_container_get_children (GTK_CONTAINER (priv->room_menu)); - for (l = children; l != NULL; l = l->next) { - if (g_object_get_data (G_OBJECT (l->data), "is_favorite") != NULL) { - gtk_widget_set_sensitive (GTK_WIDGET (l->data), connected); - } - } - g_list_free (children); -} - -static char * -main_window_account_to_action_name (TpAccount *account) -{ - char *r; - - /* action names can't have '/' in them, replace it with '.' */ - r = g_strdup (tp_account_get_path_suffix (account)); - r = g_strdelimit (r, "/", '.'); - - return r; -} - -static void -main_window_balance_activate_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - const char *uri; - - uri = g_object_get_data (G_OBJECT (action), "manage-credit-uri"); - - if (!tp_str_empty (uri)) { - DEBUG ("Top-up credit URI: %s", uri); - empathy_url_show (GTK_WIDGET (window), uri); - } else { - DEBUG ("unknown protocol for top-up"); - } -} - -static void -main_window_balance_update_balance (GtkAction *action, - TpConnection *conn) -{ - TpAccount *account = tp_connection_get_account (conn); - GtkWidget *label; - int amount = 0; - guint scale = G_MAXINT32; - const gchar *currency = ""; - char *money, *str; - - if (!tp_connection_get_balance (conn, &amount, &scale, ¤cy)) - return; - - if (amount == 0 && - scale == G_MAXINT32 && - tp_str_empty (currency)) { - /* unknown balance */ - money = g_strdup ("--"); - } else { - char *tmp = empathy_format_currency (amount, scale, currency); - - money = g_strdup_printf ("%s %s", currency, tmp); - g_free (tmp); - } - - /* Translators: this string will be something like: - * Top up My Account ($1.23)..." */ - str = g_strdup_printf (_("Top up %s (%s)..."), - tp_account_get_display_name (account), - money); - - gtk_action_set_label (action, str); - g_free (str); - - /* update the money label in the roster */ - label = g_object_get_data (G_OBJECT (action), "money-label"); - - gtk_label_set_text (GTK_LABEL (label), money); - g_free (money); -} - -static void -main_window_balance_changed_cb (TpConnection *conn, - guint balance, - guint scale, - const gchar *currency, - GtkAction *action) -{ - main_window_balance_update_balance (action, conn); -} - -static GtkAction * -main_window_setup_balance_create_action (EmpathyMainWindow *window, - TpAccount *account) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkAction *action; - char *name, *ui; - guint merge_id; - GError *error = NULL; - - /* create the action group if required */ - if (priv->balance_action_group == NULL) { - priv->balance_action_group = - gtk_action_group_new ("balance-action-group"); - - gtk_ui_manager_insert_action_group (priv->ui_manager, - priv->balance_action_group, -1); - } - - /* create the action */ - name = main_window_account_to_action_name (account); - action = gtk_action_new (name, - tp_account_get_display_name (account), - _("Top up account credit"), - NULL); - g_object_bind_property (account, "icon-name", action, "icon-name", - G_BINDING_SYNC_CREATE); - - g_signal_connect (action, "activate", - G_CALLBACK (main_window_balance_activate_cb), window); - - gtk_action_group_add_action (priv->balance_action_group, action); - g_object_unref (action); - - ui = g_strdup_printf ( - "" - " " - " " - " " - " " - " " - " " - " " - "", - name); - - merge_id = gtk_ui_manager_add_ui_from_string (priv->ui_manager, - ui, -1, &error); - if (error != NULL) { - DEBUG ("Failed to add balance UI for %s: %s", - tp_account_get_display_name (account), - error->message); - g_error_free (error); - } - - g_object_set_data (G_OBJECT (action), - "merge-id", GUINT_TO_POINTER (merge_id)); - - g_free (name); - g_free (ui); - - return action; -} - -static GtkWidget * -main_window_setup_balance_create_widget (EmpathyMainWindow *window, - GtkAction *action, - TpAccount *account) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkWidget *hbox, *image, *label, *button; - - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - - /* protocol icon */ - image = gtk_image_new (); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0); - g_object_bind_property (action, "icon-name", image, "icon-name", - G_BINDING_SYNC_CREATE); - - /* account name label */ - label = gtk_label_new (""); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - g_object_bind_property (account, "display-name", label, "label", - G_BINDING_SYNC_CREATE); - - /* balance label */ - label = gtk_label_new (""); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); - g_object_set_data (G_OBJECT (action), "money-label", label); - - /* top up button */ - button = gtk_button_new_with_label (_("Top Up...")); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0); - g_signal_connect_swapped (button, "clicked", - G_CALLBACK (gtk_action_activate), action); - - gtk_box_pack_start (GTK_BOX (priv->balance_vbox), hbox, FALSE, TRUE, 0); - gtk_widget_show_all (hbox); - - /* tie the lifetime of the widget to the lifetime of the action */ - g_object_weak_ref (G_OBJECT (action), - (GWeakNotify) gtk_widget_destroy, hbox); - - return hbox; -} - -static void -main_window_setup_balance (EmpathyMainWindow *window, - TpAccount *account) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - TpConnection *conn = tp_account_get_connection (account); - GtkAction *action; - const gchar *uri; - - if (conn == NULL) - return; - - if (!tp_proxy_is_prepared (conn, TP_CONNECTION_FEATURE_BALANCE)) - return; - - DEBUG ("Setting up balance for acct: %s", - tp_account_get_display_name (account)); - - /* create the action */ - action = main_window_setup_balance_create_action (window, account); - - if (action == NULL) - return; - - gtk_action_set_visible (priv->view_balance_show_in_roster, TRUE); - - /* create the display widget */ - main_window_setup_balance_create_widget (window, action, account); - - /* check the current balance and monitor for any changes */ - uri = tp_connection_get_balance_uri (conn); - - g_object_set_data_full (G_OBJECT (action), "manage-credit-uri", - g_strdup (uri), g_free); - gtk_action_set_sensitive (GTK_ACTION (action), !tp_str_empty (uri)); - - main_window_balance_update_balance (GTK_ACTION (action), conn); - - g_signal_connect (conn, "balance-changed", - G_CALLBACK (main_window_balance_changed_cb), action); - -} - -static void -main_window_remove_balance_action (EmpathyMainWindow *window, - TpAccount *account) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkAction *action; - char *name; - GList *a; - - if (priv->balance_action_group == NULL) - return; - - name = main_window_account_to_action_name (account); - - action = gtk_action_group_get_action ( - priv->balance_action_group, name); - - if (action != NULL) { - guint merge_id; - - DEBUG ("Removing action"); - - merge_id = GPOINTER_TO_UINT (g_object_get_data ( - G_OBJECT (action), - "merge-id")); - - gtk_ui_manager_remove_ui (priv->ui_manager, - merge_id); - gtk_action_group_remove_action ( - priv->balance_action_group, action); - } - - g_free (name); - - a = gtk_action_group_list_actions ( - priv->balance_action_group); - - gtk_action_set_visible ( - priv->view_balance_show_in_roster, - g_list_length (a) > 0); - - g_list_free (a); -} - -static void -main_window_connection_changed_cb (TpAccount *account, - guint old_status, - guint current, - guint reason, - gchar *dbus_error_name, - GHashTable *details, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - main_window_update_status (window); - - if (current == TP_CONNECTION_STATUS_DISCONNECTED && - reason != TP_CONNECTION_STATUS_REASON_REQUESTED) { - main_window_error_display (window, account); - } - - if (current == TP_CONNECTION_STATUS_DISCONNECTED) { - empathy_sound_manager_play (priv->sound_mgr, GTK_WIDGET (window), - EMPATHY_SOUND_ACCOUNT_DISCONNECTED); - - /* remove balance action if required */ - main_window_remove_balance_action (window, account); - } - - if (current == TP_CONNECTION_STATUS_CONNECTED) { - empathy_sound_manager_play (priv->sound_mgr, GTK_WIDGET (window), - EMPATHY_SOUND_ACCOUNT_CONNECTED); - - /* Account connected without error, remove error message if any */ - main_window_remove_error (window, account); - main_window_setup_balance (window, account); - } -} - -static void -main_window_accels_load (void) -{ - gchar *filename; - - filename = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, ACCELS_FILENAME, NULL); - if (g_file_test (filename, G_FILE_TEST_EXISTS)) { - DEBUG ("Loading from:'%s'", filename); - gtk_accel_map_load (filename); - } - - g_free (filename); -} - -static void -main_window_accels_save (void) -{ - gchar *dir; - gchar *file_with_path; - - dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); - g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR); - file_with_path = g_build_filename (dir, ACCELS_FILENAME, NULL); - g_free (dir); - - DEBUG ("Saving to:'%s'", file_with_path); - gtk_accel_map_save (file_with_path); - - g_free (file_with_path); -} - -static void -empathy_main_window_finalize (GObject *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GHashTableIter iter; - gpointer key, value; - - /* Save user-defined accelerators. */ - main_window_accels_save (); - - g_list_free (priv->actions_connected); - - g_object_unref (priv->account_manager); - g_object_unref (priv->individual_store); - g_object_unref (priv->contact_manager); - g_object_unref (priv->sound_mgr); - g_hash_table_unref (priv->errors); - g_hash_table_unref (priv->auths); - - /* disconnect all handlers of status-changed signal */ - g_hash_table_iter_init (&iter, priv->status_changed_handlers); - while (g_hash_table_iter_next (&iter, &key, &value)) - g_signal_handler_disconnect (TP_ACCOUNT (key), - GPOINTER_TO_UINT (value)); - - g_hash_table_unref (priv->status_changed_handlers); - - g_signal_handlers_disconnect_by_func (priv->event_manager, - main_window_event_added_cb, - window); - g_signal_handlers_disconnect_by_func (priv->event_manager, - main_window_event_removed_cb, - window); - g_object_unref (priv->call_observer); - g_object_unref (priv->event_manager); - g_object_unref (priv->ui_manager); - g_object_unref (priv->chatroom_manager); - - g_object_unref (priv->gsettings_ui); - g_object_unref (priv->gsettings_contacts); - - G_OBJECT_CLASS (empathy_main_window_parent_class)->finalize (window); -} - -static gboolean -main_window_key_press_event_cb (GtkWidget *window, - GdkEventKey *event, - gpointer user_data) -{ - if (event->keyval == GDK_KEY_T - && event->state & GDK_SHIFT_MASK - && event->state & GDK_CONTROL_MASK) { - empathy_chat_manager_call_undo_closed_chat (); - } - return FALSE; -} - -static void -main_window_chat_quit_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - gtk_widget_destroy (GTK_WIDGET (window)); -} - -static void -main_window_view_history_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_log_window_show (NULL, NULL, FALSE, GTK_WINDOW (window)); -} - -static void -main_window_chat_new_message_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_new_message_dialog_show (GTK_WINDOW (window)); -} - -static void -main_window_chat_new_call_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_new_call_dialog_show (GTK_WINDOW (window)); -} - -static void -main_window_chat_add_contact_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_new_individual_dialog_show (GTK_WINDOW (window)); -} - -static void -main_window_chat_search_contacts_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - GtkWidget *dialog = empathy_contact_search_dialog_new ( - GTK_WINDOW (window)); - gtk_widget_show (dialog); -} - -static void -main_window_view_show_ft_manager (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_ft_manager_show (); -} - -static void -main_window_view_show_offline_cb (GtkToggleAction *action, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - gboolean current; - - current = gtk_toggle_action_get_active (action); - g_settings_set_boolean (priv->gsettings_ui, - EMPATHY_PREFS_UI_SHOW_OFFLINE, - current); - - empathy_individual_view_set_show_offline (priv->individual_view, - current); -} - -static void -main_window_notify_sort_contact_cb (GSettings *gsettings, - const gchar *key, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - gchar *str; - - str = g_settings_get_string (gsettings, key); - - if (str != NULL) { - GType type; - GEnumClass *enum_class; - GEnumValue *enum_value; - - type = empathy_individual_store_sort_get_type (); - enum_class = G_ENUM_CLASS (g_type_class_peek (type)); - enum_value = g_enum_get_value_by_nick (enum_class, str); - if (enum_value) { - /* By changing the value of the GtkRadioAction, - it emits a signal that calls main_window_view_sort_contacts_cb - which updates the contacts list */ - gtk_radio_action_set_current_value (priv->sort_by_name, - enum_value->value); - } else { - g_warning ("Wrong value for sort_criterium configuration : %s", str); - } - g_free (str); - } -} - -static void -main_window_view_sort_contacts_cb (GtkRadioAction *action, - GtkRadioAction *current, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - EmpathyIndividualStoreSort value; - GSList *group; - GType type; - GEnumClass *enum_class; - GEnumValue *enum_value; - - value = gtk_radio_action_get_current_value (action); - group = gtk_radio_action_get_group (action); - - /* Get string from index */ - type = empathy_individual_store_sort_get_type (); - enum_class = G_ENUM_CLASS (g_type_class_peek (type)); - enum_value = g_enum_get_value (enum_class, g_slist_index (group, current)); - - if (!enum_value) { - g_warning ("No GEnumValue for EmpathyContactListSort with GtkRadioAction index:%d", - g_slist_index (group, action)); - } else { - g_settings_set_string (priv->gsettings_contacts, - EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, - enum_value->value_nick); - } - empathy_individual_store_set_sort_criterium (priv->individual_store, - value); -} - -static void -main_window_view_show_protocols_cb (GtkToggleAction *action, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - gboolean value; - - value = gtk_toggle_action_get_active (action); - - g_settings_set_boolean (priv->gsettings_ui, - EMPATHY_PREFS_UI_SHOW_PROTOCOLS, - value); - empathy_individual_store_set_show_protocols (priv->individual_store, - value); -} - -/* Matches GtkRadioAction values set in empathy-main-window.ui */ -#define CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS 0 -#define CONTACT_LIST_NORMAL_SIZE 1 -#define CONTACT_LIST_COMPACT_SIZE 2 - -static void -main_window_view_contacts_list_size_cb (GtkRadioAction *action, - GtkRadioAction *current, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GSettings *gsettings_ui; - gint value; - - value = gtk_radio_action_get_current_value (action); - /* create a new GSettings, so we can delay the setting until both - * values are set */ - gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA); - - DEBUG ("radio button toggled, value = %i", value); - - g_settings_delay (gsettings_ui); - g_settings_set_boolean (gsettings_ui, - EMPATHY_PREFS_UI_SHOW_AVATARS, - value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS); - - g_settings_set_boolean (gsettings_ui, - EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, - value == CONTACT_LIST_COMPACT_SIZE); - g_settings_apply (gsettings_ui); - - /* FIXME: these enums probably have the wrong namespace */ - empathy_individual_store_set_show_avatars (priv->individual_store, - value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS); - empathy_individual_store_set_is_compact (priv->individual_store, - value == CONTACT_LIST_COMPACT_SIZE); - - g_object_unref (gsettings_ui); -} - -static void main_window_notify_show_protocols_cb (GSettings *gsettings, - const gchar *key, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - gtk_toggle_action_set_active (priv->show_protocols, - g_settings_get_boolean (gsettings, - EMPATHY_PREFS_UI_SHOW_PROTOCOLS)); -} - - -static void -main_window_notify_contact_list_size_cb (GSettings *gsettings, - const gchar *key, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - gint value; - - if (g_settings_get_boolean (gsettings, - EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST)) { - value = CONTACT_LIST_COMPACT_SIZE; - } else if (g_settings_get_boolean (gsettings, - EMPATHY_PREFS_UI_SHOW_AVATARS)) { - value = CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS; - } else { - value = CONTACT_LIST_NORMAL_SIZE; - } - - DEBUG ("setting changed, value = %i", value); - - /* By changing the value of the GtkRadioAction, - it emits a signal that calls main_window_view_contacts_list_size_cb - which updates the contacts list */ - gtk_radio_action_set_current_value (priv->normal_with_avatars, value); -} - -static void -main_window_edit_search_contacts_cb (GtkCheckMenuItem *item, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - empathy_individual_view_start_search (priv->individual_view); -} - -static void -main_window_view_show_map_cb (GtkCheckMenuItem *item, - EmpathyMainWindow *window) -{ -#ifdef HAVE_LIBCHAMPLAIN - empathy_map_view_show (); -#endif -} - -static void -join_chatroom (EmpathyChatroom *chatroom, - gint64 timestamp) -{ - TpAccount *account; - const gchar *room; - - account = empathy_chatroom_get_account (chatroom); - room = empathy_chatroom_get_room (chatroom); - - DEBUG ("Requesting channel for '%s'", room); - empathy_join_muc (account, room, timestamp); -} - -typedef struct -{ - TpAccount *account; - EmpathyChatroom *chatroom; - gint64 timestamp; - glong sig_id; - guint timeout; -} join_fav_account_sig_ctx; - -static join_fav_account_sig_ctx * -join_fav_account_sig_ctx_new (TpAccount *account, - EmpathyChatroom *chatroom, - gint64 timestamp) -{ - join_fav_account_sig_ctx *ctx = g_slice_new0 ( - join_fav_account_sig_ctx); - - ctx->account = g_object_ref (account); - ctx->chatroom = g_object_ref (chatroom); - ctx->timestamp = timestamp; - return ctx; -} - -static void -join_fav_account_sig_ctx_free (join_fav_account_sig_ctx *ctx) -{ - g_object_unref (ctx->account); - g_object_unref (ctx->chatroom); - g_slice_free (join_fav_account_sig_ctx, ctx); -} - -static void -account_status_changed_cb (TpAccount *account, - TpConnectionStatus old_status, - TpConnectionStatus new_status, - guint reason, - gchar *dbus_error_name, - GHashTable *details, - gpointer user_data) -{ - join_fav_account_sig_ctx *ctx = user_data; - - switch (new_status) { - case TP_CONNECTION_STATUS_DISCONNECTED: - /* Don't wait any longer */ - goto finally; - break; - - case TP_CONNECTION_STATUS_CONNECTING: - /* Wait a bit */ - return; - - case TP_CONNECTION_STATUS_CONNECTED: - /* We can join the room */ - break; - - default: - g_assert_not_reached (); - } - - join_chatroom (ctx->chatroom, ctx->timestamp); - -finally: - g_source_remove (ctx->timeout); - g_signal_handler_disconnect (account, ctx->sig_id); -} - -#define JOIN_FAVORITE_TIMEOUT 5 - -static gboolean -join_favorite_timeout_cb (gpointer data) -{ - join_fav_account_sig_ctx *ctx = data; - - /* stop waiting for joining the favorite room */ - g_signal_handler_disconnect (ctx->account, ctx->sig_id); - return FALSE; -} - -static void -main_window_favorite_chatroom_join (EmpathyChatroom *chatroom) -{ - TpAccount *account; - - account = empathy_chatroom_get_account (chatroom); - if (tp_account_get_connection_status (account, NULL) != - TP_CONNECTION_STATUS_CONNECTED) { - join_fav_account_sig_ctx *ctx; - - ctx = join_fav_account_sig_ctx_new (account, chatroom, - empathy_get_current_action_time ()); - - ctx->sig_id = g_signal_connect_data (account, "status-changed", - G_CALLBACK (account_status_changed_cb), ctx, - (GClosureNotify) join_fav_account_sig_ctx_free, 0); - - ctx->timeout = g_timeout_add_seconds (JOIN_FAVORITE_TIMEOUT, - join_favorite_timeout_cb, ctx); - return; - } - - join_chatroom (chatroom, empathy_get_current_action_time ()); -} - -static void -main_window_favorite_chatroom_menu_activate_cb (GtkMenuItem *menu_item, - EmpathyChatroom *chatroom) -{ - main_window_favorite_chatroom_join (chatroom); -} - -static void -main_window_favorite_chatroom_menu_add (EmpathyMainWindow *window, - EmpathyChatroom *chatroom) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkWidget *menu_item; - const gchar *name, *account_name; - gchar *label; - - - if (g_object_get_data (G_OBJECT (chatroom), "menu_item")) { - return; - } - - name = empathy_chatroom_get_name (chatroom); - account_name = tp_account_get_display_name ( - empathy_chatroom_get_account (chatroom)); - label = g_strdup_printf ("%s (%s)", name, account_name); - menu_item = gtk_menu_item_new_with_label (label); - g_free (label); - g_object_set_data (G_OBJECT (menu_item), "is_favorite", - GUINT_TO_POINTER (TRUE)); - - g_object_set_data (G_OBJECT (chatroom), "menu_item", menu_item); - g_signal_connect (menu_item, "activate", - G_CALLBACK (main_window_favorite_chatroom_menu_activate_cb), - chatroom); - - gtk_menu_shell_insert (GTK_MENU_SHELL (priv->room_menu), - menu_item, 4); - - gtk_widget_show (menu_item); -} - -static void -main_window_favorite_chatroom_menu_added_cb (EmpathyChatroomManager *manager, - EmpathyChatroom *chatroom, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - main_window_favorite_chatroom_menu_add (window, chatroom); - gtk_widget_show (priv->room_separator); - gtk_action_set_sensitive (priv->room_join_favorites, TRUE); -} - -static void -main_window_favorite_chatroom_menu_removed_cb (EmpathyChatroomManager *manager, - EmpathyChatroom *chatroom, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkWidget *menu_item; - GList *chatrooms; - - menu_item = g_object_get_data (G_OBJECT (chatroom), "menu_item"); - g_object_set_data (G_OBJECT (chatroom), "menu_item", NULL); - gtk_widget_destroy (menu_item); - - chatrooms = empathy_chatroom_manager_get_chatrooms (priv->chatroom_manager, NULL); - if (chatrooms) { - gtk_widget_show (priv->room_separator); - } else { - gtk_widget_hide (priv->room_separator); - } - - gtk_action_set_sensitive (priv->room_join_favorites, chatrooms != NULL); - g_list_free (chatrooms); -} - -static void -main_window_favorite_chatroom_menu_setup (EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GList *chatrooms, *l; - GtkWidget *room; - - priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL); - chatrooms = empathy_chatroom_manager_get_chatrooms ( - priv->chatroom_manager, NULL); - room = gtk_ui_manager_get_widget (priv->ui_manager, - "/menubar/room"); - priv->room_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (room)); - priv->room_separator = gtk_ui_manager_get_widget (priv->ui_manager, - "/menubar/room/room_separator"); - - for (l = chatrooms; l; l = l->next) { - main_window_favorite_chatroom_menu_add (window, l->data); - } - - if (!chatrooms) { - gtk_widget_hide (priv->room_separator); - } - - gtk_action_set_sensitive (priv->room_join_favorites, chatrooms != NULL); - - g_signal_connect (priv->chatroom_manager, "chatroom-added", - G_CALLBACK (main_window_favorite_chatroom_menu_added_cb), - window); - g_signal_connect (priv->chatroom_manager, "chatroom-removed", - G_CALLBACK (main_window_favorite_chatroom_menu_removed_cb), - window); - - g_list_free (chatrooms); -} - -static void -main_window_room_join_new_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_new_chatroom_dialog_show (GTK_WINDOW (window)); -} - -static void -main_window_room_join_favorites_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GList *chatrooms, *l; - - chatrooms = empathy_chatroom_manager_get_chatrooms (priv->chatroom_manager, NULL); - for (l = chatrooms; l; l = l->next) { - main_window_favorite_chatroom_join (l->data); - } - g_list_free (chatrooms); -} - -static void -main_window_room_manage_favorites_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_chatrooms_window_show (GTK_WINDOW (window)); -} - -static void -main_window_edit_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GtkWidget *submenu; - - /* FIXME: It should use the UIManager to merge the contact/group submenu */ - submenu = empathy_individual_view_get_individual_menu ( - priv->individual_view); - if (submenu) { - GtkMenuItem *item; - GtkWidget *label; - - item = GTK_MENU_ITEM (priv->edit_context); - label = gtk_bin_get_child (GTK_BIN (item)); - gtk_label_set_text (GTK_LABEL (label), _("Contact")); - - gtk_widget_show (priv->edit_context); - gtk_widget_show (priv->edit_context_separator); - - gtk_menu_item_set_submenu (item, submenu); - - return; - } - - submenu = empathy_individual_view_get_group_menu ( - priv->individual_view); - if (submenu) { - GtkMenuItem *item; - GtkWidget *label; - - item = GTK_MENU_ITEM (priv->edit_context); - label = gtk_bin_get_child (GTK_BIN (item)); - gtk_label_set_text (GTK_LABEL (label), _("Group")); - - gtk_widget_show (priv->edit_context); - gtk_widget_show (priv->edit_context_separator); - - gtk_menu_item_set_submenu (item, submenu); - - return; - } - - gtk_widget_hide (priv->edit_context); - gtk_widget_hide (priv->edit_context_separator); - - return; -} - -static void -main_window_edit_accounts_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_accounts_dialog_show_application (gdk_screen_get_default (), - NULL, FALSE, FALSE); -} - -static void -main_window_edit_personal_information_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_contact_personal_dialog_show (GTK_WINDOW (window)); -} - -static void -main_window_edit_blocked_contacts_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - GtkWidget *dialog; - - dialog = empathy_contact_blocking_dialog_new (GTK_WINDOW (window)); - gtk_widget_show (dialog); - g_signal_connect (dialog, "response", - G_CALLBACK (gtk_widget_destroy), NULL); -} - -void -empathy_main_window_show_preferences (EmpathyMainWindow *window, - const gchar *tab) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - if (priv->preferences == NULL) { - priv->preferences = empathy_preferences_new (GTK_WINDOW (window), - priv->shell_running); - g_object_add_weak_pointer (G_OBJECT (priv->preferences), - (gpointer) &priv->preferences); - - gtk_widget_show (priv->preferences); - } else { - gtk_window_present (GTK_WINDOW (priv->preferences)); - } - - if (tab != NULL) - empathy_preferences_show_tab ( - EMPATHY_PREFERENCES (priv->preferences), tab); -} - -static void -main_window_edit_preferences_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_main_window_show_preferences (window, NULL); -} - -static void -main_window_help_about_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_about_dialog_new (GTK_WINDOW (window)); -} - -static void -main_window_help_debug_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_launch_program (BIN_DIR, "empathy-debugger", NULL); -} - -static void -main_window_help_contents_cb (GtkAction *action, - EmpathyMainWindow *window) -{ - empathy_url_show (GTK_WIDGET (window), "ghelp:empathy"); -} - -static gboolean -main_window_throbber_button_press_event_cb (GtkWidget *throbber, - GdkEventButton *event, - EmpathyMainWindow *window) -{ - if (event->type != GDK_BUTTON_PRESS || - event->button != 1) { - return FALSE; - } - - empathy_accounts_dialog_show_application ( - gtk_widget_get_screen (GTK_WIDGET (throbber)), - NULL, FALSE, FALSE); - - return FALSE; -} - -static void -main_window_account_removed_cb (TpAccountManager *manager, - TpAccount *account, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GList *a; - - a = tp_account_manager_get_valid_accounts (manager); - - gtk_action_set_sensitive (priv->view_history, - g_list_length (a) > 0); - - g_list_free (a); - - /* remove errors if any */ - main_window_remove_error (window, account); - - /* remove the balance action if required */ - main_window_remove_balance_action (window, account); -} - -static void -main_window_account_validity_changed_cb (TpAccountManager *manager, - TpAccount *account, - gboolean valid, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - if (valid) { - gulong handler_id; - handler_id = GPOINTER_TO_UINT (g_hash_table_lookup ( - priv->status_changed_handlers, account)); - - /* connect signal only if it was not connected yet */ - if (handler_id == 0) { - handler_id = g_signal_connect (account, - "status-changed", - G_CALLBACK (main_window_connection_changed_cb), - window); - g_hash_table_insert (priv->status_changed_handlers, - account, GUINT_TO_POINTER (handler_id)); - } - } - - main_window_account_removed_cb (manager, account, window); -} - -static void -main_window_notify_show_offline_cb (GSettings *gsettings, - const gchar *key, - gpointer toggle_action) -{ - gtk_toggle_action_set_active (toggle_action, - g_settings_get_boolean (gsettings, key)); -} - -static void -main_window_connection_items_setup (EmpathyMainWindow *window, - GtkBuilder *gui) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GList *list; - GObject *action; - guint i; - const gchar *actions_connected[] = { - "room_join_new", - "room_join_favorites", - "chat_new_message", - "chat_new_call", - "chat_search_contacts", - "chat_add_contact", - "edit_personal_information", - "edit_blocked_contacts", - "edit_search_contacts" - }; - - for (i = 0, list = NULL; i < G_N_ELEMENTS (actions_connected); i++) { - action = gtk_builder_get_object (gui, actions_connected[i]); - list = g_list_prepend (list, action); - } - - priv->actions_connected = list; -} - -static void -account_manager_prepared_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - GList *accounts, *j; - TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object); - EmpathyMainWindow *window = user_data; - EmpathyMainWindowPriv *priv = GET_PRIV (window); - GError *error = NULL; - - if (!tp_proxy_prepare_finish (manager, result, &error)) { - DEBUG ("Failed to prepare account manager: %s", error->message); - g_error_free (error); - return; - } - - accounts = tp_account_manager_get_valid_accounts (priv->account_manager); - for (j = accounts; j != NULL; j = j->next) { - TpAccount *account = TP_ACCOUNT (j->data); - gulong handler_id; - - handler_id = g_signal_connect (account, "status-changed", - G_CALLBACK (main_window_connection_changed_cb), - window); - g_hash_table_insert (priv->status_changed_handlers, - account, GUINT_TO_POINTER (handler_id)); - - main_window_setup_balance (window, account); - } - - g_signal_connect (manager, "account-validity-changed", - G_CALLBACK (main_window_account_validity_changed_cb), - window); - - main_window_update_status (window); - - /* Disable the "Previous Conversations" menu entry if there is no account */ - gtk_action_set_sensitive (priv->view_history, - g_list_length (accounts) > 0); - - g_list_free (accounts); -} - -void -empathy_main_window_set_shell_running (EmpathyMainWindow *window, - gboolean shell_running) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - if (priv->shell_running == shell_running) - return; - - priv->shell_running = shell_running; - g_object_notify (G_OBJECT (window), "shell-running"); -} - -static GObject * -empathy_main_window_constructor (GType type, - guint n_construct_params, - GObjectConstructParam *construct_params) -{ - static GObject *window = NULL; - - if (window != NULL) - return g_object_ref (window); - - window = G_OBJECT_CLASS (empathy_main_window_parent_class)->constructor ( - type, n_construct_params, construct_params); - - g_object_add_weak_pointer (window, (gpointer) &window); - - return window; -} - -static void -empathy_main_window_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - EmpathyMainWindow *self = EMPATHY_MAIN_WINDOW (object); - EmpathyMainWindowPriv *priv = GET_PRIV (self); - - switch (property_id) - { - case PROP_SHELL_RUNNING: - priv->shell_running = g_value_get_boolean (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static void -empathy_main_window_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) -{ - EmpathyMainWindow *self = EMPATHY_MAIN_WINDOW (object); - EmpathyMainWindowPriv *priv = GET_PRIV (self); - - switch (property_id) - { - case PROP_SHELL_RUNNING: - g_value_set_boolean (value, priv->shell_running); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static void -empathy_main_window_class_init (EmpathyMainWindowClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GParamSpec *pspec; - - object_class->finalize = empathy_main_window_finalize; - object_class->constructor = empathy_main_window_constructor; - - object_class->set_property = empathy_main_window_set_property; - object_class->get_property = empathy_main_window_get_property; - - pspec = g_param_spec_boolean ("shell-running", - "Shell running", - "Whether the Shell is running or not", - FALSE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - g_object_class_install_property (object_class, PROP_SHELL_RUNNING, pspec); - - g_type_class_add_private (object_class, sizeof (EmpathyMainWindowPriv)); -} - -static void -empathy_main_window_init (EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv; - EmpathyIndividualManager *individual_manager; - GtkBuilder *gui, *gui_mgr; - GtkWidget *sw; - GtkToggleAction *show_offline_widget; - GtkAction *show_map_widget; - GtkToolItem *item; - gboolean show_offline; - gchar *filename; - GtkTreeModel *model; - GtkWidget *search_vbox; - GtkWidget *menubar; - - priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, - EMPATHY_TYPE_MAIN_WINDOW, EmpathyMainWindowPriv); - - priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA); - priv->gsettings_contacts = g_settings_new (EMPATHY_PREFS_CONTACTS_SCHEMA); - - priv->sound_mgr = empathy_sound_manager_dup_singleton (); - - gtk_window_set_title (GTK_WINDOW (window), _("Contact List")); - gtk_window_set_role (GTK_WINDOW (window), "contact_list"); - gtk_window_set_default_size (GTK_WINDOW (window), 225, 325); - - /* don't finalize the widget on delete-event, just hide it */ - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_widget_hide_on_delete), NULL); - - /* Set up interface */ - filename = empathy_file_lookup ("empathy-main-window.ui", "src"); - gui = empathy_builder_get_file (filename, - "main_vbox", &priv->main_vbox, - "balance_vbox", &priv->balance_vbox, - "errors_vbox", &priv->errors_vbox, - "auth_vbox", &priv->auth_vbox, - "search_vbox", &search_vbox, - "presence_toolbar", &priv->presence_toolbar, - "notebook", &priv->notebook, - "no_entry_label", &priv->no_entry_label, - "roster_scrolledwindow", &sw, - NULL); - g_free (filename); - - /* Set UI manager */ - filename = empathy_file_lookup ("empathy-main-window-menubar.ui", "src"); - gui_mgr = empathy_builder_get_file (filename, - "ui_manager", &priv->ui_manager, - "view_show_offline", &show_offline_widget, - "view_show_protocols", &priv->show_protocols, - "view_sort_by_name", &priv->sort_by_name, - "view_sort_by_status", &priv->sort_by_status, - "view_normal_size_with_avatars", &priv->normal_with_avatars, - "view_normal_size", &priv->normal_size, - "view_compact_size", &priv->compact_size, - "view_history", &priv->view_history, - "view_show_map", &show_map_widget, - "room_join_favorites", &priv->room_join_favorites, - "view_balance_show_in_roster", &priv->view_balance_show_in_roster, - "menubar", &menubar, - NULL); - g_free (filename); - - /* The UI manager is living in its own .ui file as Glade doesn't support - * those. The GtkMenubar has to be in this file as well to we manually add - * it to the first position of the vbox. */ - gtk_box_pack_start (GTK_BOX (priv->main_vbox), menubar, FALSE, FALSE, 0); - gtk_box_reorder_child (GTK_BOX (priv->main_vbox), menubar, 0); - - gtk_container_add (GTK_CONTAINER (window), priv->main_vbox); - gtk_widget_show (priv->main_vbox); - - g_signal_connect (window, "key-press-event", - G_CALLBACK (main_window_key_press_event_cb), NULL); - - empathy_builder_connect (gui_mgr, window, - "chat_quit", "activate", main_window_chat_quit_cb, - "chat_new_message", "activate", main_window_chat_new_message_cb, - "chat_new_call", "activate", main_window_chat_new_call_cb, - "view_history", "activate", main_window_view_history_cb, - "room_join_new", "activate", main_window_room_join_new_cb, - "room_join_favorites", "activate", main_window_room_join_favorites_cb, - "room_manage_favorites", "activate", main_window_room_manage_favorites_cb, - "chat_add_contact", "activate", main_window_chat_add_contact_cb, - "chat_search_contacts", "activate", main_window_chat_search_contacts_cb, - "view_show_ft_manager", "activate", main_window_view_show_ft_manager, - "view_show_offline", "toggled", main_window_view_show_offline_cb, - "view_show_protocols", "toggled", main_window_view_show_protocols_cb, - "view_sort_by_name", "changed", main_window_view_sort_contacts_cb, - "view_normal_size_with_avatars", "changed", main_window_view_contacts_list_size_cb, - "view_show_map", "activate", main_window_view_show_map_cb, - "edit", "activate", main_window_edit_cb, - "edit_accounts", "activate", main_window_edit_accounts_cb, - "edit_personal_information", "activate", main_window_edit_personal_information_cb, - "edit_blocked_contacts", "activate", main_window_edit_blocked_contacts_cb, - "edit_preferences", "activate", main_window_edit_preferences_cb, - "edit_search_contacts", "activate", main_window_edit_search_contacts_cb, - "help_about", "activate", main_window_help_about_cb, - "help_debug", "activate", main_window_help_debug_cb, - "help_contents", "activate", main_window_help_contents_cb, - NULL); - - /* Set up connection related widgets. */ - main_window_connection_items_setup (window, gui_mgr); - - g_object_ref (priv->ui_manager); - g_object_unref (gui); - g_object_unref (gui_mgr); - -#ifndef HAVE_LIBCHAMPLAIN - gtk_action_set_visible (show_map_widget, FALSE); -#endif - - priv->account_manager = tp_account_manager_dup (); - - tp_proxy_prepare_async (priv->account_manager, NULL, - account_manager_prepared_cb, window); - - priv->errors = g_hash_table_new_full (g_direct_hash, - g_direct_equal, - g_object_unref, - NULL); - - priv->auths = g_hash_table_new (NULL, NULL); - - priv->status_changed_handlers = g_hash_table_new_full (g_direct_hash, - g_direct_equal, - NULL, - NULL); - - /* Set up menu */ - main_window_favorite_chatroom_menu_setup (window); - - priv->edit_context = gtk_ui_manager_get_widget (priv->ui_manager, - "/menubar/edit/edit_context"); - priv->edit_context_separator = gtk_ui_manager_get_widget ( - priv->ui_manager, - "/menubar/edit/edit_context_separator"); - gtk_widget_hide (priv->edit_context); - gtk_widget_hide (priv->edit_context_separator); - - /* Set up contact list. */ - empathy_status_presets_get_all (); - - /* Set up presence chooser */ - priv->presence_chooser = empathy_presence_chooser_new (); - gtk_widget_show (priv->presence_chooser); - item = gtk_tool_item_new (); - gtk_widget_show (GTK_WIDGET (item)); - gtk_widget_set_size_request (priv->presence_chooser, 10, -1); - gtk_container_add (GTK_CONTAINER (item), priv->presence_chooser); - gtk_tool_item_set_is_important (item, TRUE); - gtk_tool_item_set_expand (item, TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (priv->presence_toolbar), item, -1); - - /* Set up the throbber */ - priv->throbber = gtk_spinner_new (); - gtk_widget_set_size_request (priv->throbber, 16, -1); - gtk_widget_set_events (priv->throbber, GDK_BUTTON_PRESS_MASK); - g_signal_connect (priv->throbber, "button-press-event", - G_CALLBACK (main_window_throbber_button_press_event_cb), - window); - gtk_widget_show (priv->throbber); - - item = gtk_tool_item_new (); - gtk_container_set_border_width (GTK_CONTAINER (item), 6); - gtk_toolbar_insert (GTK_TOOLBAR (priv->presence_toolbar), item, -1); - gtk_container_add (GTK_CONTAINER (item), priv->throbber); - priv->throbber_tool_item = GTK_WIDGET (item); - - /* XXX: this class is designed to live for the duration of the program, - * so it's got a race condition between its signal handlers and its - * finalization. The class is planned to be removed, so we won't fix - * this before then. */ - priv->contact_manager = EMPATHY_CONTACT_LIST ( - empathy_contact_manager_dup_singleton ()); - individual_manager = empathy_individual_manager_dup_singleton (); - priv->individual_store = EMPATHY_INDIVIDUAL_STORE ( - empathy_individual_store_manager_new (individual_manager)); - g_object_unref (individual_manager); - - /* For the moment, we disallow Persona drops onto the main contact list (e.g. from things such as - * the EmpathyPersonaView in the linking dialogue). No code is hooked up to do anything on a Persona - * drop, so allowing them would achieve nothing except confusion. */ - priv->individual_view = empathy_individual_view_new ( - priv->individual_store, - EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL ^ EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP, - EMPATHY_INDIVIDUAL_FEATURE_ALL ^ EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT); - - gtk_widget_show (GTK_WIDGET (priv->individual_view)); - gtk_container_add (GTK_CONTAINER (sw), - GTK_WIDGET (priv->individual_view)); - g_signal_connect (priv->individual_view, "row-activated", - G_CALLBACK (main_window_row_activated_cb), - window); - - /* Set up search bar */ - priv->search_bar = empathy_live_search_new ( - GTK_WIDGET (priv->individual_view)); - empathy_individual_view_set_live_search (priv->individual_view, - EMPATHY_LIVE_SEARCH (priv->search_bar)); - gtk_box_pack_start (GTK_BOX (search_vbox), priv->search_bar, - FALSE, TRUE, 0); - - g_signal_connect_swapped (window, "map", - G_CALLBACK (gtk_widget_grab_focus), priv->individual_view); - - /* Connect to proper signals to check if contact list is empty or not */ - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->individual_view)); - priv->empty = TRUE; - g_signal_connect (model, "row-inserted", - G_CALLBACK (main_window_row_inserted_cb), - window); - g_signal_connect (model, "row-deleted", - G_CALLBACK (main_window_row_deleted_cb), - window); - - /* Load user-defined accelerators. */ - main_window_accels_load (); - - /* Set window size. */ - empathy_geometry_bind (GTK_WINDOW (window), GEOMETRY_NAME); - - /* bind view_balance_show_in_roster */ - g_settings_bind (priv->gsettings_ui, "show-balance-in-roster", - priv->view_balance_show_in_roster, "active", - G_SETTINGS_BIND_DEFAULT); - g_object_bind_property (priv->view_balance_show_in_roster, "active", - priv->balance_vbox, "visible", - G_BINDING_SYNC_CREATE); - - /* Enable event handling */ - priv->call_observer = empathy_call_observer_dup_singleton (); - priv->event_manager = empathy_event_manager_dup_singleton (); - - g_signal_connect (priv->event_manager, "event-added", - G_CALLBACK (main_window_event_added_cb), window); - g_signal_connect (priv->event_manager, "event-removed", - G_CALLBACK (main_window_event_removed_cb), window); - g_signal_connect (priv->account_manager, "account-validity-changed", - G_CALLBACK (main_window_account_validity_changed_cb), - window); - g_signal_connect (priv->account_manager, "account-removed", - G_CALLBACK (main_window_account_removed_cb), - window); - g_signal_connect (priv->account_manager, "account-disabled", - G_CALLBACK (main_window_account_disabled_cb), - window); - - /* Show offline ? */ - show_offline = g_settings_get_boolean (priv->gsettings_ui, - EMPATHY_PREFS_UI_SHOW_OFFLINE); - g_signal_connect (priv->gsettings_ui, - "changed::" EMPATHY_PREFS_UI_SHOW_OFFLINE, - G_CALLBACK (main_window_notify_show_offline_cb), - show_offline_widget); - - gtk_toggle_action_set_active (show_offline_widget, show_offline); - - /* Show protocol ? */ - g_signal_connect (priv->gsettings_ui, - "changed::" EMPATHY_PREFS_UI_SHOW_PROTOCOLS, - G_CALLBACK (main_window_notify_show_protocols_cb), - window); - - main_window_notify_show_protocols_cb (priv->gsettings_ui, - EMPATHY_PREFS_UI_SHOW_PROTOCOLS, - window); - - /* Sort by name / by status ? */ - g_signal_connect (priv->gsettings_contacts, - "changed::" EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, - G_CALLBACK (main_window_notify_sort_contact_cb), - window); - - main_window_notify_sort_contact_cb (priv->gsettings_contacts, - EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, - window); - - /* Contacts list size */ - g_signal_connect (priv->gsettings_ui, - "changed::" EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, - G_CALLBACK (main_window_notify_contact_list_size_cb), - window); - g_signal_connect (priv->gsettings_ui, - "changed::" EMPATHY_PREFS_UI_SHOW_AVATARS, - G_CALLBACK (main_window_notify_contact_list_size_cb), - window); - - main_window_notify_contact_list_size_cb (priv->gsettings_ui, - EMPATHY_PREFS_UI_SHOW_AVATARS, - window); -} - -GtkWidget * -empathy_main_window_dup (void) -{ - return g_object_new (EMPATHY_TYPE_MAIN_WINDOW, NULL); -} diff --git a/src/empathy-main-window.h b/src/empathy-main-window.h deleted file mode 100644 index af4c1924..00000000 --- a/src/empathy-main-window.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2002-2007 Imendio AB - * Copyright (C) 2007-2008 Collabora Ltd. - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - * Danielle Madeley - */ - -#ifndef __EMPATHY_MAIN_WINDOW_H__ -#define __EMPATHY_MAIN_WINDOW_H__ - -#include - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_MAIN_WINDOW (empathy_main_window_get_type ()) -#define EMPATHY_MAIN_WINDOW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_MAIN_WINDOW, EmpathyMainWindow)) -#define EMPATHY_MAIN_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_MAIN_WINDOW, EmpathyMainWindowClass)) -#define EMPATHY_IS_MAIN_WINDOW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_MAIN_WINDOW)) -#define EMPATHY_IS_MAIN_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_MAIN_WINDOW)) -#define EMPATHY_MAIN_WINDOW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_MAIN_WINDOW, EmpathyMainWindowClass)) - -typedef struct _EmpathyMainWindow EmpathyMainWindow; -typedef struct _EmpathyMainWindowClass EmpathyMainWindowClass; -typedef struct _EmpathyMainWindowPriv EmpathyMainWindowPriv; - -struct _EmpathyMainWindow { - GtkWindow parent; - gpointer priv; -}; - -struct _EmpathyMainWindowClass { - GtkWindowClass parent_class; -}; - -GType empathy_main_window_get_type (void); - -GtkWidget *empathy_main_window_dup (void); - -void empathy_main_window_show_preferences (EmpathyMainWindow *window, - const gchar *tab); -void empathy_main_window_set_shell_running (EmpathyMainWindow *window, - gboolean shell_running); - -G_END_DECLS - -#endif /* __EMPATHY_MAIN_WINDOW_H__ */ diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui deleted file mode 100644 index a09d123f..00000000 --- a/src/empathy-main-window.ui +++ /dev/null @@ -1,111 +0,0 @@ - - - - - True - False - - - True - False - both - - - - False - False - 1 - - - - - False - 3 - - - - - - False - False - 2 - - - - - False - - - - - - False - False - 3 - - - - - False - - - - - - False - False - 4 - - - - - True - False - - - - - - False - False - 5 - - - - - True - True - False - False - - - True - True - True - never - - - - - - - - True - False - 0.30000001192092896 - - - 1 - - - - - True - True - 6 - - - - diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c index 72aab0b2..9ab82c09 100644 --- a/src/empathy-map-view.c +++ b/src/empathy-map-view.c @@ -31,11 +31,11 @@ #include #include -#include +#include #include #include -#include +#include #include #include "empathy-map-view.h" @@ -48,7 +48,7 @@ G_DEFINE_TYPE (EmpathyMapView, empathy_map_view, GTK_TYPE_WINDOW); #define GET_PRIV(self) ((EmpathyMapViewPriv *)((EmpathyMapView *) self)->priv) struct _EmpathyMapViewPriv { - EmpathyContactList *contact_list; + EmpathyConnectionAggregator *aggregator; GtkWidget *zoom_in; GtkWidget *zoom_out; @@ -59,6 +59,9 @@ struct _EmpathyMapViewPriv { /* reffed (EmpathyContact *) => borrowed (ChamplainMarker *) */ GHashTable *markers; gulong members_changed_id; + + /* TpContact -> EmpathyContact */ + GHashTable *contacts; }; static void @@ -189,28 +192,41 @@ marker_clicked_cb (ChamplainMarker *marker, { GtkWidget *menu; EmpathyContact *contact; + TpContact *tp_contact; + FolksIndividual *individual; if (event->button != 3) return FALSE; contact = g_object_get_data (G_OBJECT (marker), "contact"); + if (contact == NULL) + return FALSE; - menu = empathy_contact_menu_new (contact, - EMPATHY_CONTACT_FEATURE_CHAT | - EMPATHY_CONTACT_FEATURE_CALL | - EMPATHY_CONTACT_FEATURE_LOG | - EMPATHY_CONTACT_FEATURE_FT | - EMPATHY_CONTACT_FEATURE_INFO); + tp_contact = empathy_contact_get_tp_contact (contact); + if (tp_contact == NULL) + return FALSE; - if (menu == NULL) + individual = empathy_create_individual_from_tp_contact (tp_contact); + if (individual == NULL) return FALSE; + menu = empathy_individual_menu_new (individual, + EMPATHY_INDIVIDUAL_FEATURE_CHAT | + EMPATHY_INDIVIDUAL_FEATURE_CALL | + EMPATHY_INDIVIDUAL_FEATURE_LOG | + EMPATHY_INDIVIDUAL_FEATURE_INFO, NULL); + + if (menu == NULL) + goto out; + gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (self), NULL); gtk_widget_show (menu); gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time); +out: + g_object_unref (individual); return FALSE; } @@ -303,16 +319,6 @@ create_marker (EmpathyMapView *self, return marker; } -static void -contact_added (EmpathyMapView *self, - EmpathyContact *contact) -{ - g_signal_connect (contact, "notify::location", - G_CALLBACK (map_view_contact_location_notify), self); - - map_view_update_contact_position (self, contact); -} - static gboolean map_view_key_press_cb (GtkWidget *widget, GdkEventKey *event, @@ -344,36 +350,55 @@ map_view_tick (EmpathyMapView *self) } static void -contact_removed (EmpathyMapView *self, - EmpathyContact *contact) +contact_list_changed_cb (EmpathyConnectionAggregator *aggregator, + GPtrArray *added, + GPtrArray *removed, + EmpathyMapView *self) { EmpathyMapViewPriv *priv = GET_PRIV (self); - ClutterActor *marker; + guint i; - marker = g_hash_table_lookup (priv->markers, contact); - if (marker == NULL) - return; + for (i = 0; i < added->len; i++) + { + TpContact *tp_contact = g_ptr_array_index (added, i); + EmpathyContact *contact; - clutter_actor_destroy (marker); - g_hash_table_remove (priv->markers, contact); -} + if (g_hash_table_lookup (priv->contacts, tp_contact) != NULL) + continue; -static void -members_changed_cb (EmpathyContactList *list, - EmpathyContact *contact, - EmpathyContact *actor, - guint reason, - gchar *message, - gboolean is_member, - EmpathyMapView *self) -{ - if (is_member) - { - contact_added (self, contact); + contact = empathy_contact_dup_from_tp_contact (tp_contact); + + tp_g_signal_connect_object (contact, "notify::location", + G_CALLBACK (map_view_contact_location_notify), self, 0); + + map_view_update_contact_position (self, contact); + + /* Pass ownership to the hash table */ + g_hash_table_insert (priv->contacts, g_object_ref (tp_contact), + contact); } - else + + for (i = 0; i < removed->len; i++) { - contact_removed (self, contact); + TpContact *tp_contact = g_ptr_array_index (removed, i); + EmpathyContact *contact; + ClutterActor *marker; + + contact = g_hash_table_lookup (priv->contacts, tp_contact); + if (contact == NULL) + continue; + + marker = g_hash_table_lookup (priv->markers, contact); + if (marker != NULL) + { + clutter_actor_destroy (marker); + g_hash_table_remove (priv->markers, contact); + } + + g_signal_handlers_disconnect_by_func (contact, + map_view_contact_location_notify, self); + + g_hash_table_remove (priv->contacts, tp_contact); } } @@ -409,12 +434,10 @@ empathy_map_view_finalize (GObject *object) g_signal_handlers_disconnect_by_func (contact, map_view_contact_location_notify, object); - g_signal_handler_disconnect (priv->contact_list, - priv->members_changed_id); - g_hash_table_unref (priv->markers); - g_object_unref (priv->contact_list); + g_object_unref (priv->aggregator); g_object_unref (priv->layer); + g_hash_table_unref (priv->contacts); G_OBJECT_CLASS (empathy_map_view_parent_class)->finalize (object); } @@ -439,7 +462,7 @@ empathy_map_view_init (EmpathyMapView *self) GtkWidget *embed; GtkWidget *throbber_holder; gchar *filename; - GList *members, *l; + GPtrArray *contacts, *empty; GtkWidget *main_vbox; priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, @@ -474,12 +497,6 @@ empathy_map_view_init (EmpathyMapView *self) g_object_unref (gui); - priv->contact_list = EMPATHY_CONTACT_LIST ( - empathy_contact_manager_dup_singleton ()); - - priv->members_changed_id = g_signal_connect (priv->contact_list, - "members-changed", G_CALLBACK (members_changed_cb), self); - priv->throbber = gtk_spinner_new (); gtk_widget_set_size_request (priv->throbber, 16, 16); gtk_container_add (GTK_CONTAINER (throbber_holder), priv->throbber); @@ -506,14 +523,20 @@ empathy_map_view_init (EmpathyMapView *self) priv->markers = g_hash_table_new_full (NULL, NULL, (GDestroyNotify) g_object_unref, NULL); - members = empathy_contact_list_get_members ( - priv->contact_list); - for (l = members; l != NULL; l = g_list_next (l)) - { - contact_added (self, l->data); - g_object_unref (l->data); - } - g_list_free (members); + priv->aggregator = empathy_connection_aggregator_dup_singleton (); + priv->contacts = g_hash_table_new_full (NULL, NULL, g_object_unref, + g_object_unref); + + tp_g_signal_connect_object (priv->aggregator, "contact-list-changed", + G_CALLBACK (contact_list_changed_cb), self, 0); + + contacts = empathy_connection_aggregator_dup_all_contacts (priv->aggregator); + empty = g_ptr_array_new (); + + contact_list_changed_cb (priv->aggregator, contacts, empty, self); + + g_ptr_array_unref (contacts); + g_ptr_array_unref (empty); /* Set up time updating loop */ priv->timeout_id = g_timeout_add_seconds (5, diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 8176c480..df30c2a8 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -395,13 +395,21 @@ static void update_join_button_sensitivity (EmpathyNewChatroomDialog *dialog) { const gchar *room; + const gchar *protocol; gboolean sensitive = FALSE; room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room)); + protocol = tp_account_get_protocol (dialog->account); if (EMP_STR_EMPTY (room)) goto out; + if (!tp_strdiff (protocol, "irc") && (!tp_strdiff (room, "#") || + !tp_strdiff (room, "&"))) + { + goto out; + } + if (dialog->account == NULL) goto out; @@ -441,10 +449,16 @@ new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *dialog) gtk_widget_set_sensitive (dialog->entry_server, TRUE); } + if (!tp_strdiff (protocol, "irc")) + gtk_entry_set_text (GTK_ENTRY (dialog->entry_room), "#"); + else + gtk_entry_set_text (GTK_ENTRY (dialog->entry_room), ""); + update_join_button_sensitivity (dialog); /* Final set up of the dialog */ gtk_widget_grab_focus (dialog->entry_room); + gtk_editable_set_position (GTK_EDITABLE (dialog->entry_room), -1); } static void diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index 6775d4a2..77ec49c2 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -67,7 +67,7 @@ struct _EmpathyPreferencesPriv { GtkWidget *checkbutton_show_smileys; GtkWidget *checkbutton_show_contacts_in_rooms; - GtkWidget *checkbutton_separate_chat_windows; + GtkWidget *radiobutton_chats_new_windows; GtkWidget *checkbutton_events_notif_area; GtkWidget *checkbutton_autoconnect; GtkWidget *checkbutton_logging; @@ -166,7 +166,7 @@ static SoundEventEntry sound_entries [] = { { N_("Message received"), EMPATHY_PREFS_SOUNDS_INCOMING_MESSAGE }, { N_("Message sent"), EMPATHY_PREFS_SOUNDS_OUTGOING_MESSAGE }, { N_("New conversation"), EMPATHY_PREFS_SOUNDS_NEW_CONVERSATION }, - { N_("Contact goes online"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN }, + { N_("Contact comes online"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN }, { N_("Contact goes offline"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT }, { N_("Account connected"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGIN }, { N_("Account disconnected"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGOUT } @@ -248,7 +248,7 @@ preferences_setup_widgets (EmpathyPreferences *preferences) g_settings_bind (priv->gsettings_ui, EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS, - priv->checkbutton_separate_chat_windows, + priv->radiobutton_chats_new_windows, "active", G_SETTINGS_BIND_DEFAULT); @@ -678,7 +678,8 @@ static void preferences_preview_theme_append_message (EmpathyChatView *view, EmpathyContact *sender, EmpathyContact *receiver, - const gchar *text) + const gchar *text, + gboolean should_highlight) { EmpathyMessage *message; @@ -688,7 +689,7 @@ preferences_preview_theme_append_message (EmpathyChatView *view, "body", text, NULL); - empathy_chat_view_append_message (view, message); + empathy_chat_view_append_message (view, message, should_highlight); g_object_unref (message); } @@ -735,19 +736,20 @@ preferences_preview_theme_changed_cb (EmpathyThemeManager *manager, preferences_preview_theme_append_message (priv->chat_theme_preview, /* translators: Quote from Romeo & Julier, for chat theme preview */ - juliet, romeo, _("O Romeo, Romeo, wherefore art thou Romeo?")); + juliet, romeo, _("O Romeo, Romeo, wherefore art thou Romeo?"), + TRUE /* this message mentions Romeo */); preferences_preview_theme_append_message (priv->chat_theme_preview, /* translators: Quote from Romeo & Julier, for chat theme preview */ - juliet, romeo, _("Deny thy father and refuse thy name;")); + juliet, romeo, _("Deny thy father and refuse thy name;"), FALSE); preferences_preview_theme_append_message (priv->chat_theme_preview, /* translators: Quote from Romeo & Julier, for chat theme preview */ - juliet, romeo, _("Or if thou wilt not, be but sworn my love")); + juliet, romeo, _("Or if thou wilt not, be but sworn my love"), FALSE); preferences_preview_theme_append_message (priv->chat_theme_preview, /* translators: Quote from Romeo & Julier, for chat theme preview */ - juliet, romeo, _("And I'll no longer be a Capulet.")); + juliet, romeo, _("And I'll no longer be a Capulet."), FALSE); preferences_preview_theme_append_message (priv->chat_theme_preview, /* translators: Quote from Romeo & Julier, for chat theme preview */ - romeo, juliet, _("Shall I hear more, or shall I speak at this?")); + romeo, juliet, _("Shall I hear more, or shall I speak at this?"), FALSE); /* translators: Quote from Romeo & Julier, for chat theme preview */ empathy_chat_view_append_event (priv->chat_theme_preview, _("Juliet has disconnected")); @@ -1170,7 +1172,7 @@ empathy_preferences_init (EmpathyPreferences *preferences) "combobox_chat_theme_variant", &priv->combobox_chat_theme_variant, "hbox_chat_theme_variant", &priv->hbox_chat_theme_variant, "sw_chat_theme_preview", &priv->sw_chat_theme_preview, - "checkbutton_separate_chat_windows", &priv->checkbutton_separate_chat_windows, + "radiobutton_chats_new_windows", &priv->radiobutton_chats_new_windows, "checkbutton_events_notif_area", &priv->checkbutton_events_notif_area, "checkbutton_autoconnect", &priv->checkbutton_autoconnect, "checkbutton_logging", &priv->checkbutton_logging, diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui index 03a628cb..f13f6c0b 100644 --- a/src/empathy-preferences.ui +++ b/src/empathy-preferences.ui @@ -107,14 +107,47 @@ False vertical - - _Open new chats in separate windows + True - True - False - False - True - True + False + horizontal + 3 + + + Start chats in: + True + + + 0 + + + + + new ta_bs + True + True + False + True + True + + + 1 + + + + + new _windows + True + True + False + True + True + radiobutton_chats_new_tabs + + + 2 + + False diff --git a/src/empathy-roster-window-menubar.ui b/src/empathy-roster-window-menubar.ui new file mode 100644 index 00000000..d342abca --- /dev/null +++ b/src/empathy-roster-window-menubar.ui @@ -0,0 +1,301 @@ + + + + + + + + + chat + _Chat + + + + + im-message-new + chat_new_message + _New Conversation… + + + + + + audio-input-microphone + chat_new_call + New _Call… + + + + + + document-open-recent + view_history + _Previous Conversations + + + + + + gtk-add + chat_add_contact + _Add Contact… + + + + + gtk-find + chat_search_contacts + _Search for Contacts… + + + + + + document-send + view_show_ft_manager + _File Transfers + + + + + view_show_offline + _Offline Contacts + + + + + + view_show_protocols + Show P_rotocols + + + + + view_balance_show_in_roster + Credit Balance + False + + + + + view_show_map + Contacts on a _Map + + + + + gtk-quit + chat_quit + + + + + + edit + _Edit + + + + + edit_context + Context + + + + + edit_accounts + _Accounts + + + + + + edit_blocked_contacts + _Blocked Contacts + + + + + gtk-preferences + edit_preferences + P_references + + + + + edit_search_contacts + Find in Contact _List + + + + + + view + _View + + + + + view_sort_by_name + True + Sort by _Name + True + 1 + 1 + + + + + view_sort_by_status + True + Sort by _Status + True + view_sort_by_name + 0 + + + + + view_normal_size_with_avatars + True + Normal Size With _Avatars + True + 0 + 0 + + + + + + view_normal_size + True + N_ormal Size + True + view_normal_size_with_avatars + 1 + + + + + + view_compact_size + True + _Compact Size + True + view_normal_size_with_avatars + 2 + + + + + + room + _Room + + + + + room_join_new + _Join… + + + + + + room_join_favorites + Join _Favorites + + + + + + system-users + room_manage_favorites + Manage Favorites + + + + + help + _Help + + + + + gtk-help + help_contents + _Contents + + + + + + help_debug + _Debug + + + + + gtk-about + help_about + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c new file mode 100644 index 00000000..454cd256 --- /dev/null +++ b/src/empathy-roster-window.c @@ -0,0 +1,2753 @@ +/* + * Copyright (C) 2002-2007 Imendio AB + * Copyright (C) 2007-2010 Collabora Ltd. + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: Xavier Claessens + * Danielle Madeley + */ + +#include + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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-debug-window.h" +#include "empathy-new-chatroom-dialog.h" +#include "empathy-map-view.h" +#include "empathy-chatrooms-window.h" +#include "empathy-event-manager.h" +#include "empathy-ft-manager.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include + +/* Flashing delay for icons (milliseconds). */ +#define FLASH_TIMEOUT 500 + +/* Minimum width of roster window if something goes wrong. */ +#define MIN_WIDTH 50 + +/* Accels (menu shortcuts) can be configured and saved */ +#define ACCELS_FILENAME "accels.txt" + +/* Name in the geometry file */ +#define GEOMETRY_NAME "roster-window" + +enum +{ + PAGE_CONTACT_LIST = 0, + PAGE_MESSAGE +}; + +enum +{ + PROP_0, + PROP_SHELL_RUNNING +}; + +G_DEFINE_TYPE (EmpathyRosterWindow, empathy_roster_window, GTK_TYPE_WINDOW); + +struct _EmpathyRosterWindowPriv { + EmpathyIndividualStore *individual_store; + EmpathyIndividualView *individual_view; + TpAccountManager *account_manager; + EmpathyChatroomManager *chatroom_manager; + EmpathyEventManager *event_manager; + EmpathySoundManager *sound_mgr; + EmpathyCallObserver *call_observer; + EmpathyIndividualManager *individual_manager; + guint flash_timeout_id; + gboolean flash_on; + gboolean empty; + + GSettings *gsettings_ui; + GSettings *gsettings_contacts; + + GtkWidget *preferences; + GtkWidget *main_vbox; + GtkWidget *throbber; + GtkWidget *throbber_tool_item; + GtkWidget *presence_toolbar; + GtkWidget *presence_chooser; + GtkWidget *errors_vbox; + GtkWidget *auth_vbox; + GtkWidget *search_bar; + GtkWidget *notebook; + GtkWidget *no_entry_label; + GtkWidget *button_account_settings; + GtkWidget *spinner_loading; + + GtkToggleAction *show_protocols; + GtkRadioAction *sort_by_name; + GtkRadioAction *sort_by_status; + GtkRadioAction *normal_with_avatars; + GtkRadioAction *normal_size; + GtkRadioAction *compact_size; + + GtkUIManager *ui_manager; + GtkAction *view_history; + GtkAction *room_join_favorites; + GtkWidget *room_menu; + GtkWidget *room_separator; + GtkWidget *edit_context; + GtkWidget *edit_context_separator; + + GtkActionGroup *balance_action_group; + GtkAction *view_balance_show_in_roster; + GtkWidget *balance_vbox; + + guint size_timeout_id; + + /* reffed TpAccount* => visible GtkInfoBar* */ + GHashTable *errors; + + /* EmpathyEvent* => visible GtkInfoBar* */ + GHashTable *auths; + + /* stores a mapping from TpAccount to Handler ID to prevent + * to listen more than once to the status-changed signal */ + GHashTable *status_changed_handlers; + + /* Actions that are enabled when there are connected accounts */ + GList *actions_connected; + + gboolean shell_running; +}; + +static void +roster_window_flash_stop (EmpathyRosterWindow *self) +{ + if (self->priv->flash_timeout_id == 0) + return; + + DEBUG ("Stop flashing"); + g_source_remove (self->priv->flash_timeout_id); + self->priv->flash_timeout_id = 0; + self->priv->flash_on = FALSE; +} + +typedef struct +{ + EmpathyEvent *event; + gboolean on; + EmpathyRosterWindow *self; +} FlashForeachData; + +static gboolean +roster_window_flash_foreach (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + FlashForeachData *data = (FlashForeachData *) user_data; + FolksIndividual *individual; + EmpathyContact *contact; + const gchar *icon_name; + GtkTreePath *parent_path = NULL; + GtkTreeIter parent_iter; + GdkPixbuf *pixbuf = NULL; + + gtk_tree_model_get (model, iter, + EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual, + -1); + + if (individual == NULL) + return FALSE; + + contact = empathy_contact_dup_from_folks_individual (individual); + if (contact != data->event->contact) + goto out; + + if (data->on) + { + icon_name = data->event->icon_name; + pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + } + else + { + pixbuf = empathy_individual_store_get_individual_status_icon ( + data->self->priv->individual_store, + individual); + if (pixbuf != NULL) + g_object_ref (pixbuf); + } + + gtk_tree_store_set (GTK_TREE_STORE (model), iter, + EMPATHY_INDIVIDUAL_STORE_COL_ICON_STATUS, pixbuf, + -1); + + /* To make sure the parent is shown correctly, we emit + * the row-changed signal on the parent so it prompts + * it to be refreshed by the filter func. + */ + if (gtk_tree_model_iter_parent (model, &parent_iter, iter)) + { + parent_path = gtk_tree_model_get_path (model, &parent_iter); + } + + if (parent_path != NULL) + { + gtk_tree_model_row_changed (model, parent_path, &parent_iter); + gtk_tree_path_free (parent_path); + } + +out: + g_object_unref (individual); + tp_clear_object (&contact); + tp_clear_object (&pixbuf); + + return FALSE; +} + +static gboolean +roster_window_flash_cb (EmpathyRosterWindow *self) +{ + GtkTreeModel *model; + GSList *events, *l; + gboolean found_event = FALSE; + FlashForeachData data; + + self->priv->flash_on = !self->priv->flash_on; + data.on = self->priv->flash_on; + model = GTK_TREE_MODEL (self->priv->individual_store); + + events = empathy_event_manager_get_events (self->priv->event_manager); + for (l = events; l; l = l->next) + { + data.event = l->data; + data.self = self; + if (!data.event->contact || !data.event->must_ack) + continue; + + found_event = TRUE; + gtk_tree_model_foreach (model, + roster_window_flash_foreach, + &data); + } + + if (!found_event) + roster_window_flash_stop (self); + + return TRUE; +} + +static void +roster_window_flash_start (EmpathyRosterWindow *self) +{ + if (self->priv->flash_timeout_id != 0) + return; + + DEBUG ("Start flashing"); + self->priv->flash_timeout_id = g_timeout_add (FLASH_TIMEOUT, + (GSourceFunc) roster_window_flash_cb, self); + + roster_window_flash_cb (self); +} + +static void +roster_window_remove_auth (EmpathyRosterWindow *self, + EmpathyEvent *event) +{ + GtkWidget *error_widget; + + error_widget = g_hash_table_lookup (self->priv->auths, event); + if (error_widget != NULL) + { + gtk_widget_destroy (error_widget); + g_hash_table_remove (self->priv->auths, event); + } +} + +static void +roster_window_auth_add_clicked_cb (GtkButton *button, + EmpathyRosterWindow *self) +{ + EmpathyEvent *event; + + event = g_object_get_data (G_OBJECT (button), "event"); + + empathy_event_approve (event); + + roster_window_remove_auth (self, event); +} + +static void +roster_window_auth_close_clicked_cb (GtkButton *button, + EmpathyRosterWindow *self) +{ + EmpathyEvent *event; + + event = g_object_get_data (G_OBJECT (button), "event"); + + empathy_event_decline (event); + roster_window_remove_auth (self, event); +} + +static void +roster_window_auth_display (EmpathyRosterWindow *self, + EmpathyEvent *event) +{ + TpAccount *account = event->account; + GtkWidget *info_bar; + GtkWidget *content_area; + GtkWidget *image; + GtkWidget *label; + GtkWidget *add_button; + GtkWidget *close_button; + GtkWidget *action_area; + GtkWidget *action_grid; + const gchar *icon_name; + gchar *str; + + if (g_hash_table_lookup (self->priv->auths, event) != NULL) + return; + + info_bar = gtk_info_bar_new (); + gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_QUESTION); + + gtk_widget_set_no_show_all (info_bar, TRUE); + gtk_box_pack_start (GTK_BOX (self->priv->auth_vbox), info_bar, FALSE, TRUE, 0); + gtk_widget_show (info_bar); + + icon_name = tp_account_get_icon_name (account); + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_widget_show (image); + + str = g_markup_printf_escaped ("%s\n%s", + tp_account_get_display_name (account), + _("Password required")); + + label = gtk_label_new (str); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_widget_show (label); + + g_free (str); + + content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); + gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0); + + image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); + add_button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (add_button), image); + gtk_widget_set_tooltip_text (add_button, _("Provide Password")); + gtk_widget_show (add_button); + + image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON); + close_button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (close_button), image); + gtk_widget_set_tooltip_text (close_button, _("Disconnect")); + gtk_widget_show (close_button); + + action_grid = gtk_grid_new (); + gtk_grid_set_column_spacing (GTK_GRID (action_grid), 6); + gtk_widget_show (action_grid); + + action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar)); + gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0); + + gtk_grid_attach (GTK_GRID (action_grid), add_button, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (action_grid), close_button, 1, 0, 1, 1); + + g_object_set_data_full (G_OBJECT (info_bar), + "event", event, NULL); + g_object_set_data_full (G_OBJECT (add_button), + "event", event, NULL); + g_object_set_data_full (G_OBJECT (close_button), + "event", event, NULL); + + g_signal_connect (add_button, "clicked", + G_CALLBACK (roster_window_auth_add_clicked_cb), self); + g_signal_connect (close_button, "clicked", + G_CALLBACK (roster_window_auth_close_clicked_cb), self); + + gtk_widget_show (self->priv->auth_vbox); + + g_hash_table_insert (self->priv->auths, event, info_bar); +} + +static void +modify_event_count (GtkTreeModel *model, + GtkTreeIter *iter, + EmpathyEvent *event, + gboolean increase) +{ + FolksIndividual *individual; + EmpathyContact *contact; + guint count; + + gtk_tree_model_get (model, iter, + EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual, + EMPATHY_INDIVIDUAL_STORE_COL_EVENT_COUNT, &count, + -1); + + if (individual == NULL) + return; + + increase ? count++ : count--; + + contact = empathy_contact_dup_from_folks_individual (individual); + if (contact == event->contact) + gtk_tree_store_set (GTK_TREE_STORE (model), iter, + EMPATHY_INDIVIDUAL_STORE_COL_EVENT_COUNT, count, -1); + + tp_clear_object (&contact); + g_object_unref (individual); +} + +static gboolean +increase_event_count_foreach (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + EmpathyEvent *event = user_data; + + modify_event_count (model, iter, event, TRUE); + + return FALSE; +} + +static void +increase_event_count (EmpathyRosterWindow *self, + EmpathyEvent *event) +{ + GtkTreeModel *model; + + model = GTK_TREE_MODEL (self->priv->individual_store); + + gtk_tree_model_foreach (model, increase_event_count_foreach, event); +} + +static gboolean +decrease_event_count_foreach (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + EmpathyEvent *event = user_data; + + modify_event_count (model, iter, event, FALSE); + + return FALSE; +} + +static void +decrease_event_count (EmpathyRosterWindow *self, + EmpathyEvent *event) +{ + GtkTreeModel *model; + + model = GTK_TREE_MODEL (self->priv->individual_store); + + gtk_tree_model_foreach (model, decrease_event_count_foreach, event); +} + +static void +roster_window_event_added_cb (EmpathyEventManager *manager, + EmpathyEvent *event, + EmpathyRosterWindow *self) +{ + if (event->contact) + { + increase_event_count (self, event); + + roster_window_flash_start (self); + } + else if (event->type == EMPATHY_EVENT_TYPE_AUTH) + { + roster_window_auth_display (self, event); + } +} + +static void +roster_window_event_removed_cb (EmpathyEventManager *manager, + EmpathyEvent *event, + EmpathyRosterWindow *self) +{ + FlashForeachData data; + + if (event->type == EMPATHY_EVENT_TYPE_AUTH) + { + roster_window_remove_auth (self, event); + return; + } + + if (!event->contact) + return; + + decrease_event_count (self, event); + + data.on = FALSE; + data.event = event; + data.self = self; + + gtk_tree_model_foreach (GTK_TREE_MODEL (self->priv->individual_store), + roster_window_flash_foreach, + &data); +} + +static gboolean +roster_window_load_events_idle_cb (gpointer user_data) +{ + EmpathyRosterWindow *self = user_data; + GSList *l; + + l = empathy_event_manager_get_events (self->priv->event_manager); + while (l != NULL) + { + roster_window_event_added_cb (self->priv->event_manager, l->data, + self); + l = l->next; + } + + return FALSE; +} + +static void +roster_window_row_activated_cb (EmpathyIndividualView *view, + GtkTreePath *path, + GtkTreeViewColumn *col, + EmpathyRosterWindow *self) +{ + EmpathyContact *contact = NULL; + FolksIndividual *individual; + GtkTreeModel *model; + GtkTreeIter iter; + GSList *events, *l; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->individual_view)); + gtk_tree_model_get_iter (model, &iter, path); + + gtk_tree_model_get (model, &iter, EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, + &individual, -1); + + if (individual != NULL) + contact = empathy_contact_dup_from_folks_individual (individual); + + if (contact == NULL) + goto OUT; + + /* If the contact has an event activate it, otherwise the + * default handler of row-activated will be called. */ + events = empathy_event_manager_get_events (self->priv->event_manager); + for (l = events; l; l = l->next) + { + EmpathyEvent *event = l->data; + + if (event->contact == contact) + { + DEBUG ("Activate event"); + empathy_event_activate (event); + + /* We don't want the default handler of this signal + * (e.g. open a chat) */ + g_signal_stop_emission_by_name (view, "row-activated"); + break; + } + } + + g_object_unref (contact); +OUT: + tp_clear_object (&individual); +} + +static void +button_account_settings_clicked_cb (GtkButton *button, + EmpathyRosterWindow *self) +{ + empathy_accounts_dialog_show_application (gdk_screen_get_default (), + NULL, FALSE, FALSE); +} + +static void +display_page_message (EmpathyRosterWindow *self, + const gchar *msg, + gboolean display_accounts_button, + gboolean display_spinner) +{ + if (msg != NULL) + { + gchar *tmp; + + tmp = g_strdup_printf ("%s", msg); + + gtk_label_set_markup (GTK_LABEL (self->priv->no_entry_label), tmp); + g_free (tmp); + + gtk_label_set_line_wrap (GTK_LABEL (self->priv->no_entry_label), TRUE); + gtk_widget_show (self->priv->no_entry_label); + } + else + { + gtk_widget_hide (self->priv->no_entry_label); + } + + gtk_widget_set_visible (self->priv->button_account_settings, + display_accounts_button); + gtk_widget_set_visible (self->priv->spinner_loading, + display_spinner); + + gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), + PAGE_MESSAGE); +} + +static void +display_page_no_account (EmpathyRosterWindow *self) +{ + display_page_message (self, + _("You need to setup an account to see contacts here."), TRUE, FALSE); +} + +static void +roster_window_row_deleted_cb (GtkTreeModel *model, + GtkTreePath *path, + EmpathyRosterWindow *self) +{ + GtkTreeIter help_iter; + + if (!gtk_tree_model_get_iter_first (model, &help_iter)) + { + self->priv->empty = TRUE; + + if (empathy_individual_view_is_searching (self->priv->individual_view)) + { + display_page_message (self, _("No match found"), FALSE, FALSE); + } + } +} + +static void +display_page_contact_list (EmpathyRosterWindow *self) +{ + if (!empathy_individual_manager_get_contacts_loaded ( + self->priv->individual_manager)) + /* We'll display the contact list once we're done loading */ + return; + + gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), + PAGE_CONTACT_LIST); +} + +static void +roster_window_row_inserted_cb (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + EmpathyRosterWindow *self) +{ + if (self->priv->empty) + { + self->priv->empty = FALSE; + + display_page_contact_list (self); + gtk_widget_grab_focus (GTK_WIDGET (self->priv->individual_view)); + + /* The store is being filled, it will be done after an idle cb. + * So we can then get events. If we do that too soon, event's + * contact is not yet in the store and it won't get marked as + * having events. */ + g_idle_add (roster_window_load_events_idle_cb, self); + } +} + +static void +roster_window_remove_error (EmpathyRosterWindow *self, + TpAccount *account) +{ + GtkWidget *error_widget; + + error_widget = g_hash_table_lookup (self->priv->errors, account); + if (error_widget != NULL) + { + gtk_widget_destroy (error_widget); + g_hash_table_remove (self->priv->errors, account); + } +} + +static void +roster_window_account_disabled_cb (TpAccountManager *manager, + TpAccount *account, + EmpathyRosterWindow *self) +{ + roster_window_remove_error (self, account); +} + +static void +roster_window_error_retry_clicked_cb (GtkButton *button, + EmpathyRosterWindow *self) +{ + TpAccount *account; + + account = g_object_get_data (G_OBJECT (button), "account"); + tp_account_reconnect_async (account, NULL, NULL); + + roster_window_remove_error (self, account); +} + +static void +roster_window_error_edit_clicked_cb (GtkButton *button, + EmpathyRosterWindow *self) +{ + TpAccount *account; + + account = g_object_get_data (G_OBJECT (button), "account"); + + empathy_accounts_dialog_show_application ( + gtk_widget_get_screen (GTK_WIDGET (button)), + account, FALSE, FALSE); + + roster_window_remove_error (self, account); +} + +static void +roster_window_error_close_clicked_cb (GtkButton *button, + EmpathyRosterWindow *self) +{ + TpAccount *account; + + account = g_object_get_data (G_OBJECT (button), "account"); + roster_window_remove_error (self, account); +} + +static void +roster_window_error_upgrade_sw_clicked_cb (GtkButton *button, + EmpathyRosterWindow *self) +{ + TpAccount *account; + GtkWidget *dialog; + + account = g_object_get_data (G_OBJECT (button), "account"); + roster_window_remove_error (self, account); + + dialog = gtk_message_dialog_new (GTK_WINDOW (self), + GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("Sorry, %s accounts can’t be used until your %s software is updated."), + tp_account_get_protocol (account), + tp_account_get_protocol (account)); + + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + dialog); + + gtk_widget_show (dialog); +} + +static void +roster_window_upgrade_software_error (EmpathyRosterWindow *self, + TpAccount *account) +{ + GtkWidget *info_bar; + GtkWidget *content_area; + GtkWidget *label; + GtkWidget *image; + GtkWidget *upgrade_button; + GtkWidget *close_button; + GtkWidget *action_area; + GtkWidget *action_grid; + gchar *str; + const gchar *icon_name; + const gchar *error_message; + gboolean user_requested; + + error_message = + empathy_account_get_error_message (account, &user_requested); + + if (user_requested) + return; + + str = g_markup_printf_escaped ("%s\n%s", + tp_account_get_display_name (account), + error_message); + + /* If there are other errors, remove them */ + roster_window_remove_error (self, account); + + info_bar = gtk_info_bar_new (); + gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_ERROR); + + gtk_widget_set_no_show_all (info_bar, TRUE); + gtk_box_pack_start (GTK_BOX (self->priv->errors_vbox), info_bar, FALSE, TRUE, 0); + gtk_widget_show (info_bar); + + icon_name = tp_account_get_icon_name (account); + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_widget_show (image); + + label = gtk_label_new (str); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_widget_show (label); + g_free (str); + + content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); + gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0); + + image = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON); + upgrade_button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (upgrade_button), image); + gtk_widget_set_tooltip_text (upgrade_button, _("Update software...")); + gtk_widget_show (upgrade_button); + + image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON); + close_button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (close_button), image); + gtk_widget_set_tooltip_text (close_button, _("Close")); + gtk_widget_show (close_button); + + action_grid = gtk_grid_new (); + gtk_grid_set_column_spacing (GTK_GRID (action_grid), 2); + gtk_widget_show (action_grid); + + action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar)); + gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0); + + gtk_grid_attach (GTK_GRID (action_grid), upgrade_button, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (action_grid), close_button, 1, 0, 1, 1); + + g_object_set_data (G_OBJECT (info_bar), "label", label); + g_object_set_data_full (G_OBJECT (info_bar), + "account", g_object_ref (account), + g_object_unref); + g_object_set_data_full (G_OBJECT (upgrade_button), + "account", g_object_ref (account), + g_object_unref); + g_object_set_data_full (G_OBJECT (close_button), + "account", g_object_ref (account), + g_object_unref); + + g_signal_connect (upgrade_button, "clicked", + G_CALLBACK (roster_window_error_upgrade_sw_clicked_cb), self); + g_signal_connect (close_button, "clicked", + G_CALLBACK (roster_window_error_close_clicked_cb), self); + + gtk_widget_set_tooltip_text (self->priv->errors_vbox, error_message); + gtk_widget_show (self->priv->errors_vbox); + + g_hash_table_insert (self->priv->errors, g_object_ref (account), info_bar); +} + +static void +roster_window_error_display (EmpathyRosterWindow *self, + TpAccount *account) +{ + GtkWidget *info_bar; + GtkWidget *content_area; + GtkWidget *label; + GtkWidget *image; + GtkWidget *retry_button; + GtkWidget *edit_button; + GtkWidget *close_button; + GtkWidget *action_area; + GtkWidget *action_grid; + gchar *str; + const gchar *icon_name; + const gchar *error_message; + gboolean user_requested; + + if (!tp_strdiff (TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED, + tp_account_get_detailed_error (account, NULL))) + { + roster_window_upgrade_software_error (self, account); + return; + } + + error_message = empathy_account_get_error_message (account, &user_requested); + + if (user_requested) + return; + + str = g_markup_printf_escaped ("%s\n%s", + tp_account_get_display_name (account), error_message); + + info_bar = g_hash_table_lookup (self->priv->errors, account); + if (info_bar) + { + label = g_object_get_data (G_OBJECT (info_bar), "label"); + + /* Just set the latest error and return */ + gtk_label_set_markup (GTK_LABEL (label), str); + g_free (str); + + return; + } + + info_bar = gtk_info_bar_new (); + gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_ERROR); + + gtk_widget_set_no_show_all (info_bar, TRUE); + gtk_box_pack_start (GTK_BOX (self->priv->errors_vbox), info_bar, FALSE, TRUE, 0); + gtk_widget_show (info_bar); + + icon_name = tp_account_get_icon_name (account); + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_widget_show (image); + + label = gtk_label_new (str); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_widget_show (label); + g_free (str); + + content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); + gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0); + + image = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON); + retry_button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (retry_button), image); + gtk_widget_set_tooltip_text (retry_button, _("Reconnect")); + gtk_widget_show (retry_button); + + image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON); + edit_button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (edit_button), image); + gtk_widget_set_tooltip_text (edit_button, _("Edit Account")); + gtk_widget_show (edit_button); + + image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON); + close_button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (close_button), image); + gtk_widget_set_tooltip_text (close_button, _("Close")); + gtk_widget_show (close_button); + + action_grid = gtk_grid_new (); + gtk_grid_set_column_spacing (GTK_GRID (action_grid), 2); + gtk_widget_show (action_grid); + + action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar)); + gtk_box_pack_start (GTK_BOX (action_area), action_grid, FALSE, FALSE, 0); + + gtk_grid_attach (GTK_GRID (action_grid), retry_button, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (action_grid), edit_button, 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID (action_grid), close_button, 2, 0, 1, 1); + + g_object_set_data (G_OBJECT (info_bar), "label", label); + g_object_set_data_full (G_OBJECT (info_bar), + "account", g_object_ref (account), + g_object_unref); + g_object_set_data_full (G_OBJECT (edit_button), + "account", g_object_ref (account), + g_object_unref); + g_object_set_data_full (G_OBJECT (close_button), + "account", g_object_ref (account), + g_object_unref); + g_object_set_data_full (G_OBJECT (retry_button), + "account", g_object_ref (account), + g_object_unref); + + g_signal_connect (edit_button, "clicked", + G_CALLBACK (roster_window_error_edit_clicked_cb), self); + g_signal_connect (close_button, "clicked", + G_CALLBACK (roster_window_error_close_clicked_cb), self); + g_signal_connect (retry_button, "clicked", + G_CALLBACK (roster_window_error_retry_clicked_cb), self); + + gtk_widget_set_tooltip_text (self->priv->errors_vbox, error_message); + gtk_widget_show (self->priv->errors_vbox); + + g_hash_table_insert (self->priv->errors, g_object_ref (account), info_bar); +} + +static void +roster_window_update_status (EmpathyRosterWindow *self) +{ + gboolean connected, connecting; + GList *l, *children; + + connected = empathy_account_manager_get_accounts_connected (&connecting); + + /* Update the spinner state */ + if (connecting) + { + gtk_spinner_start (GTK_SPINNER (self->priv->throbber)); + gtk_widget_show (self->priv->throbber_tool_item); + } + else + { + gtk_spinner_stop (GTK_SPINNER (self->priv->throbber)); + gtk_widget_hide (self->priv->throbber_tool_item); + } + + /* Update widgets sensibility */ + for (l = self->priv->actions_connected; l; l = l->next) + gtk_action_set_sensitive (l->data, connected); + + /* Update favourite rooms sensitivity */ + children = gtk_container_get_children (GTK_CONTAINER (self->priv->room_menu)); + for (l = children; l != NULL; l = l->next) + { + if (g_object_get_data (G_OBJECT (l->data), "is_favorite") != NULL) + gtk_widget_set_sensitive (GTK_WIDGET (l->data), connected); + } + + g_list_free (children); +} + +static char * +roster_window_account_to_action_name (TpAccount *account) +{ + char *r; + + /* action names can't have '/' in them, replace it with '.' */ + r = g_strdup (tp_account_get_path_suffix (account)); + r = g_strdelimit (r, "/", '.'); + + return r; +} + +static void +roster_window_balance_activate_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + const char *uri; + + uri = g_object_get_data (G_OBJECT (action), "manage-credit-uri"); + + if (!tp_str_empty (uri)) + { + DEBUG ("Top-up credit URI: %s", uri); + empathy_url_show (GTK_WIDGET (self), uri); + } + else + { + DEBUG ("unknown protocol for top-up"); + } +} + +static void +roster_window_balance_update_balance (GtkAction *action, + TpConnection *conn) +{ + TpAccount *account = tp_connection_get_account (conn); + GtkWidget *label; + int amount = 0; + guint scale = G_MAXINT32; + const gchar *currency = ""; + char *money, *str; + + if (!tp_connection_get_balance (conn, &amount, &scale, ¤cy)) + return; + + if (amount == 0 && + scale == G_MAXINT32 && + tp_str_empty (currency)) + { + /* unknown balance */ + money = g_strdup ("--"); + } + else + { + char *tmp = empathy_format_currency (amount, scale, currency); + + money = g_strdup_printf ("%s %s", currency, tmp); + g_free (tmp); + } + + /* Translators: this string will be something like: + * Top up My Account ($1.23)..." */ + str = g_strdup_printf (_("Top up %s (%s)..."), + tp_account_get_display_name (account), money); + + gtk_action_set_label (action, str); + g_free (str); + + /* update the money label in the roster */ + label = g_object_get_data (G_OBJECT (action), "money-label"); + + gtk_label_set_text (GTK_LABEL (label), money); + g_free (money); +} + +static void +roster_window_balance_changed_cb (TpConnection *conn, + guint balance, + guint scale, + const gchar *currency, + GtkAction *action) +{ + roster_window_balance_update_balance (action, conn); +} + +static GtkAction * +roster_window_setup_balance_create_action (EmpathyRosterWindow *self, + TpAccount *account) +{ + GtkAction *action; + char *name, *ui; + guint merge_id; + GError *error = NULL; + + /* create the action group if required */ + if (self->priv->balance_action_group == NULL) + { + self->priv->balance_action_group = + gtk_action_group_new ("balance-action-group"); + + gtk_ui_manager_insert_action_group (self->priv->ui_manager, + self->priv->balance_action_group, -1); + } + + /* create the action */ + name = roster_window_account_to_action_name (account); + action = gtk_action_new (name, + tp_account_get_display_name (account), + _("Top up account credit"), NULL); + + g_object_bind_property (account, "icon-name", action, "icon-name", + G_BINDING_SYNC_CREATE); + + g_signal_connect (action, "activate", + G_CALLBACK (roster_window_balance_activate_cb), self); + + gtk_action_group_add_action (self->priv->balance_action_group, action); + g_object_unref (action); + + ui = g_strdup_printf ( + "" + " " + " " + " " + " " + " " + " " + " " + "", + name); + + merge_id = gtk_ui_manager_add_ui_from_string (self->priv->ui_manager, + ui, -1, &error); + + if (error != NULL) + { + DEBUG ("Failed to add balance UI for %s: %s", + tp_account_get_display_name (account), + error->message); + g_error_free (error); + } + + g_object_set_data (G_OBJECT (action), + "merge-id", GUINT_TO_POINTER (merge_id)); + + g_free (name); + g_free (ui); + + return action; +} + +static GtkWidget * +roster_window_setup_balance_create_widget (EmpathyRosterWindow *self, + GtkAction *action, + TpAccount *account) +{ + GtkWidget *hbox, *image, *label, *button; + + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + + /* protocol icon */ + image = gtk_image_new (); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0); + g_object_bind_property (action, "icon-name", image, "icon-name", + G_BINDING_SYNC_CREATE); + + /* account name label */ + label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + g_object_bind_property (account, "display-name", label, "label", + G_BINDING_SYNC_CREATE); + + /* balance label */ + label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); + g_object_set_data (G_OBJECT (action), "money-label", label); + + /* top up button */ + button = gtk_button_new_with_label (_("Top Up...")); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0); + g_signal_connect_swapped (button, "clicked", + G_CALLBACK (gtk_action_activate), action); + + gtk_box_pack_start (GTK_BOX (self->priv->balance_vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show_all (hbox); + + /* tie the lifetime of the widget to the lifetime of the action */ + g_object_weak_ref (G_OBJECT (action), + (GWeakNotify) gtk_widget_destroy, hbox); + + return hbox; +} + +static void +roster_window_setup_balance (EmpathyRosterWindow *self, + TpAccount *account) +{ + TpConnection *conn = tp_account_get_connection (account); + GtkAction *action; + const gchar *uri; + + if (conn == NULL) + return; + + if (!tp_proxy_is_prepared (conn, TP_CONNECTION_FEATURE_BALANCE)) + return; + + DEBUG ("Setting up balance for acct: %s", + tp_account_get_display_name (account)); + + /* create the action */ + action = roster_window_setup_balance_create_action (self, account); + + if (action == NULL) + return; + + gtk_action_set_visible (self->priv->view_balance_show_in_roster, TRUE); + + /* create the display widget */ + roster_window_setup_balance_create_widget (self, action, account); + + /* check the current balance and monitor for any changes */ + uri = tp_connection_get_balance_uri (conn); + + g_object_set_data_full (G_OBJECT (action), "manage-credit-uri", + g_strdup (uri), g_free); + gtk_action_set_sensitive (GTK_ACTION (action), !tp_str_empty (uri)); + + roster_window_balance_update_balance (GTK_ACTION (action), conn); + + g_signal_connect (conn, "balance-changed", + G_CALLBACK (roster_window_balance_changed_cb), action); +} + +static void +roster_window_remove_balance_action (EmpathyRosterWindow *self, + TpAccount *account) +{ + GtkAction *action; + char *name; + GList *a; + + if (self->priv->balance_action_group == NULL) + return; + + name = roster_window_account_to_action_name (account); + + action = gtk_action_group_get_action ( + self->priv->balance_action_group, name); + + if (action != NULL) + { + guint merge_id; + + DEBUG ("Removing action"); + + merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (action), + "merge-id")); + + gtk_ui_manager_remove_ui (self->priv->ui_manager, + merge_id); + gtk_action_group_remove_action ( + self->priv->balance_action_group, action); + } + + g_free (name); + + a = gtk_action_group_list_actions ( + self->priv->balance_action_group); + + gtk_action_set_visible (self->priv->view_balance_show_in_roster, + g_list_length (a) > 0); + + g_list_free (a); +} + +static void +roster_window_connection_changed_cb (TpAccount *account, + guint old_status, + guint current, + guint reason, + gchar *dbus_error_name, + GHashTable *details, + EmpathyRosterWindow *self) +{ + roster_window_update_status (self); + + if (current == TP_CONNECTION_STATUS_DISCONNECTED && + reason != TP_CONNECTION_STATUS_REASON_REQUESTED) + { + roster_window_error_display (self, account); + } + + if (current == TP_CONNECTION_STATUS_DISCONNECTED) + { + empathy_sound_manager_play (self->priv->sound_mgr, GTK_WIDGET (self), + EMPATHY_SOUND_ACCOUNT_DISCONNECTED); + } + + if (current == TP_CONNECTION_STATUS_CONNECTED) + { + empathy_sound_manager_play (self->priv->sound_mgr, GTK_WIDGET (self), + EMPATHY_SOUND_ACCOUNT_CONNECTED); + + /* Account connected without error, remove error message if any */ + roster_window_remove_error (self, account); + } +} + +static void +roster_window_accels_load (void) +{ + gchar *filename; + + filename = g_build_filename (g_get_user_config_dir (), + PACKAGE_NAME, ACCELS_FILENAME, NULL); + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + { + DEBUG ("Loading from:'%s'", filename); + gtk_accel_map_load (filename); + } + + g_free (filename); +} + +static void +roster_window_accels_save (void) +{ + gchar *dir; + gchar *file_with_path; + + dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); + g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR); + file_with_path = g_build_filename (dir, ACCELS_FILENAME, NULL); + g_free (dir); + + DEBUG ("Saving to:'%s'", file_with_path); + gtk_accel_map_save (file_with_path); + + g_free (file_with_path); +} + +static void +empathy_roster_window_finalize (GObject *window) +{ + EmpathyRosterWindow *self = EMPATHY_ROSTER_WINDOW (window); + GHashTableIter iter; + gpointer key, value; + + /* Save user-defined accelerators. */ + roster_window_accels_save (); + + g_list_free (self->priv->actions_connected); + + g_object_unref (self->priv->account_manager); + g_object_unref (self->priv->individual_store); + g_object_unref (self->priv->sound_mgr); + g_hash_table_unref (self->priv->errors); + g_hash_table_unref (self->priv->auths); + + /* disconnect all handlers of status-changed signal */ + g_hash_table_iter_init (&iter, self->priv->status_changed_handlers); + while (g_hash_table_iter_next (&iter, &key, &value)) + g_signal_handler_disconnect (TP_ACCOUNT (key), GPOINTER_TO_UINT (value)); + + g_hash_table_unref (self->priv->status_changed_handlers); + + g_signal_handlers_disconnect_by_func (self->priv->event_manager, + roster_window_event_added_cb, self); + g_signal_handlers_disconnect_by_func (self->priv->event_manager, + roster_window_event_removed_cb, self); + + g_object_unref (self->priv->call_observer); + g_object_unref (self->priv->event_manager); + g_object_unref (self->priv->ui_manager); + g_object_unref (self->priv->chatroom_manager); + + g_object_unref (self->priv->gsettings_ui); + g_object_unref (self->priv->gsettings_contacts); + g_object_unref (self->priv->individual_manager); + + G_OBJECT_CLASS (empathy_roster_window_parent_class)->finalize (window); +} + +static gboolean +roster_window_key_press_event_cb (GtkWidget *window, + GdkEventKey *event, + gpointer user_data) +{ + if (event->keyval == GDK_KEY_T + && event->state & GDK_SHIFT_MASK + && event->state & GDK_CONTROL_MASK) + empathy_chat_manager_call_undo_closed_chat (); + + return FALSE; +} + +static void +roster_window_chat_quit_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + gtk_widget_destroy (GTK_WIDGET (self)); +} + +static void +roster_window_view_history_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_log_window_show (NULL, NULL, FALSE, GTK_WINDOW (self)); +} + +static void +roster_window_chat_new_message_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_new_message_dialog_show (GTK_WINDOW (self)); +} + +static void +roster_window_chat_new_call_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_new_call_dialog_show (GTK_WINDOW (self)); +} + +static void +roster_window_chat_add_contact_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_new_individual_dialog_show (GTK_WINDOW (self)); +} + +static void +roster_window_chat_search_contacts_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + GtkWidget *dialog = empathy_contact_search_dialog_new ( + GTK_WINDOW (self)); + + gtk_widget_show (dialog); +} + +static void +roster_window_view_show_ft_manager (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_ft_manager_show (); +} + +static void +roster_window_view_show_offline_cb (GtkToggleAction *action, + EmpathyRosterWindow *self) +{ + gboolean current; + + current = gtk_toggle_action_get_active (action); + g_settings_set_boolean (self->priv->gsettings_ui, + EMPATHY_PREFS_UI_SHOW_OFFLINE, + current); + + empathy_individual_view_set_show_offline (self->priv->individual_view, + current); +} + +static void +roster_window_notify_sort_contact_cb (GSettings *gsettings, + const gchar *key, + EmpathyRosterWindow *self) +{ + gchar *str; + + str = g_settings_get_string (gsettings, key); + + if (str != NULL) + { + GType type; + GEnumClass *enum_class; + GEnumValue *enum_value; + + type = empathy_individual_store_sort_get_type (); + enum_class = G_ENUM_CLASS (g_type_class_peek (type)); + enum_value = g_enum_get_value_by_nick (enum_class, str); + if (enum_value) + { + /* By changing the value of the GtkRadioAction, + it emits a signal that calls roster_window_view_sort_contacts_cb + which updates the contacts list */ + gtk_radio_action_set_current_value (self->priv->sort_by_name, + enum_value->value); + } + else + { + g_warning ("Wrong value for sort_criterium configuration : %s", str); + } + g_free (str); + } +} + +static void +roster_window_view_sort_contacts_cb (GtkRadioAction *action, + GtkRadioAction *current, + EmpathyRosterWindow *self) +{ + EmpathyIndividualStoreSort value; + GSList *group; + GType type; + GEnumClass *enum_class; + GEnumValue *enum_value; + + value = gtk_radio_action_get_current_value (action); + group = gtk_radio_action_get_group (action); + + /* Get string from index */ + type = empathy_individual_store_sort_get_type (); + enum_class = G_ENUM_CLASS (g_type_class_peek (type)); + enum_value = g_enum_get_value (enum_class, g_slist_index (group, current)); + + if (!enum_value) + g_warning ("No GEnumValue for EmpathyContactListSort with GtkRadioAction index:%d", + g_slist_index (group, action)); + else + g_settings_set_string (self->priv->gsettings_contacts, + EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, + enum_value->value_nick); + + empathy_individual_store_set_sort_criterium (self->priv->individual_store, + value); +} + +static void +roster_window_view_show_protocols_cb (GtkToggleAction *action, + EmpathyRosterWindow *self) +{ + gboolean value; + + value = gtk_toggle_action_get_active (action); + + g_settings_set_boolean (self->priv->gsettings_ui, + EMPATHY_PREFS_UI_SHOW_PROTOCOLS, + value); + + empathy_individual_store_set_show_protocols (self->priv->individual_store, + value); +} + +/* Matches GtkRadioAction values set in empathy-roster-window.ui */ +#define CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS 0 +#define CONTACT_LIST_NORMAL_SIZE 1 +#define CONTACT_LIST_COMPACT_SIZE 2 + +static void +roster_window_view_contacts_list_size_cb (GtkRadioAction *action, + GtkRadioAction *current, + EmpathyRosterWindow *self) +{ + GSettings *gsettings_ui; + gint value; + + value = gtk_radio_action_get_current_value (action); + /* create a new GSettings, so we can delay the setting until both + * values are set */ + gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA); + + DEBUG ("radio button toggled, value = %i", value); + + g_settings_delay (gsettings_ui); + g_settings_set_boolean (gsettings_ui, EMPATHY_PREFS_UI_SHOW_AVATARS, + value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS); + + g_settings_set_boolean (gsettings_ui, EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, + value == CONTACT_LIST_COMPACT_SIZE); + g_settings_apply (gsettings_ui); + + /* FIXME: these enums probably have the wrong namespace */ + empathy_individual_store_set_show_avatars (self->priv->individual_store, + value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS); + empathy_individual_store_set_is_compact (self->priv->individual_store, + value == CONTACT_LIST_COMPACT_SIZE); + + g_object_unref (gsettings_ui); +} + +static void roster_window_notify_show_protocols_cb (GSettings *gsettings, + const gchar *key, + EmpathyRosterWindow *self) +{ + gtk_toggle_action_set_active (self->priv->show_protocols, + g_settings_get_boolean (gsettings, EMPATHY_PREFS_UI_SHOW_PROTOCOLS)); +} + + +static void +roster_window_notify_contact_list_size_cb (GSettings *gsettings, + const gchar *key, + EmpathyRosterWindow *self) +{ + gint value; + + if (g_settings_get_boolean (gsettings, + EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST)) + value = CONTACT_LIST_COMPACT_SIZE; + else if (g_settings_get_boolean (gsettings, + EMPATHY_PREFS_UI_SHOW_AVATARS)) + value = CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS; + else + value = CONTACT_LIST_NORMAL_SIZE; + + DEBUG ("setting changed, value = %i", value); + + /* By changing the value of the GtkRadioAction, + it emits a signal that calls roster_window_view_contacts_list_size_cb + which updates the contacts list */ + gtk_radio_action_set_current_value (self->priv->normal_with_avatars, value); +} + +static void +roster_window_edit_search_contacts_cb (GtkCheckMenuItem *item, + EmpathyRosterWindow *self) +{ + empathy_individual_view_start_search (self->priv->individual_view); +} + +static void +roster_window_view_show_map_cb (GtkCheckMenuItem *item, + EmpathyRosterWindow *self) +{ +#ifdef HAVE_LIBCHAMPLAIN + empathy_map_view_show (); +#endif +} + +static void +join_chatroom (EmpathyChatroom *chatroom, + gint64 timestamp) +{ + TpAccount *account; + const gchar *room; + + account = empathy_chatroom_get_account (chatroom); + room = empathy_chatroom_get_room (chatroom); + + DEBUG ("Requesting channel for '%s'", room); + empathy_join_muc (account, room, timestamp); +} + +typedef struct +{ + TpAccount *account; + EmpathyChatroom *chatroom; + gint64 timestamp; + glong sig_id; + guint timeout; +} join_fav_account_sig_ctx; + +static join_fav_account_sig_ctx * +join_fav_account_sig_ctx_new (TpAccount *account, + EmpathyChatroom *chatroom, + gint64 timestamp) +{ + join_fav_account_sig_ctx *ctx = g_slice_new0 ( + join_fav_account_sig_ctx); + + ctx->account = g_object_ref (account); + ctx->chatroom = g_object_ref (chatroom); + ctx->timestamp = timestamp; + return ctx; +} + +static void +join_fav_account_sig_ctx_free (join_fav_account_sig_ctx *ctx) +{ + g_object_unref (ctx->account); + g_object_unref (ctx->chatroom); + g_slice_free (join_fav_account_sig_ctx, ctx); +} + +static void +account_status_changed_cb (TpAccount *account, + TpConnectionStatus old_status, + TpConnectionStatus new_status, + guint reason, + gchar *dbus_error_name, + GHashTable *details, + gpointer user_data) +{ + join_fav_account_sig_ctx *ctx = user_data; + + switch (new_status) + { + case TP_CONNECTION_STATUS_DISCONNECTED: + /* Don't wait any longer */ + goto finally; + break; + + case TP_CONNECTION_STATUS_CONNECTING: + /* Wait a bit */ + return; + + case TP_CONNECTION_STATUS_CONNECTED: + /* We can join the room */ + break; + + default: + g_assert_not_reached (); + } + + join_chatroom (ctx->chatroom, ctx->timestamp); + +finally: + g_source_remove (ctx->timeout); + g_signal_handler_disconnect (account, ctx->sig_id); +} + +#define JOIN_FAVORITE_TIMEOUT 5 + +static gboolean +join_favorite_timeout_cb (gpointer data) +{ + join_fav_account_sig_ctx *ctx = data; + + /* stop waiting for joining the favorite room */ + g_signal_handler_disconnect (ctx->account, ctx->sig_id); + return FALSE; +} + +static void +roster_window_favorite_chatroom_join (EmpathyChatroom *chatroom) +{ + TpAccount *account; + + account = empathy_chatroom_get_account (chatroom); + if (tp_account_get_connection_status (account, NULL) != + TP_CONNECTION_STATUS_CONNECTED) + { + join_fav_account_sig_ctx *ctx; + + ctx = join_fav_account_sig_ctx_new (account, chatroom, + empathy_get_current_action_time ()); + + ctx->sig_id = g_signal_connect_data (account, "status-changed", + G_CALLBACK (account_status_changed_cb), ctx, + (GClosureNotify) join_fav_account_sig_ctx_free, 0); + + ctx->timeout = g_timeout_add_seconds (JOIN_FAVORITE_TIMEOUT, + join_favorite_timeout_cb, ctx); + return; + } + + join_chatroom (chatroom, empathy_get_current_action_time ()); +} + +static void +roster_window_favorite_chatroom_menu_activate_cb (GtkMenuItem *menu_item, + EmpathyChatroom *chatroom) +{ + roster_window_favorite_chatroom_join (chatroom); +} + +static void +roster_window_favorite_chatroom_menu_add (EmpathyRosterWindow *self, + EmpathyChatroom *chatroom) +{ + GtkWidget *menu_item; + const gchar *name, *account_name; + gchar *label; + + if (g_object_get_data (G_OBJECT (chatroom), "menu_item")) + return; + + name = empathy_chatroom_get_name (chatroom); + account_name = tp_account_get_display_name ( + empathy_chatroom_get_account (chatroom)); + label = g_strdup_printf ("%s (%s)", name, account_name); + menu_item = gtk_menu_item_new_with_label (label); + g_free (label); + g_object_set_data (G_OBJECT (menu_item), "is_favorite", + GUINT_TO_POINTER (TRUE)); + + g_object_set_data (G_OBJECT (chatroom), "menu_item", menu_item); + g_signal_connect (menu_item, "activate", + G_CALLBACK (roster_window_favorite_chatroom_menu_activate_cb), + chatroom); + + gtk_menu_shell_insert (GTK_MENU_SHELL (self->priv->room_menu), + menu_item, 4); + + gtk_widget_show (menu_item); +} + +static void +roster_window_favorite_chatroom_menu_added_cb (EmpathyChatroomManager *manager, + EmpathyChatroom *chatroom, + EmpathyRosterWindow *self) +{ + roster_window_favorite_chatroom_menu_add (self, chatroom); + gtk_widget_show (self->priv->room_separator); + gtk_action_set_sensitive (self->priv->room_join_favorites, TRUE); +} + +static void +roster_window_favorite_chatroom_menu_removed_cb ( + EmpathyChatroomManager *manager, + EmpathyChatroom *chatroom, + EmpathyRosterWindow *self) +{ + GtkWidget *menu_item; + GList *chatrooms; + + menu_item = g_object_get_data (G_OBJECT (chatroom), "menu_item"); + g_object_set_data (G_OBJECT (chatroom), "menu_item", NULL); + gtk_widget_destroy (menu_item); + + chatrooms = empathy_chatroom_manager_get_chatrooms (self->priv->chatroom_manager, + NULL); + if (chatrooms) + gtk_widget_show (self->priv->room_separator); + else + gtk_widget_hide (self->priv->room_separator); + + gtk_action_set_sensitive (self->priv->room_join_favorites, chatrooms != NULL); + g_list_free (chatrooms); +} + +static void +roster_window_favorite_chatroom_menu_setup (EmpathyRosterWindow *self) +{ + GList *chatrooms, *l; + GtkWidget *room; + + self->priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL); + chatrooms = empathy_chatroom_manager_get_chatrooms ( + self->priv->chatroom_manager, NULL); + room = gtk_ui_manager_get_widget (self->priv->ui_manager, + "/menubar/room"); + self->priv->room_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (room)); + self->priv->room_separator = gtk_ui_manager_get_widget (self->priv->ui_manager, + "/menubar/room/room_separator"); + + for (l = chatrooms; l; l = l->next) + roster_window_favorite_chatroom_menu_add (self, l->data); + + if (!chatrooms) + gtk_widget_hide (self->priv->room_separator); + + gtk_action_set_sensitive (self->priv->room_join_favorites, chatrooms != NULL); + + g_signal_connect (self->priv->chatroom_manager, "chatroom-added", + G_CALLBACK (roster_window_favorite_chatroom_menu_added_cb), + self); + + g_signal_connect (self->priv->chatroom_manager, "chatroom-removed", + G_CALLBACK (roster_window_favorite_chatroom_menu_removed_cb), + self); + + g_list_free (chatrooms); +} + +static void +roster_window_room_join_new_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_new_chatroom_dialog_show (GTK_WINDOW (self)); +} + +static void +roster_window_room_join_favorites_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + GList *chatrooms, *l; + + chatrooms = empathy_chatroom_manager_get_chatrooms (self->priv->chatroom_manager, + NULL); + + for (l = chatrooms; l; l = l->next) + roster_window_favorite_chatroom_join (l->data); + + g_list_free (chatrooms); +} + +static void +roster_window_room_manage_favorites_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_chatrooms_window_show (GTK_WINDOW (self)); +} + +static void +roster_window_edit_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + GtkWidget *submenu; + + /* FIXME: It should use the UIManager to merge the contact/group submenu */ + submenu = empathy_individual_view_get_individual_menu ( + self->priv->individual_view); + if (submenu) + { + GtkMenuItem *item; + GtkWidget *label; + + item = GTK_MENU_ITEM (self->priv->edit_context); + label = gtk_bin_get_child (GTK_BIN (item)); + gtk_label_set_text (GTK_LABEL (label), _("Contact")); + + gtk_widget_show (self->priv->edit_context); + gtk_widget_show (self->priv->edit_context_separator); + + gtk_menu_item_set_submenu (item, submenu); + + return; + } + + submenu = empathy_individual_view_get_group_menu (self->priv->individual_view); + if (submenu) + { + GtkMenuItem *item; + GtkWidget *label; + + item = GTK_MENU_ITEM (self->priv->edit_context); + label = gtk_bin_get_child (GTK_BIN (item)); + gtk_label_set_text (GTK_LABEL (label), _("Group")); + + gtk_widget_show (self->priv->edit_context); + gtk_widget_show (self->priv->edit_context_separator); + + gtk_menu_item_set_submenu (item, submenu); + + return; + } + + gtk_widget_hide (self->priv->edit_context); + gtk_widget_hide (self->priv->edit_context_separator); + + return; +} + +static void +roster_window_edit_accounts_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_accounts_dialog_show_application (gdk_screen_get_default (), + NULL, FALSE, FALSE); +} + +static void +roster_window_edit_blocked_contacts_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + GtkWidget *dialog; + + dialog = empathy_contact_blocking_dialog_new (GTK_WINDOW (self)); + gtk_widget_show (dialog); + + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), NULL); +} + +void +empathy_roster_window_show_preferences (EmpathyRosterWindow *self, + const gchar *tab) +{ + if (self->priv->preferences == NULL) + { + self->priv->preferences = empathy_preferences_new (GTK_WINDOW (self), + self->priv->shell_running); + g_object_add_weak_pointer (G_OBJECT (self->priv->preferences), + (gpointer) &self->priv->preferences); + + gtk_widget_show (self->priv->preferences); + } + else + { + gtk_window_present (GTK_WINDOW (self->priv->preferences)); + } + + if (tab != NULL) + empathy_preferences_show_tab ( + EMPATHY_PREFERENCES (self->priv->preferences), tab); +} + +static void +roster_window_edit_preferences_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_roster_window_show_preferences (self, NULL); +} + +static void +roster_window_help_about_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_about_dialog_new (GTK_WINDOW (self)); +} + +static void +roster_window_help_debug_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_launch_program (BIN_DIR, "empathy-debugger", NULL); +} + +static void +roster_window_help_contents_cb (GtkAction *action, + EmpathyRosterWindow *self) +{ + empathy_url_show (GTK_WIDGET (self), "ghelp:empathy"); +} + +static gboolean +roster_window_throbber_button_press_event_cb (GtkWidget *throbber, + GdkEventButton *event, + EmpathyRosterWindow *self) +{ + if (event->type != GDK_BUTTON_PRESS || + event->button != 1) + return FALSE; + + empathy_accounts_dialog_show_application ( + gtk_widget_get_screen (GTK_WIDGET (throbber)), + NULL, FALSE, FALSE); + + return FALSE; +} + +static void +roster_window_account_removed_cb (TpAccountManager *manager, + TpAccount *account, + EmpathyRosterWindow *self) +{ + GList *a; + + a = tp_account_manager_get_valid_accounts (manager); + + gtk_action_set_sensitive (self->priv->view_history, + g_list_length (a) > 0); + + g_list_free (a); + + /* remove errors if any */ + roster_window_remove_error (self, account); + + /* remove the balance action if required */ + roster_window_remove_balance_action (self, account); +} + +static void +account_connection_notify_cb (TpAccount *account, + GParamSpec *spec, + EmpathyRosterWindow *self) +{ + TpConnection *conn; + + conn = tp_account_get_connection (account); + + if (conn != NULL) + { + roster_window_setup_balance (self, account); + } + else + { + /* remove balance action if required */ + roster_window_remove_balance_action (self, account); + } +} + +static void +add_account (EmpathyRosterWindow *self, + TpAccount *account) +{ + gulong handler_id; + + handler_id = GPOINTER_TO_UINT (g_hash_table_lookup ( + self->priv->status_changed_handlers, account)); + + /* connect signal only if it was not connected yet */ + if (handler_id != 0) + return; + + handler_id = g_signal_connect (account, "status-changed", + G_CALLBACK (roster_window_connection_changed_cb), self); + + g_hash_table_insert (self->priv->status_changed_handlers, + account, GUINT_TO_POINTER (handler_id)); + + /* roster_window_setup_balance() relies on the TpConnection to be ready on + * the TpAccount so we connect this signal as well. */ + tp_g_signal_connect_object (account, "notify::connection", + G_CALLBACK (account_connection_notify_cb), self, 0); + + roster_window_setup_balance (self, account); +} + +/* @account: if not %NULL, the only account which can be enabled */ +static void +display_page_account_not_enabled (EmpathyRosterWindow *self, + TpAccount *account) +{ + if (account == NULL) + { + display_page_message (self, + _("You need to enable one of your accounts to see contacts here."), + TRUE, FALSE); + } + else + { + gchar *tmp; + + /* translators: argument is an account name */ + tmp = g_strdup_printf (_("You need to enable %s to see contacts here."), + tp_account_get_display_name (account)); + + display_page_message (self, tmp, TRUE, FALSE); + g_free (tmp); + } +} +static gboolean +has_enabled_account (GList *accounts) +{ + GList *l; + + for (l = accounts; l != NULL; l = g_list_next (l)) + { + TpAccount *account = l->data; + + if (tp_account_is_enabled (account)) + return TRUE; + } + + return FALSE; +} + +static void +set_notebook_page (EmpathyRosterWindow *self) +{ + GList *accounts; + guint len; + + accounts = tp_account_manager_get_valid_accounts ( + self->priv->account_manager); + + len = g_list_length (accounts); + + if (len == 0) + { + /* No account */ + display_page_no_account (self); + goto out; + } + + if (!has_enabled_account (accounts)) + { + TpAccount *account = NULL; + + /* Pass the account if there is only one which can be enabled */ + if (len == 1) + account = accounts->data; + + display_page_account_not_enabled (self, account); + goto out; + } + + display_page_contact_list (self); + +out: + g_list_free (accounts); +} + +static void +roster_window_account_validity_changed_cb (TpAccountManager *manager, + TpAccount *account, + gboolean valid, + EmpathyRosterWindow *self) +{ + if (valid) + add_account (self, account); + else + roster_window_account_removed_cb (manager, account, self); + + set_notebook_page (self); +} + +static void +roster_window_notify_show_offline_cb (GSettings *gsettings, + const gchar *key, + gpointer toggle_action) +{ + gtk_toggle_action_set_active (toggle_action, + g_settings_get_boolean (gsettings, key)); +} + +static void +roster_window_connection_items_setup (EmpathyRosterWindow *self, + GtkBuilder *gui) +{ + GList *list; + GObject *action; + guint i; + const gchar *actions_connected[] = { + "room_join_new", + "room_join_favorites", + "chat_new_message", + "chat_new_call", + "chat_search_contacts", + "chat_add_contact", + "edit_blocked_contacts", + "edit_search_contacts" + }; + + for (i = 0, list = NULL; i < G_N_ELEMENTS (actions_connected); i++) + { + action = gtk_builder_get_object (gui, actions_connected[i]); + list = g_list_prepend (list, action); + } + + self->priv->actions_connected = list; +} + +static void +account_enabled_cb (TpAccountManager *manager, + TpAccount *account, + EmpathyRosterWindow *self) +{ + set_notebook_page (self); +} + +static void +account_disabled_cb (TpAccountManager *manager, + TpAccount *account, + EmpathyRosterWindow *self) +{ + set_notebook_page (self); +} + +static void +account_manager_prepared_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + GList *accounts, *j; + TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object); + EmpathyRosterWindow *self = user_data; + GError *error = NULL; + + if (!tp_proxy_prepare_finish (manager, result, &error)) + { + DEBUG ("Failed to prepare account manager: %s", error->message); + g_error_free (error); + return; + } + + accounts = tp_account_manager_get_valid_accounts (self->priv->account_manager); + for (j = accounts; j != NULL; j = j->next) + { + TpAccount *account = TP_ACCOUNT (j->data); + + add_account (self, account); + } + + g_signal_connect (manager, "account-validity-changed", + G_CALLBACK (roster_window_account_validity_changed_cb), self); + tp_g_signal_connect_object (manager, "account-disabled", + G_CALLBACK (account_disabled_cb), self, 0); + tp_g_signal_connect_object (manager, "account-enabled", + G_CALLBACK (account_enabled_cb), self, 0); + + roster_window_update_status (self); + + /* Disable the "Previous Conversations" menu entry if there is no account */ + gtk_action_set_sensitive (self->priv->view_history, + g_list_length (accounts) > 0); + + set_notebook_page (self); + + g_list_free (accounts); +} + +void +empathy_roster_window_set_shell_running (EmpathyRosterWindow *self, + gboolean shell_running) +{ + if (self->priv->shell_running == shell_running) + return; + + self->priv->shell_running = shell_running; + g_object_notify (G_OBJECT (self), "shell-running"); +} + +static GObject * +empathy_roster_window_constructor (GType type, + guint n_construct_params, + GObjectConstructParam *construct_params) +{ + static GObject *window = NULL; + + if (window != NULL) + return g_object_ref (window); + + window = G_OBJECT_CLASS (empathy_roster_window_parent_class)->constructor ( + type, n_construct_params, construct_params); + + g_object_add_weak_pointer (window, (gpointer) &window); + + return window; +} + +static void +empathy_roster_window_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + EmpathyRosterWindow *self = EMPATHY_ROSTER_WINDOW (object); + + switch (property_id) + { + case PROP_SHELL_RUNNING: + self->priv->shell_running = g_value_get_boolean (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +empathy_roster_window_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + EmpathyRosterWindow *self = EMPATHY_ROSTER_WINDOW (object); + + switch (property_id) + { + case PROP_SHELL_RUNNING: + g_value_set_boolean (value, self->priv->shell_running); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +empathy_roster_window_class_init (EmpathyRosterWindowClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GParamSpec *pspec; + + object_class->finalize = empathy_roster_window_finalize; + object_class->constructor = empathy_roster_window_constructor; + + object_class->set_property = empathy_roster_window_set_property; + object_class->get_property = empathy_roster_window_get_property; + + pspec = g_param_spec_boolean ("shell-running", + "Shell running", + "Whether the Shell is running or not", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_SHELL_RUNNING, pspec); + + g_type_class_add_private (object_class, sizeof (EmpathyRosterWindowPriv)); +} + +static void +show_contacts_loading (EmpathyRosterWindow *self) +{ + display_page_message (self, NULL, FALSE, TRUE); + + gtk_spinner_start (GTK_SPINNER (self->priv->spinner_loading)); +} + +static void +hide_contacts_loading (EmpathyRosterWindow *self) +{ + gtk_spinner_stop (GTK_SPINNER (self->priv->spinner_loading)); + + display_page_contact_list (self); +} + +static void +contacts_loaded_cb (EmpathyIndividualManager *manager, + EmpathyRosterWindow *self) +{ + hide_contacts_loading (self); +} + +static void +empathy_roster_window_init (EmpathyRosterWindow *self) +{ + GtkBuilder *gui, *gui_mgr; + GtkWidget *sw; + GtkToggleAction *show_offline_widget; + GtkAction *show_map_widget; + GtkToolItem *item; + gboolean show_offline; + gchar *filename; + GtkTreeModel *model; + GtkWidget *search_vbox; + GtkWidget *menubar; + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + EMPATHY_TYPE_ROSTER_WINDOW, EmpathyRosterWindowPriv); + + self->priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA); + self->priv->gsettings_contacts = g_settings_new (EMPATHY_PREFS_CONTACTS_SCHEMA); + + self->priv->sound_mgr = empathy_sound_manager_dup_singleton (); + + gtk_window_set_title (GTK_WINDOW (self), _("Contact List")); + gtk_window_set_role (GTK_WINDOW (self), "contact_list"); + gtk_window_set_default_size (GTK_WINDOW (self), 225, 325); + + /* don't finalize the widget on delete-event, just hide it */ + g_signal_connect (self, "delete-event", + G_CALLBACK (gtk_widget_hide_on_delete), NULL); + + /* Set up interface */ + filename = empathy_file_lookup ("empathy-roster-window.ui", "src"); + gui = empathy_builder_get_file (filename, + "main_vbox", &self->priv->main_vbox, + "balance_vbox", &self->priv->balance_vbox, + "errors_vbox", &self->priv->errors_vbox, + "auth_vbox", &self->priv->auth_vbox, + "search_vbox", &search_vbox, + "presence_toolbar", &self->priv->presence_toolbar, + "notebook", &self->priv->notebook, + "no_entry_label", &self->priv->no_entry_label, + "roster_scrolledwindow", &sw, + "button_account_settings", &self->priv->button_account_settings, + "spinner_loading", &self->priv->spinner_loading, + NULL); + g_free (filename); + + /* Set UI manager */ + filename = empathy_file_lookup ("empathy-roster-window-menubar.ui", "src"); + gui_mgr = empathy_builder_get_file (filename, + "ui_manager", &self->priv->ui_manager, + "view_show_offline", &show_offline_widget, + "view_show_protocols", &self->priv->show_protocols, + "view_sort_by_name", &self->priv->sort_by_name, + "view_sort_by_status", &self->priv->sort_by_status, + "view_normal_size_with_avatars", &self->priv->normal_with_avatars, + "view_normal_size", &self->priv->normal_size, + "view_compact_size", &self->priv->compact_size, + "view_history", &self->priv->view_history, + "view_show_map", &show_map_widget, + "room_join_favorites", &self->priv->room_join_favorites, + "view_balance_show_in_roster", &self->priv->view_balance_show_in_roster, + "menubar", &menubar, + NULL); + g_free (filename); + + /* The UI manager is living in its own .ui file as Glade doesn't support + * those. The GtkMenubar has to be in this file as well to we manually add + * it to the first position of the vbox. */ + gtk_box_pack_start (GTK_BOX (self->priv->main_vbox), menubar, FALSE, FALSE, 0); + gtk_box_reorder_child (GTK_BOX (self->priv->main_vbox), menubar, 0); + + gtk_container_add (GTK_CONTAINER (self), self->priv->main_vbox); + gtk_widget_show (self->priv->main_vbox); + + g_signal_connect (self, "key-press-event", + G_CALLBACK (roster_window_key_press_event_cb), NULL); + + empathy_builder_connect (gui_mgr, self, + "chat_quit", "activate", roster_window_chat_quit_cb, + "chat_new_message", "activate", roster_window_chat_new_message_cb, + "chat_new_call", "activate", roster_window_chat_new_call_cb, + "view_history", "activate", roster_window_view_history_cb, + "room_join_new", "activate", roster_window_room_join_new_cb, + "room_join_favorites", "activate", roster_window_room_join_favorites_cb, + "room_manage_favorites", "activate", roster_window_room_manage_favorites_cb, + "chat_add_contact", "activate", roster_window_chat_add_contact_cb, + "chat_search_contacts", "activate", roster_window_chat_search_contacts_cb, + "view_show_ft_manager", "activate", roster_window_view_show_ft_manager, + "view_show_offline", "toggled", roster_window_view_show_offline_cb, + "view_show_protocols", "toggled", roster_window_view_show_protocols_cb, + "view_sort_by_name", "changed", roster_window_view_sort_contacts_cb, + "view_normal_size_with_avatars", "changed", roster_window_view_contacts_list_size_cb, + "view_show_map", "activate", roster_window_view_show_map_cb, + "edit", "activate", roster_window_edit_cb, + "edit_accounts", "activate", roster_window_edit_accounts_cb, + "edit_blocked_contacts", "activate", roster_window_edit_blocked_contacts_cb, + "edit_preferences", "activate", roster_window_edit_preferences_cb, + "edit_search_contacts", "activate", roster_window_edit_search_contacts_cb, + "help_about", "activate", roster_window_help_about_cb, + "help_debug", "activate", roster_window_help_debug_cb, + "help_contents", "activate", roster_window_help_contents_cb, + NULL); + + /* Set up connection related widgets. */ + roster_window_connection_items_setup (self, gui_mgr); + + g_object_ref (self->priv->ui_manager); + g_object_unref (gui); + g_object_unref (gui_mgr); + +#ifndef HAVE_LIBCHAMPLAIN + gtk_action_set_visible (show_map_widget, FALSE); +#endif + + self->priv->account_manager = tp_account_manager_dup (); + + tp_proxy_prepare_async (self->priv->account_manager, NULL, + account_manager_prepared_cb, self); + + self->priv->errors = g_hash_table_new_full (g_direct_hash, g_direct_equal, + g_object_unref, NULL); + + self->priv->auths = g_hash_table_new (NULL, NULL); + + self->priv->status_changed_handlers = g_hash_table_new_full (g_direct_hash, + g_direct_equal, NULL, NULL); + + /* Set up menu */ + roster_window_favorite_chatroom_menu_setup (self); + + self->priv->edit_context = gtk_ui_manager_get_widget (self->priv->ui_manager, + "/menubar/edit/edit_context"); + self->priv->edit_context_separator = gtk_ui_manager_get_widget ( + self->priv->ui_manager, + "/menubar/edit/edit_context_separator"); + gtk_widget_hide (self->priv->edit_context); + gtk_widget_hide (self->priv->edit_context_separator); + + /* Set up contact list. */ + empathy_status_presets_get_all (); + + /* Set up presence chooser */ + self->priv->presence_chooser = empathy_presence_chooser_new (); + gtk_widget_show (self->priv->presence_chooser); + item = gtk_tool_item_new (); + gtk_widget_show (GTK_WIDGET (item)); + gtk_widget_set_size_request (self->priv->presence_chooser, 10, -1); + gtk_container_add (GTK_CONTAINER (item), self->priv->presence_chooser); + gtk_tool_item_set_is_important (item, TRUE); + gtk_tool_item_set_expand (item, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (self->priv->presence_toolbar), item, -1); + + /* Set up the throbber */ + self->priv->throbber = gtk_spinner_new (); + gtk_widget_set_size_request (self->priv->throbber, 16, -1); + gtk_widget_set_events (self->priv->throbber, GDK_BUTTON_PRESS_MASK); + g_signal_connect (self->priv->throbber, "button-press-event", + G_CALLBACK (roster_window_throbber_button_press_event_cb), + self); + gtk_widget_show (self->priv->throbber); + + item = gtk_tool_item_new (); + gtk_container_set_border_width (GTK_CONTAINER (item), 6); + gtk_toolbar_insert (GTK_TOOLBAR (self->priv->presence_toolbar), item, -1); + gtk_container_add (GTK_CONTAINER (item), self->priv->throbber); + self->priv->throbber_tool_item = GTK_WIDGET (item); + + /* XXX: this class is designed to live for the duration of the program, + * so it's got a race condition between its signal handlers and its + * finalization. The class is planned to be removed, so we won't fix + * this before then. */ + self->priv->individual_manager = empathy_individual_manager_dup_singleton (); + + if (!empathy_individual_manager_get_contacts_loaded ( + self->priv->individual_manager)) + { + show_contacts_loading (self); + + tp_g_signal_connect_object (self->priv->individual_manager, + "contacts-loaded", G_CALLBACK (contacts_loaded_cb), self, 0); + } + + self->priv->individual_store = EMPATHY_INDIVIDUAL_STORE ( + empathy_individual_store_manager_new (self->priv->individual_manager)); + + /* For the moment, we disallow Persona drops onto the roster contact list + * (e.g. from things such as the EmpathyPersonaView in the linking dialogue). + * No code is hooked up to do anything on a Persona drop, so allowing them + * would achieve nothing except confusion. */ + self->priv->individual_view = empathy_individual_view_new ( + self->priv->individual_store, + /* EmpathyIndividualViewFeatureFlags */ + EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_SAVE | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_RENAME | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_REMOVE | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_CHANGE | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_REMOVE | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DROP | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DRAG | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_TOOLTIP | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_CALL | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_FILE_DROP, + /* EmpathyIndividualFeatureFlags */ + EMPATHY_INDIVIDUAL_FEATURE_CHAT | + EMPATHY_INDIVIDUAL_FEATURE_CALL | + EMPATHY_INDIVIDUAL_FEATURE_EDIT | + EMPATHY_INDIVIDUAL_FEATURE_INFO | + EMPATHY_INDIVIDUAL_FEATURE_SMS | + EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE); + + gtk_widget_show (GTK_WIDGET (self->priv->individual_view)); + gtk_container_add (GTK_CONTAINER (sw), + GTK_WIDGET (self->priv->individual_view)); + g_signal_connect (self->priv->individual_view, "row-activated", + G_CALLBACK (roster_window_row_activated_cb), self); + + /* Set up search bar */ + self->priv->search_bar = empathy_live_search_new ( + GTK_WIDGET (self->priv->individual_view)); + empathy_individual_view_set_live_search (self->priv->individual_view, + EMPATHY_LIVE_SEARCH (self->priv->search_bar)); + gtk_box_pack_start (GTK_BOX (search_vbox), self->priv->search_bar, + FALSE, TRUE, 0); + + g_signal_connect_swapped (self, "map", + G_CALLBACK (gtk_widget_grab_focus), self->priv->individual_view); + + /* Connect to proper signals to check if contact list is empty or not */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->individual_view)); + self->priv->empty = TRUE; + g_signal_connect (model, "row-inserted", + G_CALLBACK (roster_window_row_inserted_cb), self); + g_signal_connect (model, "row-deleted", + G_CALLBACK (roster_window_row_deleted_cb), self); + + /* Load user-defined accelerators. */ + roster_window_accels_load (); + + /* Set window size. */ + empathy_geometry_bind (GTK_WINDOW (self), GEOMETRY_NAME); + + /* bind view_balance_show_in_roster */ + g_settings_bind (self->priv->gsettings_ui, "show-balance-in-roster", + self->priv->view_balance_show_in_roster, "active", + G_SETTINGS_BIND_DEFAULT); + g_object_bind_property (self->priv->view_balance_show_in_roster, "active", + self->priv->balance_vbox, "visible", + G_BINDING_SYNC_CREATE); + + g_settings_bind (self->priv->gsettings_ui, "show-groups", + self->priv->individual_store, "show-groups", G_SETTINGS_BIND_DEFAULT); + + /* Enable event handling */ + self->priv->call_observer = empathy_call_observer_dup_singleton (); + self->priv->event_manager = empathy_event_manager_dup_singleton (); + + g_signal_connect (self->priv->event_manager, "event-added", + G_CALLBACK (roster_window_event_added_cb), self); + g_signal_connect (self->priv->event_manager, "event-removed", + G_CALLBACK (roster_window_event_removed_cb), self); + g_signal_connect (self->priv->account_manager, "account-validity-changed", + G_CALLBACK (roster_window_account_validity_changed_cb), self); + g_signal_connect (self->priv->account_manager, "account-removed", + G_CALLBACK (roster_window_account_removed_cb), self); + g_signal_connect (self->priv->account_manager, "account-disabled", + G_CALLBACK (roster_window_account_disabled_cb), self); + + /* Show offline ? */ + show_offline = g_settings_get_boolean (self->priv->gsettings_ui, + EMPATHY_PREFS_UI_SHOW_OFFLINE); + + g_signal_connect (self->priv->gsettings_ui, + "changed::" EMPATHY_PREFS_UI_SHOW_OFFLINE, + G_CALLBACK (roster_window_notify_show_offline_cb), show_offline_widget); + + gtk_toggle_action_set_active (show_offline_widget, show_offline); + + /* Show protocol ? */ + g_signal_connect (self->priv->gsettings_ui, + "changed::" EMPATHY_PREFS_UI_SHOW_PROTOCOLS, + G_CALLBACK (roster_window_notify_show_protocols_cb), self); + + roster_window_notify_show_protocols_cb (self->priv->gsettings_ui, + EMPATHY_PREFS_UI_SHOW_PROTOCOLS, self); + + /* Sort by name / by status ? */ + g_signal_connect (self->priv->gsettings_contacts, + "changed::" EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, + G_CALLBACK (roster_window_notify_sort_contact_cb), self); + + roster_window_notify_sort_contact_cb (self->priv->gsettings_contacts, + EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, self); + + /* Contacts list size */ + g_signal_connect (self->priv->gsettings_ui, + "changed::" EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, + G_CALLBACK (roster_window_notify_contact_list_size_cb), self); + + g_signal_connect (self->priv->gsettings_ui, + "changed::" EMPATHY_PREFS_UI_SHOW_AVATARS, + G_CALLBACK (roster_window_notify_contact_list_size_cb), + self); + + roster_window_notify_contact_list_size_cb (self->priv->gsettings_ui, + EMPATHY_PREFS_UI_SHOW_AVATARS, self); + + g_signal_connect (self->priv->button_account_settings, "clicked", + G_CALLBACK (button_account_settings_clicked_cb), self); +} + +GtkWidget * +empathy_roster_window_dup (void) +{ + return g_object_new (EMPATHY_TYPE_ROSTER_WINDOW, NULL); +} diff --git a/src/empathy-roster-window.h b/src/empathy-roster-window.h new file mode 100644 index 00000000..54404ad3 --- /dev/null +++ b/src/empathy-roster-window.h @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2002-2007 Imendio AB + * Copyright (C) 2007-2008 Collabora Ltd. + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: Xavier Claessens + * Danielle Madeley + */ + +#ifndef __EMPATHY_ROSTER_WINDOW_H__ +#define __EMPATHY_ROSTER_WINDOW_H__ + +#include + +G_BEGIN_DECLS + +#define EMPATHY_TYPE_ROSTER_WINDOW (empathy_roster_window_get_type ()) +#define EMPATHY_ROSTER_WINDOW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_ROSTER_WINDOW, EmpathyRosterWindow)) +#define EMPATHY_ROSTER_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_ROSTER_WINDOW, EmpathyRosterWindowClass)) +#define EMPATHY_IS_ROSTER_WINDOW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_ROSTER_WINDOW)) +#define EMPATHY_IS_ROSTER_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_ROSTER_WINDOW)) +#define EMPATHY_ROSTER_WINDOW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_ROSTER_WINDOW, EmpathyRosterWindowClass)) + +typedef struct _EmpathyRosterWindow EmpathyRosterWindow; +typedef struct _EmpathyRosterWindowClass EmpathyRosterWindowClass; +typedef struct _EmpathyRosterWindowPriv EmpathyRosterWindowPriv; + +struct _EmpathyRosterWindow +{ + GtkWindow parent; + EmpathyRosterWindowPriv *priv; +}; + +struct _EmpathyRosterWindowClass +{ + GtkWindowClass parent_class; +}; + +GType empathy_roster_window_get_type (void); + +GtkWidget *empathy_roster_window_dup (void); + +void empathy_roster_window_show_preferences (EmpathyRosterWindow *self, + const gchar *tab); + +void empathy_roster_window_set_shell_running (EmpathyRosterWindow *self, + gboolean shell_running); + +G_END_DECLS + +#endif /* __EMPATHY_ROSTER_WINDOW_H__ */ diff --git a/src/empathy-roster-window.ui b/src/empathy-roster-window.ui new file mode 100644 index 00000000..8c8f6300 --- /dev/null +++ b/src/empathy-roster-window.ui @@ -0,0 +1,183 @@ + + + + + True + False + + + True + False + both + + + + False + False + 1 + + + + + False + 3 + + + + + + False + False + 2 + + + + + False + + + + + + False + False + 3 + + + + + False + + + + + + False + False + 4 + + + + + True + False + + + + + + False + False + 5 + + + + + True + True + False + False + + + True + True + True + never + + + + + + + + True + False + vertical + + + True + False + 1 + 1 + avatar-default + 6 + + + True + True + 0 + + + + + True + False + 0.30000001192092896 + + + True + True + 1 + + + + + True + False + 0 + 0 + 0 + + + Account settings + True + True + True + 6 + 6 + False + + + + + True + True + 2 + + + + + True + False + 0 + 0 + 0 + + + True + False + + + + + True + True + 2 + + + + + 1 + + + + + True + True + 6 + + + + diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c index 0537dea9..045f08de 100644 --- a/src/empathy-rounded-actor.c +++ b/src/empathy-rounded-actor.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include #include diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c index e06889d5..4cce28b0 100644 --- a/src/empathy-rounded-rectangle.c +++ b/src/empathy-rounded-rectangle.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + #include #include diff --git a/src/empathy.c b/src/empathy.c index b73bf1b0..f59a54f1 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -48,6 +48,8 @@ #include +#include +#include #include #include #include @@ -63,7 +65,7 @@ #include #include -#include "empathy-main-window.h" +#include "empathy-roster-window.h" #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" #include "empathy-status-icon.h" @@ -122,6 +124,7 @@ struct _EmpathyApp EmpathyConnectivity *connectivity; GSettings *gsettings; EmpathyNotificationsApprover *notifications_approver; + EmpathyConnectionAggregator *conn_aggregator; #ifdef HAVE_GEOCLUE EmpathyLocationManager *location_manager; #endif @@ -167,6 +170,7 @@ empathy_app_dispose (GObject *object) tp_clear_object (&self->ft_factory); tp_clear_object (&self->gsettings); tp_clear_object (&self->notifications_approver); + tp_clear_object (&self->conn_aggregator); if (dispose != NULL) dispose (object); @@ -285,8 +289,8 @@ out: /* Rely on GNOME Shell to watch session state */ empathy_presence_manager_set_auto_away (self->presence_mgr, FALSE); - empathy_main_window_set_shell_running (EMPATHY_MAIN_WINDOW (self->window), - TRUE); + empathy_roster_window_set_shell_running ( + EMPATHY_ROSTER_WINDOW (self->window), TRUE); } else { @@ -351,7 +355,7 @@ empathy_app_command_line (GApplication *app, self->activated = TRUE; /* Setting up UI */ - self->window = empathy_main_window_dup (); + self->window = empathy_roster_window_dup (); gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (self->window)); @@ -377,8 +381,8 @@ empathy_app_command_line (GApplication *app, } if (self->show_preferences) - empathy_main_window_show_preferences (EMPATHY_MAIN_WINDOW (self->window), - self->preferences_tab); + empathy_roster_window_show_preferences ( + EMPATHY_ROSTER_WINDOW (self->window), self->preferences_tab); if (!self->start_hidden) empathy_window_present (GTK_WINDOW (self->window)); @@ -808,11 +812,34 @@ empathy_app_constructed (GObject *object) self->location_manager = empathy_location_manager_dup_singleton (); #endif + self->conn_aggregator = empathy_connection_aggregator_dup_singleton (); + self->activated = FALSE; self->ft_factory = NULL; self->window = NULL; } +static void +add_empathy_features (void) +{ + /* Add 'empathy' specific feature before doing any preparation */ + EmpathyClientFactory *factory; + + factory = empathy_client_factory_dup (); + + tp_simple_client_factory_add_connection_features_varargs ( + TP_SIMPLE_CLIENT_FACTORY (factory), + /* empathy_connection_aggregator_get_all_groups(), used by + * EmpathyGroupsWidget relies on it */ + TP_CONNECTION_FEATURE_CONTACT_GROUPS, + /* empathy_connection_aggregator_dup_all_contacts(), used by + * EmpathyEventManager relies on it */ + TP_CONNECTION_FEATURE_CONTACT_LIST, + NULL); + + g_object_unref (factory); +} + int main (int argc, char *argv[]) { @@ -832,6 +859,8 @@ main (int argc, char *argv[]) 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, diff --git a/telepathy-yell b/telepathy-yell index ec9faee5..32775ef6 160000 --- a/telepathy-yell +++ b/telepathy-yell @@ -1 +1 @@ -Subproject commit ec9faee52bf288d811f51071e405153b1a5b5a6b +Subproject commit 32775ef66842c5c1ff939e35a0870f82d692b556 diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c index df114707..ba01c378 100644 --- a/tests/empathy-irc-network-manager-test.c +++ b/tests/empathy-irc-network-manager-test.c @@ -33,9 +33,9 @@ test_empathy_irc_network_manager_add (void) g_object_unref (network); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 1); + g_assert_cmpuint (g_slist_length (networks), ==, 1); g_object_get (networks->data, "name", &name, NULL); - g_assert (name != NULL && strcmp (name, "My Network") == 0); + g_assert_cmpstr (name, ==, "My Network"); g_free (name); g_slist_foreach (networks, (GFunc) g_object_unref, NULL); g_slist_free (networks); @@ -47,12 +47,12 @@ test_empathy_irc_network_manager_add (void) g_object_unref (network); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 2); + g_assert_cmpuint (g_slist_length (networks), ==, 2); g_object_get (networks->data, "name", &name, NULL); - g_assert (name != NULL && strcmp (name, "My Network") == 0); + g_assert_cmpstr (name, ==, "My Network"); g_free (name); g_object_get (g_slist_next (networks)->data, "name", &name, NULL); - g_assert (name != NULL || strcmp (name, "My Network") == 0); + g_assert_cmpstr (name, ==, "My Network"); g_free (name); g_slist_foreach (networks, (GFunc) g_object_unref, NULL); g_slist_free (networks); @@ -86,14 +86,13 @@ test_load_global_file (void) "global-file", &global_file, "user-file", &user_file, NULL); - g_assert (global_file != NULL || strcmp (global_file, global_file_orig) == 0); - g_assert (user_file == NULL); + g_assert_cmpstr (global_file, ==, global_file_orig); g_free (global_file); g_free (global_file_orig); g_free (user_file); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 4); + g_assert_cmpuint (g_slist_length (networks), ==, 4); network_checked[0] = network_checked[1] = network_checked[2] = network_checked[3] = FALSE; @@ -197,7 +196,7 @@ test_empathy_irc_network_manager_remove (void) g_assert (result); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 3); + g_assert_cmpuint (g_slist_length (networks), ==, 3); network_checked[0] = network_checked[1] = network_checked[2] = FALSE; /* check networks and servers */ @@ -263,13 +262,13 @@ test_load_user_file (void) "user-file", &user_file, NULL); g_assert (global_file == NULL); - g_assert (user_file != NULL && strcmp (user_file, user_file_orig) == 0); + g_assert_cmpstr (user_file, ==, user_file_orig); g_free (global_file); g_free (user_file); g_free (user_file_orig); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 3); + g_assert_cmpuint (g_slist_length (networks), ==, 3); network_checked[0] = network_checked[1] = network_checked[2] = FALSE; /* check networks and servers */ @@ -339,15 +338,15 @@ test_load_both_files (void) "global-file", &global_file, "user-file", &user_file, NULL); - g_assert (global_file != NULL && strcmp (global_file, global_file_orig) == 0); - g_assert (user_file != NULL && strcmp (user_file, user_file_orig) == 0); + g_assert_cmpstr (global_file, ==, global_file_orig); + g_assert_cmpstr (user_file, ==, user_file_orig); g_free (global_file); g_free (global_file_orig); g_free (user_file); g_free (user_file_orig); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 5); + g_assert_cmpuint (g_slist_length (networks), ==, 5); network_checked[0] = network_checked[1] = network_checked[2] = network_checked[3] = network_checked[4] = FALSE; @@ -427,12 +426,12 @@ test_modify_user_file (void) "user-file", &user_file, NULL); g_assert (global_file == NULL); - g_assert (user_file != NULL && strcmp (user_file, user_file_orig) == 0); + g_assert_cmpstr (user_file, ==, user_file_orig); g_free (global_file); g_free (user_file); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 3); + g_assert_cmpuint (g_slist_length (networks), ==, 3); network_modified[0] = network_modified[1] = FALSE; /* check networks and servers */ @@ -523,7 +522,7 @@ test_modify_user_file (void) g_free (user_file_orig); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 3); + g_assert_cmpuint (g_slist_length (networks), ==, 3); network_checked[0] = network_checked[1] = network_checked[2] = FALSE; /* check networks and servers */ @@ -594,15 +593,15 @@ test_modify_both_files (void) "global-file", &global_file, "user-file", &user_file, NULL); - g_assert (global_file != NULL && strcmp (global_file, global_file_orig) == 0); - g_assert (user_file != NULL && strcmp (user_file, user_file_orig) == 0); + g_assert_cmpstr (global_file, ==, global_file_orig); + g_assert_cmpstr (user_file, ==, user_file_orig); g_free (global_file); g_free (global_file_orig); g_free (user_file); g_free (user_file_orig); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 5); + g_assert_cmpuint (g_slist_length (networks), ==, 5); network_modified[0] = network_modified[1] = network_modified[2] = network_modified[3] = FALSE; @@ -711,7 +710,7 @@ test_modify_both_files (void) g_free (user_file_orig); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 4); + g_assert_cmpuint (g_slist_length (networks), ==, 4); network_checked[0] = network_checked[1] = network_checked[2] = network_checked[3] = FALSE; @@ -811,7 +810,7 @@ test_no_modify_with_empty_user_file (void) g_free (user_file_orig); networks = empathy_irc_network_manager_get_networks (mgr); - g_assert (g_slist_length (networks) == 0); + g_assert_cmpuint (g_slist_length (networks), ==, 0); g_slist_foreach (networks, (GFunc) g_object_unref, NULL); g_slist_free (networks); diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c index 8256da47..58c53dc6 100644 --- a/tests/empathy-tls-test.c +++ b/tests/empathy-tls-test.c @@ -454,9 +454,10 @@ test_certificate_verify_success_with_pkcs11_lookup (Test *test, reference_identities); empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test); g_main_loop_run (test->loop); - if (!empathy_tls_verifier_verify_finish (verifier, test->result, &reason, - NULL, &error)) - g_assert_not_reached (); + + empathy_tls_verifier_verify_finish (verifier, test->result, &reason, + NULL, &error); + g_assert_no_error (error); /* Yay the verification was a success! */ @@ -494,9 +495,9 @@ test_certificate_verify_success_with_full_chain (Test *test, reference_identities); empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test); g_main_loop_run (test->loop); - if (!empathy_tls_verifier_verify_finish (verifier, test->result, &reason, - NULL, &error)) - g_assert_not_reached (); + empathy_tls_verifier_verify_finish (verifier, test->result, &reason, + NULL, &error); + g_assert_no_error (error); /* Yay the verification was a success! */ @@ -528,12 +529,12 @@ test_certificate_verify_root_not_found (Test *test, empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test); g_main_loop_run (test->loop); - if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason, - NULL, &error)) - g_assert_not_reached (); + empathy_tls_verifier_verify_finish (verifier, test->result, &reason, + NULL, &error); /* And it should say we're self-signed (oddly enough) */ - g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED); + g_assert_error (error, G_IO_ERROR, + EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED); g_clear_error (&error); g_object_unref (verifier); @@ -563,12 +564,12 @@ test_certificate_verify_root_not_anchored (Test *test, empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test); g_main_loop_run (test->loop); - if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason, - NULL, &error)) - g_assert_not_reached (); + empathy_tls_verifier_verify_finish (verifier, test->result, &reason, + NULL, &error); /* And it should say we're self-signed (oddly enough) */ - g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED); + g_assert_error (error, G_IO_ERROR, + EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED); g_clear_error (&error); g_object_unref (verifier); @@ -600,12 +601,12 @@ test_certificate_verify_identities_invalid (Test *test, empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test); g_main_loop_run (test->loop); - if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason, - NULL, &error)) - g_assert_not_reached (); + empathy_tls_verifier_verify_finish (verifier, test->result, &reason, + NULL, &error); /* And it should say we're self-signed (oddly enough) */ - g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH); + g_assert_error (error, G_IO_ERROR, + EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH); g_clear_error (&error); g_object_unref (verifier); @@ -638,12 +639,12 @@ test_certificate_verify_uses_reference_identities (Test *test, empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test); g_main_loop_run (test->loop); - if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason, - NULL, &error)) - g_assert_not_reached (); + empathy_tls_verifier_verify_finish (verifier, test->result, &reason, + NULL, &error); /* And it should say we're self-signed (oddly enough) */ - g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH); + g_assert_error (error, G_IO_ERROR, + EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH); g_clear_error (&error); g_object_unref (verifier); diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index e07ed65f..bb0f4154 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -15,7 +15,6 @@ LDADD = \ noinst_PROGRAMS = \ empathy-logs \ - test-empathy-account-assistant \ test-empathy-contact-blocking-dialog \ test-empathy-presence-chooser \ test-empathy-status-preset-dialog \ @@ -27,14 +26,4 @@ test_empathy_contact_blocking_dialog_SOURCES = test-empathy-contact-blocking-dia test_empathy_presence_chooser_SOURCES = test-empathy-presence-chooser.c test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c test_empathy_protocol_chooser_SOURCES = test-empathy-protocol-chooser.c -test_empathy_account_assistant_SOURCES = test-empathy-account-assistant.c test_empathy_account_chooser_SOURCES = test-empathy-account-chooser.c - -test_empathy_account_assistant_CFLAGS = -I$(top_srcdir)/src -test_empathy_account_assistant_LDADD = \ - $(top_builddir)/src/empathy-account-assistant.lo \ - $(top_builddir)/src/empathy-auto-salut-account-helper.lo \ - $(top_builddir)/src/empathy-import-pidgin.lo \ - $(top_builddir)/src/empathy-import-utils.lo \ - $(top_builddir)/src/empathy-import-widget.lo \ - $(LDADD) diff --git a/tests/interactive/test-empathy-account-assistant.c b/tests/interactive/test-empathy-account-assistant.c deleted file mode 100644 index dc04c702..00000000 --- a/tests/interactive/test-empathy-account-assistant.c +++ /dev/null @@ -1,42 +0,0 @@ -#include - -#include - -#include -#include "empathy-account-assistant.h" - -static void -managers_prepare_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GtkWidget *assistant; - EmpathyConnectionManagers *managers = EMPATHY_CONNECTION_MANAGERS (source); - - g_assert (empathy_connection_managers_prepare_finish (managers, result, - NULL)); - - assistant = empathy_account_assistant_show (NULL, managers); - - gtk_widget_show_all (assistant); - - g_signal_connect_swapped (assistant, "destroy", - G_CALLBACK (gtk_main_quit), NULL); -} - -int main (int argc, char **argv) -{ - EmpathyConnectionManagers *managers; - - gtk_init (&argc, &argv); - empathy_gtk_init (); - - managers = empathy_connection_managers_dup_singleton (); - - empathy_connection_managers_prepare_async (managers, - managers_prepare_cb, NULL); - - gtk_main (); - - return 0; -} diff --git a/tests/interactive/test-empathy-contact-blocking-dialog.c b/tests/interactive/test-empathy-contact-blocking-dialog.c index 801bd0b5..66353f13 100644 --- a/tests/interactive/test-empathy-contact-blocking-dialog.c +++ b/tests/interactive/test-empathy-contact-blocking-dialog.c @@ -23,26 +23,54 @@ #include -#include +#include #include #include +static void +am_prepare_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GMainLoop *loop = user_data; + GtkWidget *dialog; + + dialog = empathy_contact_blocking_dialog_new (NULL); + + gtk_dialog_run (GTK_DIALOG (dialog)); + + g_main_loop_quit (loop); +} + int main (int argc, char **argv) { - EmpathyContactManager *manager; - GtkWidget *dialog; + EmpathyClientFactory *factory; + TpAccountManager *am; + GMainLoop *loop; gtk_init (&argc, &argv); empathy_gtk_init (); - manager = empathy_contact_manager_dup_singleton (); - dialog = empathy_contact_blocking_dialog_new (NULL); + /* The blocking dialog needs the contact list for the contacts completion + * so we prepare it first. */ + factory = empathy_client_factory_dup (); - gtk_dialog_run (GTK_DIALOG (dialog)); + tp_simple_client_factory_add_connection_features_varargs ( + TP_SIMPLE_CLIENT_FACTORY (factory), + TP_CONNECTION_FEATURE_CONTACT_LIST, + NULL); + + am = tp_account_manager_dup (); + + loop = g_main_loop_new (NULL, FALSE); + + tp_proxy_prepare_async (am, NULL, am_prepare_cb, loop); + + g_main_loop_run (loop); - g_object_unref (manager); + g_object_unref (am); return 0; }