diff options
| -rw-r--r-- | NEWS | 48 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/es.po | 25 | ||||
| -rw-r--r-- | po/nb.po | 85 | ||||
| -rw-r--r-- | po/pa.po | 84 | ||||
| -rw-r--r-- | po/pt.po | 1580 | ||||
| -rw-r--r-- | po/ru.po | 584 | ||||
| -rw-r--r-- | src/empathy-call-observer.c | 178 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 5 |
10 files changed, 1440 insertions, 1156 deletions
@@ -1,3 +1,51 @@ +NEW in 2.91.91 (08/03/2011) +============== + +Dependencies: + + • telepathy-glib ≥ 0.13.16 + • GTK+ ≥ 3.0.2 + +Empathy will now automatically reject new incoming calls while there is +another active call. A notification will be displayed telling you about the +call you just missed. + +We strongly recommend that you update to telepathy-mission-control 5.7.6 to +avoid races between the different Empathy components. + +Bugs fixed: + - Fixed #583317, throbber/status message input widget disapper when contact list too narrow (Robert Sajdok) + - Fixed #641121, Empathy ask to confirm certificate even if it is trusted in system stash (Stef Walter) + - Fixed #643656, Autoreject incoming calls when there is one in progress (Emilio Pozuelo Monfort) + - Fixed #643745, Support Ch.I.CredentialsStorage in auth-client (Danielle Madeley) + - Fixed #643872, Auth client should have Observer.DelayApprovers (Guillaume Desmottes) + - Fixed #643920, MSN protocol name may not be recognizable to some users (Guillaume Desmottes) + - Fixed #644058, Missing mnemonic for "I don't want to enable this feature for now" (Guillaume Desmottes) + - Fixed #644062, Warn if the user has insufficient disk space to receive file (Danielle Madeley) + - Fixed #644121, all: set the primary-toolbar style class on primary toolbars (Cosimo Cecchi) + - Fixed #644127, Display a notification when rejecting a call (Guillaume Desmottes) + - Fixed #644210, Fix various issues in the Call observer (Guillaume Desmottes) + +Translations: + - Updated ar Translation (Khaled Hosny) + - Updated bg Translation (Krasimir Chonov) + - Updated ca Translation (Gil Forcada) + - Updated es Translation (Daniel Mustieles) + - Updated et Translation (Ivar Smolin) + - Updated fr Translation (Bruno Brouard) + - Updated he Translation (Yaron Shahrabani) + - Updated ko Translation (Changwoo Ryu) + - Updated lt Translation (Žygimantas Beručka) + - Updated lv Translation (Rudolfs Mazurs) + - Updated nb Translation (Kjartan Maraas) + - Updated pa Translation (A S Alam) + - Updated pt Translation (Duarte Loreto) + - Updated ru Translation (Yuri Myasoedov, Leonid Kanter) + - Updated sl Translation (Matej Urbančič) + - Updated sv Translation (Daniel Nylander) + - Updated uk Translation (Daniel Korostil) + - Updated zh_CN Translation (liuzhen) + NEW in 2.91.90.2 (25/02/2011) ================ diff --git a/configure.ac b/configure.ac index a0899cc51..15ef4973e 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ m4_define(empathy_released, 0) m4_define([empathy_major_version], [2]) m4_define([empathy_minor_version], [91]) -m4_define([empathy_micro_version], [90]) -m4_define([empathy_nano_version], [2]) +m4_define([empathy_micro_version], [91]) +m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' m4_define([empathy_base_version], @@ -34,7 +34,7 @@ AC_COPYRIGHT([ FOLKS_REQUIRED=0.3.5 GLIB_REQUIRED=2.27.2 GNUTLS_REQUIRED=2.8.5 -GTK_REQUIRED=2.99.0 +GTK_REQUIRED=3.0.2 KEYRING_REQUIRED=2.26.0 GCR_REQUIRED=2.91.4 LIBCANBERRA_GTK_REQUIRED=0.25 diff --git a/po/POTFILES.in b/po/POTFILES.in index eddcc87ee..a1c679045 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -113,3 +113,4 @@ src/empathy-av.c src/empathy-debugger.c src/empathy-chat.c src/empathy-notifications-approver.c +src/empathy-call-observer.c @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: empathy.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&component=general\n" -"POT-Creation-Date: 2011-03-03 13:42+0000\n" -"PO-Revision-Date: 2011-03-04 09:49+0100\n" +"POT-Creation-Date: 2011-03-07 11:14+0000\n" +"PO-Revision-Date: 2011-03-07 12:42+0100\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "MIME-Version: 1.0\n" @@ -1687,7 +1687,6 @@ msgid "Search: " msgstr "Buscar:" #: ../libempathy-gtk/empathy-contact-search-dialog.c:537 -#| msgid "_Add Contact…" msgid "_Add Contact" msgstr "_Añadir contacto" @@ -2359,7 +2358,20 @@ msgstr "No se pudo abrir el URI" msgid "Select a file" msgstr "Seleccionar un archivo" -#: ../libempathy-gtk/empathy-ui-utils.c:1871 +#: ../libempathy-gtk/empathy-ui-utils.c:1874 +msgid "Insufficient free space to save file" +msgstr "No hay espacio suficiente para guardar el archivo" + +#: ../libempathy-gtk/empathy-ui-utils.c:1882 +#, c-format +msgid "" +"%s of free space are required to save this file, but only %s is available. " +"Please choose another location." +msgstr "" +"Se requiere %s de espacio libre para guardar este archivo, pero sólo hay %s " +"disponible. Elija otra ubicación." + +#: ../libempathy-gtk/empathy-ui-utils.c:1926 #, c-format msgid "Incoming file from %s" msgstr "Archivo entrante de %s" @@ -2743,8 +2755,9 @@ msgid "Edit->Accounts" msgstr "Editar->Cuentas" #: ../src/empathy-account-assistant.c:1104 -msgid "I don't want to enable this feature for now" -msgstr "No quiero activar esta característica por ahora" +#| msgid "I don't want to enable this feature for now" +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:1140 msgid "" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy 2.92.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-01 18:16+0100\n" -"PO-Revision-Date: 2011-03-01 18:18+0100\n" +"POT-Creation-Date: 2011-03-08 14:41+0100\n" +"PO-Revision-Date: 2011-03-08 14:42+0100\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" "Language: no\n" @@ -755,7 +755,7 @@ msgstr "L_ogg inn" #. Account and Identifier #: ../libempathy-gtk/empathy-account-widget.c:1990 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:451 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:515 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 #: ../libempathy-gtk/empathy-individual-widget.c:1479 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 @@ -1257,7 +1257,9 @@ msgstr "/j <prateroms-ID>: bli med i et nytt praterom" msgid "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" -msgstr "/part [<praterom-ID>] [<årsak>]: forlat praterommet, forvalg er det aktive rommet" +msgstr "" +"/part [<praterom-ID>] [<årsak>]: forlat praterommet, forvalg er det aktive " +"rommet" #: ../libempathy-gtk/empathy-chat.c:928 msgid "/query <contact ID> [<message>]: open a private chat" @@ -1632,15 +1634,19 @@ msgid "_Invite to Chat Room" msgstr "_Inviter til praterom" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:445 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:508 msgid "Search contacts" msgstr "Søk i kontakter" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:473 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:538 msgid "Search: " msgstr "Søk: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:534 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:596 +msgid "_Add Contact" +msgstr "_Legg til kontakt" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:614 msgid "No contacts found" msgstr "Ingen kontakter funnet" @@ -1888,7 +1894,7 @@ msgid "Select" msgstr "Velg" #: ../libempathy-gtk/empathy-groups-widget.c:408 -#: ../src/empathy-main-window.c:1432 +#: ../src/empathy-main-window.c:1437 msgid "Group" msgstr "Gruppe" @@ -2303,7 +2309,18 @@ msgstr "Kan ikke åpne URI" msgid "Select a file" msgstr "Velg en fil" -#: ../libempathy-gtk/empathy-ui-utils.c:1871 +#: ../libempathy-gtk/empathy-ui-utils.c:1874 +msgid "Insufficient free space to save file" +msgstr "Ikke nok ledig plass til å lagre filen" + +#: ../libempathy-gtk/empathy-ui-utils.c:1882 +#, c-format +msgid "" +"%s of free space are required to save this file, but only %s is available. " +"Please choose another location." +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:1926 #, c-format msgid "Incoming file from %s" msgstr "Innkommende fil fra %s" @@ -2687,8 +2704,8 @@ msgid "Edit->Accounts" msgstr "Rediger->Kontoer" #: ../src/empathy-account-assistant.c:1104 -msgid "I don't want to enable this feature for now" -msgstr "Jeg vil ikke slå på denne funksjonen ennå" +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:1140 msgid "" @@ -3297,7 +3314,7 @@ msgstr "Du har blitt invitert til å bli med i %s" msgid "Incoming file transfer from %s" msgstr "Innkommende filoverføring fra %s" -#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367 +#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:369 msgid "Password required" msgstr "Passord kreves" @@ -3449,39 +3466,39 @@ msgstr "Protokoll" msgid "Source" msgstr "Kilde" -#: ../src/empathy-main-window.c:384 +#: ../src/empathy-main-window.c:386 msgid "Provide Password" msgstr "Oppgi passord" -#: ../src/empathy-main-window.c:390 +#: ../src/empathy-main-window.c:392 msgid "Disconnect" msgstr "Koble fra" -#: ../src/empathy-main-window.c:530 +#: ../src/empathy-main-window.c:532 msgid "No match found" msgstr "Ingen treff funnet" -#: ../src/empathy-main-window.c:685 +#: ../src/empathy-main-window.c:687 msgid "Reconnect" msgstr "Koble til på nytt" -#: ../src/empathy-main-window.c:691 +#: ../src/empathy-main-window.c:693 msgid "Edit Account" msgstr "Rediger konto" -#: ../src/empathy-main-window.c:697 +#: ../src/empathy-main-window.c:699 msgid "Close" msgstr "Lukk" -#: ../src/empathy-main-window.c:1414 +#: ../src/empathy-main-window.c:1419 msgid "Contact" msgstr "Kontakt" -#: ../src/empathy-main-window.c:1748 +#: ../src/empathy-main-window.c:1753 msgid "Contact List" msgstr "Kontaktliste" -#: ../src/empathy-main-window.c:1863 +#: ../src/empathy-main-window.c:1868 msgid "Show and edit accounts" msgstr "Vis og rediger kontoer" @@ -3829,55 +3846,55 @@ msgstr "Lagre" msgid "Debug Window" msgstr "Feilsøkingsvindu" -#: ../src/empathy-debug-window.c:1474 +#: ../src/empathy-debug-window.c:1476 msgid "Pause" msgstr "Pause" -#: ../src/empathy-debug-window.c:1486 +#: ../src/empathy-debug-window.c:1488 msgid "Level " msgstr "Nivå " -#: ../src/empathy-debug-window.c:1506 +#: ../src/empathy-debug-window.c:1508 msgid "Debug" msgstr "Feilsøk" -#: ../src/empathy-debug-window.c:1512 +#: ../src/empathy-debug-window.c:1514 msgid "Info" msgstr "Info" -#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567 +#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569 msgid "Message" msgstr "Melding" -#: ../src/empathy-debug-window.c:1524 +#: ../src/empathy-debug-window.c:1526 msgid "Warning" msgstr "Advarsel" -#: ../src/empathy-debug-window.c:1530 +#: ../src/empathy-debug-window.c:1532 msgid "Critical" msgstr "Kritisk" -#: ../src/empathy-debug-window.c:1536 +#: ../src/empathy-debug-window.c:1538 msgid "Error" msgstr "Feil" -#: ../src/empathy-debug-window.c:1555 +#: ../src/empathy-debug-window.c:1557 msgid "Time" msgstr "Tid" -#: ../src/empathy-debug-window.c:1558 +#: ../src/empathy-debug-window.c:1560 msgid "Domain" msgstr "Domene" -#: ../src/empathy-debug-window.c:1560 +#: ../src/empathy-debug-window.c:1562 msgid "Category" msgstr "Kategori" -#: ../src/empathy-debug-window.c:1562 +#: ../src/empathy-debug-window.c:1564 msgid "Level" msgstr "Nivå" -#: ../src/empathy-debug-window.c:1599 +#: ../src/empathy-debug-window.c:1601 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: empathy.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." "cgi?product=empathy&component=general\n" -"POT-Creation-Date: 2011-03-03 13:42+0000\n" -"PO-Revision-Date: 2011-03-05 07:02+0530\n" +"POT-Creation-Date: 2011-03-07 23:43+0000\n" +"PO-Revision-Date: 2011-03-08 08:42+0530\n" "Last-Translator: A S Alam <aalam@users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n" "MIME-Version: 1.0\n" @@ -752,7 +752,7 @@ msgstr "ਲਾਗਇਨ(_o)" #. Account and Identifier #: ../libempathy-gtk/empathy-account-widget.c:1990 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:463 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:515 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 #: ../libempathy-gtk/empathy-individual-widget.c:1479 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 @@ -1631,20 +1631,19 @@ msgid "_Invite to Chat Room" msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸੱਦਾ(_I)" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:456 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:508 msgid "Search contacts" msgstr "ਸੰਪਰਕ ਖੋਜ" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:486 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:538 msgid "Search: " msgstr "ਖੋਜ: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:537 -#| msgid "_Add Contact…" +#: ../libempathy-gtk/empathy-contact-search-dialog.c:596 msgid "_Add Contact" msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:555 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:614 msgid "No contacts found" msgstr "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਲੱਭਿਆ" @@ -1893,7 +1892,7 @@ msgid "Select" msgstr "ਚੁਣੋ" #: ../libempathy-gtk/empathy-groups-widget.c:408 -#: ../src/empathy-main-window.c:1432 +#: ../src/empathy-main-window.c:1437 msgid "Group" msgstr "ਗਰੁੱਪ" @@ -2309,7 +2308,20 @@ msgstr "URI ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ" msgid "Select a file" msgstr "ਫਾਇਲ ਚੁਣੋ" -#: ../libempathy-gtk/empathy-ui-utils.c:1871 +#: ../libempathy-gtk/empathy-ui-utils.c:1874 +msgid "Insufficient free space to save file" +msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਲੋੜੀਦੀ ਥਾਂ ਨਹੀਂ ਹੈ" + +#: ../libempathy-gtk/empathy-ui-utils.c:1882 +#, 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:1926 #, c-format msgid "Incoming file from %s" msgstr "%s ਵਲੋਂ ਫਾਇਲ ਆ ਰਹੀ ਹੈ" @@ -2700,8 +2712,9 @@ msgid "Edit->Accounts" msgstr "ਸੋਧ->ਅਕਾਊਂਟ" #: ../src/empathy-account-assistant.c:1104 -msgid "I don't want to enable this feature for now" -msgstr "ਮੈਂ ਇਹ ਫੀਚਰ ਹੁਣੇ ਚਾਲੂ ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦਾ" +#| msgid "I don't want to enable this feature for now" +msgid "I do _not want to enable this feature for now" +msgstr "ਮੈਂ ਇਹ ਫੀਚਰ ਹਾਲੇ ਚਾਲੂ ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦਾ(_n)" #: ../src/empathy-account-assistant.c:1140 msgid "" @@ -3309,13 +3322,12 @@ msgstr "ਤੁਹਾਨੂੰ %s ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦ msgid "Incoming file transfer from %s" msgstr "%s ਤੋਂ ਆ ਰਿਹਾ ਫਾਇਲ ਸੰਚਾਰ" -#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367 +#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:369 msgid "Password required" msgstr "ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ" #: ../src/empathy-event-manager.c:1069 #, c-format -#| msgid "%s would like permission to see when you are available" msgid "%s would like permission to see when you are online" msgstr "" "%s ਤੁਹਾਨੂੰ ਵੇਖਣ ਦਾ ਅਧਿਕਾਰ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ, ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਆਨਲਾਈਨ ਹੋਵੋ" @@ -3466,39 +3478,39 @@ msgstr "ਪਰੋਟੋਕਾਲ" msgid "Source" msgstr "ਸਰੋਤ" -#: ../src/empathy-main-window.c:384 +#: ../src/empathy-main-window.c:386 msgid "Provide Password" msgstr "ਪਾਸਵਰਡ ਦਿਓ" -#: ../src/empathy-main-window.c:390 +#: ../src/empathy-main-window.c:392 msgid "Disconnect" msgstr "ਡਿਸ-ਕੁਨੈਕਸ਼ਨ" -#: ../src/empathy-main-window.c:530 +#: ../src/empathy-main-window.c:532 msgid "No match found" msgstr "ਕੋਈ ਮੇਲ ਨਹੀਂ ਲੱਭਿਆ" -#: ../src/empathy-main-window.c:685 +#: ../src/empathy-main-window.c:687 msgid "Reconnect" msgstr "ਮੁੜ-ਕੁਨੈਕਟ" -#: ../src/empathy-main-window.c:691 +#: ../src/empathy-main-window.c:693 msgid "Edit Account" msgstr "ਅਕਾਊਂਟ ਸੋਧ" -#: ../src/empathy-main-window.c:697 +#: ../src/empathy-main-window.c:699 msgid "Close" msgstr "ਬੰਦ ਕਰੋ" -#: ../src/empathy-main-window.c:1414 +#: ../src/empathy-main-window.c:1419 msgid "Contact" msgstr "ਸੰਪਰਕ" -#: ../src/empathy-main-window.c:1748 +#: ../src/empathy-main-window.c:1753 msgid "Contact List" msgstr "ਸੰਪਰਕ ਲਿਸਟ" -#: ../src/empathy-main-window.c:1863 +#: ../src/empathy-main-window.c:1868 msgid "Show and edit accounts" msgstr "ਅਕਾਊਂਟ ਵੇਖੋ ਅਤੇ ਸੋਧੋ" @@ -3846,55 +3858,55 @@ msgstr "ਸੰਭਾਲੋ" msgid "Debug Window" msgstr "ਡੀਬੱਗ ਵਿੰਡੋ" -#: ../src/empathy-debug-window.c:1474 +#: ../src/empathy-debug-window.c:1476 msgid "Pause" msgstr "ਵਿਰਾਮ" -#: ../src/empathy-debug-window.c:1486 +#: ../src/empathy-debug-window.c:1488 msgid "Level " msgstr "ਲੈਵਲ " -#: ../src/empathy-debug-window.c:1506 +#: ../src/empathy-debug-window.c:1508 msgid "Debug" msgstr "ਡੀਬੱਗ" -#: ../src/empathy-debug-window.c:1512 +#: ../src/empathy-debug-window.c:1514 msgid "Info" msgstr "ਜਾਣਕਾਰੀ" -#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567 +#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569 msgid "Message" msgstr "ਸੁਨੇਹਾ" -#: ../src/empathy-debug-window.c:1524 +#: ../src/empathy-debug-window.c:1526 msgid "Warning" msgstr "ਚੇਤਾਵਨੀ" -#: ../src/empathy-debug-window.c:1530 +#: ../src/empathy-debug-window.c:1532 msgid "Critical" msgstr "ਨਾਜ਼ੁਕ" -#: ../src/empathy-debug-window.c:1536 +#: ../src/empathy-debug-window.c:1538 msgid "Error" msgstr "ਗਲਤੀ" -#: ../src/empathy-debug-window.c:1555 +#: ../src/empathy-debug-window.c:1557 msgid "Time" msgstr "ਸਮਾਂ" -#: ../src/empathy-debug-window.c:1558 +#: ../src/empathy-debug-window.c:1560 msgid "Domain" msgstr "ਡੋਮੇਨ" -#: ../src/empathy-debug-window.c:1560 +#: ../src/empathy-debug-window.c:1562 msgid "Category" msgstr "ਕੈਟਾਗਰੀ" -#: ../src/empathy-debug-window.c:1562 +#: ../src/empathy-debug-window.c:1564 msgid "Level" msgstr "ਲੈਵਲ" -#: ../src/empathy-debug-window.c:1599 +#: ../src/empathy-debug-window.c:1601 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -1,17 +1,18 @@ # empathy's Portuguese translation # Copyright © 2003, 2004 gossip -# Copyright © 2008, 2009, 2010 empathy +# Copyright © 2008, 2009, 2010, 2011 empathy # This file is distributed under the same license as the empathy package. -# Duarte Loreto <happyguy_pt@hotmail.com>, 2003, 2004, 2008, 2009, 2010. +# Duarte Loreto <happyguy_pt@hotmail.com>, 2003, 2004, 2008, 2009, 2010, 2011. # msgid "" msgstr "" -"Project-Id-Version: 2.32\n" +"Project-Id-Version: 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-22 00:58+0100\n" -"PO-Revision-Date: 2010-09-22 01:00+0000\n" +"POT-Creation-Date: 2011-03-07 23:30+0000\n" +"PO-Revision-Date: 2011-03-07 23:40+0000\n" "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n" "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -115,229 +116,220 @@ msgid "Empathy default download folder" msgstr "Pasta de downloads por omissão do Empathy" #: ../data/org.gnome.Empathy.gschema.xml.in.h:18 -msgid "Empathy has asked about importing accounts" -msgstr "O Empathy questionou sobre importar contas" - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy has migrated butterfly logs" msgstr "O Empathy migrou os registos butterfly" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy should auto-away when idle" msgstr "Empathy deverá colocar automaticamente como ausente quando inactivo" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Empathy should auto-connect on startup" msgstr "Empathy deverá ligar-se automaticamente ao iniciar" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy should reduce the location's accuracy" msgstr "Empathy deverá reduzir a precisão da localização" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "" "Empathy deverá utilizar o avatar do contacto como ícone da janela de diálogo" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Enable WebKit Developer Tools" msgstr "Activar as Ferramentas de Desenvolvimento WebKit" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Enable popup notifications for new messages" msgstr "Activar notificações de popup de novas mensagens" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Enable spell checker" msgstr "Activar a verificação ortográfica" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Hide main window" msgstr "Esconder a janela principal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Hide the main window." msgstr "Esconder a janela principal." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Nick completed character" msgstr "Caracter após alcunha completada" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Open new chats in separate windows" msgstr "Abrir novos diálogos em janelas distintas" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Path of the Adium theme to use" msgstr "Caminho do tema Adium a utilizar" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "" "Caminho do tema Adium a utilizar se o tema utilizado para a conversa for " "Adium." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Play a sound for incoming messages" msgstr "Reproduzir um som ao receber mensagens" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Play a sound for new conversations" msgstr "Reproduzir um som ao ser iniciado um novo diálogo" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Play a sound for outgoing messages" msgstr "Reproduzir um som ao enviar mensagens" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Play a sound when a contact logs in" msgstr "Reproduzir um som quando um contacto inicia uma sessão" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Play a sound when a contact logs out" msgstr "Reproduzir um som quando um contacto termina a sessão" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Play a sound when we log in" msgstr "Reproduzir um som iniciar uma sessão" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound when we log out" msgstr "Reproduzir um som ao terminar a sessão" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Pop up notifications if the chat isn't focused" msgstr "Notificações em popup se o diálogo não tiver o foco" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Pop up notifications when a contact logs in" msgstr "Notificações em popup quando um contacto inicia uma sessão" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Pop up notifications when a contact logs out" msgstr "Notificações em popup quando um contacto termina a sessão" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Show avatars" msgstr "Apresentar os avatares" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Show contact list in rooms" msgstr "Apresentar a lista de contactos nas salas" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Show hint about closing the main window" msgstr "Apresentar dica sobre fechar a janela principal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Show offline contacts" msgstr "Apresentar os contactos desligados" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Show protocols" msgstr "Apresentar os protocolos" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Spell checking languages" msgstr "Idiomas de verificação ortográfica" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "The default folder to save file transfers in." msgstr "A pasta onde por omissão gravar ficheiros transferidos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "The last directory that an avatar image was chosen from." msgstr "O último directório de onde foi seleccionada uma imagem de avatar." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "The position for the chat window side pane" msgstr "A posição do painel lateral da janela de diálogo" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "The stored position (in pixels) of the chat window side pane." msgstr "" "A posição armazenada (em pixels) do painel lateral da janela de diálogo." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "The theme that is used to display the conversation in chat windows." msgstr "O tema utilizado para apresentar o diálogo em janelas de diálogo." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Use graphical smileys" msgstr "Utilizar risonhos gráficos" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Use notification sounds" msgstr "Utilizar sons de notificação" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Use theme for chat rooms" msgstr "Utilizar tema para salas de diálogo" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "" "Se o Empathy pode ou não publicar a localização do utilizador aos seus " "contactos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Se o Empathy pode ou não utilizar o GPS para calcular a localização." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "" "Se o Empathy pode ou não utilizar a rede de telemóveis para calcular a " "localização." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "Whether Empathy can use the network to guess the location." msgstr "Se o Empathy pode ou não utilizar a rede para calcular a localização." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 -msgid "Whether Empathy has asked about importing accounts from other programs." -msgstr "" -"Se o Empathy perguntou ou não sobre importar contas de outras aplicações." - -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "Whether Empathy has migrated butterfly logs." msgstr "Se o Empathy migrou ou não os registos butterfly." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "" "Se o Empathy deverá ou não iniciar automaticamente a sessão com as suas " "contas ao iniciar." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "" "Whether Empathy should go into away mode automatically if the user is idle." msgstr "" "Se o Empathy deverá ou não ficar em estado ausente automaticamente quando o " "utilizador está inactivo." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" "Se o Empathy deverá ou não reduzir a precisão da localização por motivos de " "privacidade." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" "Se o Empathy deverá ou não utilizar os avatares dos contactos como ícones " "das janelas de diálogo." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" "Se as ferramentas de desenvolvimento WebKit, tais como o Inspector Web, " "deverão estar activas." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." @@ -345,72 +337,72 @@ msgstr "" "Se deverão ou não ser utilizado gestores de ligações para desligar/religar " "automaticamente." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "" "Whether to check words typed against the languages you want to check with." msgstr "" "Se verificar ou não as palavras introduzidas contra os idiomas para os quais " "deseja verificar." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether to convert smileys into graphical images in conversations." msgstr "Se converter ou não risonhos em imagens gráficas nos diálogos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "" "Se reproduzir ou não um som para notificar que contactos iniciaram uma " "sessão na rede." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "" "Se reproduzir ou não um som para notificar que contactos terminaram a sessão " "na rede." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "Whether to play a sound to notify of events." msgstr "Se reproduzir ou não um som para notificar a ocorrência de eventos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "Whether to play a sound to notify of incoming messages." msgstr "Se reproduzir ou não um som para notificar da recepção de mensagens." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "Whether to play a sound to notify of new conversations." msgstr "" "Se reproduzir ou não um som para notificar do início de novos diálogos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "Whether to play a sound to notify of outgoing messages." msgstr "Se reproduzir ou não um som para notificar de mensagens enviadas." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "Whether to play a sound when logging into a network." msgstr "Se reproduzir ou não um som ao iniciar uma sessão na rede." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Whether to play a sound when logging out of a network." msgstr "Se reproduzir ou não um som ao terminar a sessão numa rede." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to play sound notifications when away or busy." msgstr "Se reproduzir ou não sons de notificação quando ausente ou ocupado." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to show a popup notification when a contact goes offline." msgstr "" "Se apresentar ou não popups de notificação quando um contacto termina a sua " "sessão." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "Whether to show a popup notification when a contact goes online." msgstr "" "Se apresentar ou não popups de notificação quando um contacto inicia uma " "sessão." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." @@ -418,40 +410,40 @@ msgstr "" "Se apresentar ou não um popup de notificação ao receber uma nova mensagem " "mesmo que o diálogo já esteja aberto mas não detenha o foco." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to show a popup notification when receiving a new message." msgstr "" "Se apresentar ou não um popup de notificação ao receber uma nova mensagem." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "" "Se apresentar ou não os avatares dos contactos na lista de contactos e " "janelas de diálogo." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to show contacts that are offline in the contact list." msgstr "Se apresentar ou não na lista de contactos os que estejam desligados." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Whether to show popup notifications when away or busy." msgstr "Se apresentar ou não popups de notificação quando ausente ou ocupado." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to show protocols for contacts in the contact list." msgstr "" "Se apresentar ou não os protocolos dos contactos na lista de contactos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to show the contact list in chat rooms." msgstr "Se apresentar ou não a lista de contactos nas salas de diálogo." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to show the contact list in compact mode." msgstr "Se apresentar a lista de contactos em modo compacto ou não." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." @@ -459,11 +451,11 @@ msgstr "" "Se apresentar ou não o diálogo de mensagem sobre fechar a janela principal " "no botão 'x' da barra de título." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "Whether to use the theme for chat rooms." msgstr "Se utilizar ou não o tema nas janelas de diálogo." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's name with the value \"name\". A value of \"state\" will sort " @@ -479,192 +471,193 @@ msgstr "Gerir contas de Mensagens Instantâneas e VoIP" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2157 +#: ../src/empathy-accounts-dialog.c:2242 msgid "Messaging and VoIP Accounts" msgstr "Contas de Mensagens Instantâneas e VoIP" -#: ../libempathy/empathy-ft-handler.c:851 -msgid "The hash of the received file and the sent one do not match" -msgstr "" -"O código de verificação do ficheiro recebido não coincide com a do ficheiro " -"enviado" +#: ../libempathy/empathy-ft-handler.c:825 +msgid "File transfer completed, but the file was corrupted" +msgstr "Transferência de ficheiro terminada, mas o ficheiro estava corrompido" -#: ../libempathy/empathy-ft-handler.c:1111 +#: ../libempathy/empathy-ft-handler.c:1116 msgid "File transfer not supported by remote contact" msgstr "Transferência de ficheiros não é suportada pelo contacto remoto" -#: ../libempathy/empathy-ft-handler.c:1169 +#: ../libempathy/empathy-ft-handler.c:1172 msgid "The selected file is not a regular file" msgstr "O ficheiro seleccionado não é um ficheiro normal" -#: ../libempathy/empathy-ft-handler.c:1178 +#: ../libempathy/empathy-ft-handler.c:1181 msgid "The selected file is empty" msgstr "O ficheiro seleccionado está vazio" -#: ../libempathy/empathy-tp-file.c:283 +#: ../libempathy/empathy-tp-file.c:268 msgid "Socket type not supported" msgstr "Tipo de socket não é suportado" -#: ../libempathy/empathy-tp-file.c:402 +#: ../libempathy/empathy-tp-file.c:387 msgid "No reason was specified" msgstr "Não foi especificado nenhum motivo" -#: ../libempathy/empathy-tp-file.c:405 +#: ../libempathy/empathy-tp-file.c:390 msgid "The change in state was requested" msgstr "A alteração de estado foi pedida" -#: ../libempathy/empathy-tp-file.c:408 +#: ../libempathy/empathy-tp-file.c:393 msgid "You canceled the file transfer" msgstr "Cancelou a transferência do ficheiro" -#: ../libempathy/empathy-tp-file.c:411 +#: ../libempathy/empathy-tp-file.c:396 msgid "The other participant canceled the file transfer" msgstr "O outro participante cancelou a transferência do ficheiro" -#: ../libempathy/empathy-tp-file.c:414 +#: ../libempathy/empathy-tp-file.c:399 msgid "Error while trying to transfer the file" msgstr "Erro ao tentar transferir o ficheiro" -#: ../libempathy/empathy-tp-file.c:417 +#: ../libempathy/empathy-tp-file.c:402 msgid "The other participant is unable to transfer the file" msgstr "O outro participante é incapaz de transferir o ficheiro" -#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383 msgid "Unknown reason" msgstr "Motivo desconhecido" -#: ../libempathy/empathy-utils.c:246 +#: ../libempathy/empathy-utils.c:305 msgid "Available" msgstr "Disponível" -#: ../libempathy/empathy-utils.c:248 +#: ../libempathy/empathy-utils.c:307 msgid "Busy" msgstr "Ocupado" -#: ../libempathy/empathy-utils.c:251 +#: ../libempathy/empathy-utils.c:310 msgid "Away" msgstr "Ausente" -#: ../libempathy/empathy-utils.c:253 +#: ../libempathy/empathy-utils.c:312 msgid "Invisible" msgstr "Invisível" -#: ../libempathy/empathy-utils.c:255 +#: ../libempathy/empathy-utils.c:314 msgid "Offline" msgstr "Desligado" -#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893 -#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895 -#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18 +#: ../libempathy/empathy-utils.c:316 +#: ../src/empathy-streamed-media-window.c:1897 +#: ../src/empathy-streamed-media-window.c:1898 +#: ../src/empathy-streamed-media-window.c:1899 +#: ../src/empathy-streamed-media-window.c:1900 +#: ../src/empathy-call-window.ui.h:18 msgid "Unknown" msgstr "Desconhecido" -#: ../libempathy/empathy-utils.c:296 +#: ../libempathy/empathy-utils.c:355 msgid "No reason specified" msgstr "Nenhum motivo especificado" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354 +#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413 msgid "Status is set to offline" msgstr "Estado definido como desligado" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393 msgid "Network error" msgstr "Erro de rede" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395 msgid "Authentication failed" msgstr "Falha na autenticação" -#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397 msgid "Encryption error" msgstr "Erro de encriptação" -#: ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-utils.c:365 msgid "Name in use" msgstr "Nome já utilizado" -#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399 msgid "Certificate not provided" msgstr "Não foi apresentado o certificado" -#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401 msgid "Certificate untrusted" msgstr "Certificado não é credível" -#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403 msgid "Certificate expired" msgstr "Certificado expirou" -#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405 msgid "Certificate not activated" msgstr "Certificado não está activo" -#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407 msgid "Certificate hostname mismatch" msgstr "Falha no nome de servidor do certificado" -#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409 msgid "Certificate fingerprint mismatch" msgstr "Falha na impressão digital do certificado" -#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352 +#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411 msgid "Certificate self-signed" msgstr "Certificado assinado pelo próprio" -#: ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:381 msgid "Certificate error" msgstr "Erro no certificado" -#: ../libempathy/empathy-utils.c:356 +#: ../libempathy/empathy-utils.c:415 msgid "Encryption is not available" msgstr "Encriptação não está disponível" -#: ../libempathy/empathy-utils.c:358 +#: ../libempathy/empathy-utils.c:417 msgid "Certificate is invalid" msgstr "Certificado é inválido" -#: ../libempathy/empathy-utils.c:360 +#: ../libempathy/empathy-utils.c:419 msgid "Connection has been refused" msgstr "A ligação foi recusada" -#: ../libempathy/empathy-utils.c:362 +#: ../libempathy/empathy-utils.c:421 msgid "Connection can't be established" msgstr "Incapaz de estabelecer a ligação" -#: ../libempathy/empathy-utils.c:364 +#: ../libempathy/empathy-utils.c:423 msgid "Connection has been lost" msgstr "A ligação perdeu-se" -#: ../libempathy/empathy-utils.c:366 +#: ../libempathy/empathy-utils.c:425 msgid "This resource is already connected to the server" msgstr "Este recurso já se encontra ligado ao servidor" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:427 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "" "A ligação foi substituída por uma nova ligação utilizando o mesmo recurso" -#: ../libempathy/empathy-utils.c:371 +#: ../libempathy/empathy-utils.c:430 msgid "The account already exists on the server" msgstr "A conta já existe no servidor" -#: ../libempathy/empathy-utils.c:373 +#: ../libempathy/empathy-utils.c:432 msgid "Server is currently too busy to handle the connection" msgstr "O servidor está demasiado ocupado para aceitar a ligação" -#: ../libempathy/empathy-utils.c:375 +#: ../libempathy/empathy-utils.c:434 msgid "Certificate has been revoked" msgstr "O certificado foi revogado" -#: ../libempathy/empathy-utils.c:377 +#: ../libempathy/empathy-utils.c:436 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "O certificado utiliza um algoritmo de cifra inseguro ou é criptograficamente " "fraco" -#: ../libempathy/empathy-utils.c:380 +#: ../libempathy/empathy-utils.c:439 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -675,16 +668,20 @@ msgstr "" # 48x48/emblems/emblem-people.icon.in.h:1 # 48x48/emblems/emblem-people.icon.in.h:1 -#: ../libempathy/empathy-utils.c:544 +#: ../libempathy/empathy-utils.c:602 #: ../libempathy-gtk/empathy-contact-list-store.h:73 msgid "People Nearby" -msgstr "Pessoas por Perto" +msgstr "Pessoas Próximas" -#: ../libempathy/empathy-utils.c:549 +#: ../libempathy/empathy-utils.c:607 msgid "Yahoo! Japan" msgstr "Yahoo! Japão" -#: ../libempathy/empathy-utils.c:550 +#: ../libempathy/empathy-utils.c:636 +msgid "Google Talk" +msgstr "Google Talk" + +#: ../libempathy/empathy-utils.c:637 msgid "Facebook Chat" msgstr "Diálogo Facebook" @@ -734,71 +731,86 @@ msgstr[1] "%d meses atrás" msgid "in the future" msgstr "no futuro" -#: ../libempathy-gtk/empathy-account-chooser.c:463 +#: ../libempathy-gtk/empathy-account-chooser.c:501 msgid "All" msgstr "Todos" -#: ../libempathy-gtk/empathy-account-widget.c:514 -#: ../libempathy-gtk/empathy-log-window.c:646 -#: ../src/empathy-import-widget.c:312 +#: ../libempathy-gtk/empathy-account-widget.c:679 +#: ../libempathy-gtk/empathy-log-window.c:647 +#: ../src/empathy-import-widget.c:321 msgid "Account" msgstr "Conta" -#: ../libempathy-gtk/empathy-account-widget.c:515 +#: ../libempathy-gtk/empathy-account-widget.c:680 msgid "Password" msgstr "Senha" -#: ../libempathy-gtk/empathy-account-widget.c:516 +#: ../libempathy-gtk/empathy-account-widget.c:681 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Servidor" -#: ../libempathy-gtk/empathy-account-widget.c:517 +#: ../libempathy-gtk/empathy-account-widget.c:682 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Porto" -#: ../libempathy-gtk/empathy-account-widget.c:589 -#: ../libempathy-gtk/empathy-account-widget.c:646 +#: ../libempathy-gtk/empathy-account-widget.c:754 +#: ../libempathy-gtk/empathy-account-widget.c:811 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1192 +#: ../libempathy-gtk/empathy-account-widget.c:1163 +#, c-format +msgid "The account %s is edited via My Web Accounts." +msgstr "A conta %s é editada através do Minhas Contas Web." + +#: ../libempathy-gtk/empathy-account-widget.c:1169 +#, c-format +msgid "The account %s cannot be edited in Empathy." +msgstr "A conta %s não pode ser editada no Empathy." + +#: ../libempathy-gtk/empathy-account-widget.c:1189 +msgid "Launch My Web Accounts" +msgstr "Iniciar o Minhas Contas Web" + +#: ../libempathy-gtk/empathy-account-widget.c:1527 msgid "Username:" msgstr "Utilizador:" -#: ../libempathy-gtk/empathy-account-widget.c:1521 +#: ../libempathy-gtk/empathy-account-widget.c:1894 msgid "A_pply" msgstr "A_plicar" -#: ../libempathy-gtk/empathy-account-widget.c:1551 +#: ../libempathy-gtk/empathy-account-widget.c:1924 msgid "L_og in" msgstr "_Iniciar sessão" #. Account and Identifier -#: ../libempathy-gtk/empathy-account-widget.c:1617 +#: ../libempathy-gtk/empathy-account-widget.c:1990 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:515 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-individual-widget.c:1401 +#: ../libempathy-gtk/empathy-individual-widget.c:1479 #: ../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 "Conta:" -#: ../libempathy-gtk/empathy-account-widget.c:1628 +#: ../libempathy-gtk/empathy-account-widget.c:2001 msgid "_Enabled" msgstr "_Activo" -#: ../libempathy-gtk/empathy-account-widget.c:1693 +#: ../libempathy-gtk/empathy-account-widget.c:2066 msgid "This account already exists on the server" msgstr "Esta conta já existe no servidor" -#: ../libempathy-gtk/empathy-account-widget.c:1696 +#: ../libempathy-gtk/empathy-account-widget.c:2069 msgid "Create a new account on the server" msgstr "Criar uma nova conta no servidor" -#: ../libempathy-gtk/empathy-account-widget.c:1789 +#: ../libempathy-gtk/empathy-account-widget.c:2261 msgid "Ca_ncel" msgstr "Ca_ncelar" @@ -807,19 +819,19 @@ msgstr "Ca_ncelar" #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2077 +#: ../libempathy-gtk/empathy-account-widget.c:2558 #, c-format msgid "%1$s on %2$s" msgstr "%1$s em %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:2103 +#: ../libempathy-gtk/empathy-account-widget.c:2584 #, c-format msgid "%s Account" msgstr "Conta %s" -#: ../libempathy-gtk/empathy-account-widget.c:2107 +#: ../libempathy-gtk/empathy-account-widget.c:2588 msgid "New account" msgstr "Nova conta" @@ -850,32 +862,52 @@ msgid "Pass_word:" msgstr "Sen_ha:" #: ../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:15 +msgid "Remember Password" +msgstr "Recordar Senha" + +#. 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:16 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +#: ../libempathy-gtk/empathy-password-dialog.c:311 +msgid "Remember password" +msgstr "Recordar senha" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 msgid "Screen _Name:" msgstr "_Nome de Avatar:" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 msgid "What is your AIM password?" msgstr "Qual é a sua senha AIM?" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 msgid "What is your AIM screen name?" msgstr "Qual é o seu nome visível AIM?" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +#: ../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:" -#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 +#: ../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 "_Servidor:" @@ -891,11 +923,11 @@ msgstr "<b>Exemplo:</b> utilizador" msgid "Login I_D:" msgstr "I_D de Sessão:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 msgid "What is your GroupWise User ID?" msgstr "Qual é o seu ID de Utilizador GroupWise?" -#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 msgid "What is your GroupWise password?" msgstr "Qual é a sua senha GroupWise?" @@ -912,11 +944,11 @@ msgstr "Conjunto de c_aracteres:" msgid "ICQ _UIN:" msgstr "_UIN ICQ:" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 msgid "What is your ICQ UIN?" msgstr "Qual é o seu UIN do ICQ?" -#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 msgid "What is your ICQ password?" msgstr "Qual é a sua senha do ICQ?" @@ -1017,12 +1049,12 @@ msgstr "Ignorar as definições de servidor" msgid "Priori_ty:" msgstr "Pri_oridade:" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 msgid "Reso_urce:" msgstr "Rec_urso:" #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 +#: ../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/<b>badger</b>, enter <b>badger</b>.\n" @@ -1034,39 +1066,39 @@ msgstr "" "Utilize <a href=\"http://www.facebook.com/username/\">esta página</a> para " "seleccionar um nome de utilizador Facebook, caso não tenha um." -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 msgid "Use old SS_L" msgstr "Utilizar SS_L antigo" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 msgid "What is your Facebook password?" msgstr "Qual é a sua senha do Facebook?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 msgid "What is your Facebook username?" msgstr "Qual é o seu utilizador no Facebook?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 msgid "What is your Google ID?" msgstr "Qual é o seu ID Google?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 msgid "What is your Google password?" msgstr "Qual é a sua senha Google?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 msgid "What is your Jabber ID?" msgstr "Qual é o seu ID Jabber?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 msgid "What is your Jabber password?" msgstr "Qual é a sua senha Jabber?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 msgid "What is your desired Jabber ID?" msgstr "Qual é o seu ID Jabber desejado?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 msgid "What is your desired Jabber password?" msgstr "Qual é a sua senha Jabber desejada?" @@ -1074,11 +1106,11 @@ msgstr "Qual é a sua senha Jabber desejada?" msgid "<b>Example:</b> user@hotmail.com" msgstr "<b>Exemplo:</b> utilizador@hotmail.com" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 msgid "What is your Windows Live ID?" msgstr "Qual é o seu ID do Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 msgid "What is your Windows Live password?" msgstr "Qual é a sua senha Windows Live?" @@ -1154,27 +1186,27 @@ msgstr "Porto:" msgid "Proxy Options" msgstr "Opções de Proxy" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 msgid "STUN Server:" msgstr "Servidor STUN:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 msgid "Server:" msgstr "Servidor:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 msgid "Transport:" msgstr "Transporte:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 msgid "What is your SIP account password?" msgstr "Qual é a senha da sua conta SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 msgid "What is your SIP login ID?" msgstr "Qual é o seu ID SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 msgid "_Username:" msgstr "_Utilizador:" @@ -1182,96 +1214,104 @@ msgstr "_Utilizador:" msgid "I_gnore conference and chat room invitations" msgstr "I_gnorar convites para conferências e salas de diálogo" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "What is your Yahoo! ID?" msgstr "Qual é o seu ID Yahoo!?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 msgid "What is your Yahoo! password?" msgstr "Qual é a sua senha Yahoo!?" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 msgid "Yahoo! I_D:" msgstr "I_D Yahoo!:" -#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "_Room List locale:" msgstr "Configuração regional da Lista de _Salas:" -#: ../libempathy-gtk/empathy-avatar-chooser.c:443 -#: ../libempathy-gtk/empathy-avatar-chooser.c:519 +#: ../libempathy-gtk/empathy-avatar-chooser.c:448 +#: ../libempathy-gtk/empathy-avatar-chooser.c:524 msgid "Couldn't convert image" msgstr "Incapaz de converter a imagem" -#: ../libempathy-gtk/empathy-avatar-chooser.c:444 +#: ../libempathy-gtk/empathy-avatar-chooser.c:449 msgid "None of the accepted image formats are supported on your system" msgstr "Nenhum dos formatos de imagem aceites é suportado pelo seu sistema" -#: ../libempathy-gtk/empathy-avatar-chooser.c:935 +#: ../libempathy-gtk/empathy-avatar-chooser.c:936 msgid "Select Your Avatar Image" msgstr "Seleccione a Imagem do seu Avatar" -#: ../libempathy-gtk/empathy-avatar-chooser.c:938 +#: ../libempathy-gtk/empathy-avatar-chooser.c:939 msgid "No Image" msgstr "Nenhuma Imagem" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1000 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1001 msgid "Images" msgstr "Imagens" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1004 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1005 msgid "All Files" msgstr "Todos os Ficheiros" -#: ../libempathy-gtk/empathy-avatar-image.c:323 +#: ../libempathy-gtk/empathy-avatar-image.c:322 msgid "Click to enlarge" msgstr "Clique para aumentar" -#: ../libempathy-gtk/empathy-chat.c:642 +#: ../libempathy-gtk/empathy-chat.c:655 msgid "Failed to open private chat" msgstr "Falha ao abrir um diálogo privado" -#: ../libempathy-gtk/empathy-chat.c:682 +#: ../libempathy-gtk/empathy-chat.c:720 msgid "Topic not supported on this conversation" msgstr "Tópico não é suportado neste diálogo" -#: ../libempathy-gtk/empathy-chat.c:688 +#: ../libempathy-gtk/empathy-chat.c:726 msgid "You are not allowed to change the topic" msgstr "Não lhe é permitido alterar o tópico" -#: ../libempathy-gtk/empathy-chat.c:822 +#: ../libempathy-gtk/empathy-chat.c:909 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: limpa todas as mensagens do diálogo actual" -#: ../libempathy-gtk/empathy-chat.c:825 +#: ../libempathy-gtk/empathy-chat.c:912 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <tópico>: define o tópico do diálogo actual" -#: ../libempathy-gtk/empathy-chat.c:828 +#: ../libempathy-gtk/empathy-chat.c:915 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <ID sala diálogo>: entrar numa nova sala de diálogo" -#: ../libempathy-gtk/empathy-chat.c:831 +#: ../libempathy-gtk/empathy-chat.c:918 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <ID sala diálogo>: entrar numa nova sala de diálogo" -#: ../libempathy-gtk/empathy-chat.c:836 +#: ../libempathy-gtk/empathy-chat.c:923 +msgid "" +"/part [<chat room ID>] [<reason>]: leave the chat room, by default the " +"current one" +msgstr "" +"/part [<ID sala diálogo>] [<motivo>]: abandonar a sala de diálogo, por " +"omissão a actual" + +#: ../libempathy-gtk/empathy-chat.c:928 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <ID contacto> [<mensagem>]: abre uma janela de diálogo privada" -#: ../libempathy-gtk/empathy-chat.c:839 +#: ../libempathy-gtk/empathy-chat.c:931 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <ID contacto> <mensagem>: abre uma janela de diálogo privada" -#: ../libempathy-gtk/empathy-chat.c:843 +#: ../libempathy-gtk/empathy-chat.c:934 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <alcunha>: alterar a sua alcunha no servidor actual" -#: ../libempathy-gtk/empathy-chat.c:846 +#: ../libempathy-gtk/empathy-chat.c:937 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <mensagem>: envia uma mensagem ACTION para o diálogo actual" -#: ../libempathy-gtk/empathy-chat.c:849 +#: ../libempathy-gtk/empathy-chat.c:940 msgid "" "/say <message>: send <message> to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1281,7 +1321,7 @@ msgstr "" "enviar uma mensagem começada por '/'. Por exemplo: \"/say /join é utilizado " "para entrar numa nova sala de diálogo\"" -#: ../libempathy-gtk/empathy-chat.c:854 +#: ../libempathy-gtk/empathy-chat.c:945 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1289,85 +1329,99 @@ msgstr "" "/help [<comando>]: apresenta todos os comandos suportados. Se <comando> " "estiver definido, apresenta a sua forma de utilização." -#: ../libempathy-gtk/empathy-chat.c:864 +#: ../libempathy-gtk/empathy-chat.c:955 #, c-format msgid "Usage: %s" msgstr "Utilização: %s" -#: ../libempathy-gtk/empathy-chat.c:893 +#: ../libempathy-gtk/empathy-chat.c:997 msgid "Unknown command" msgstr "Comando desconhecido" -#: ../libempathy-gtk/empathy-chat.c:1014 +#: ../libempathy-gtk/empathy-chat.c:1123 msgid "Unknown command; see /help for the available commands" msgstr "" "Comando desconhecido; consulte /help para obter os comandos disponíveis" -#: ../libempathy-gtk/empathy-chat.c:1152 +#: ../libempathy-gtk/empathy-chat.c:1263 msgid "offline" msgstr "desligado" -#: ../libempathy-gtk/empathy-chat.c:1155 +#: ../libempathy-gtk/empathy-chat.c:1266 msgid "invalid contact" msgstr "contacto inválido" -#: ../libempathy-gtk/empathy-chat.c:1158 +#: ../libempathy-gtk/empathy-chat.c:1269 msgid "permission denied" msgstr "permissão negada" -#: ../libempathy-gtk/empathy-chat.c:1161 +#: ../libempathy-gtk/empathy-chat.c:1272 msgid "too long message" msgstr "mensagem demasiado extensa" -#: ../libempathy-gtk/empathy-chat.c:1164 +#: ../libempathy-gtk/empathy-chat.c:1275 msgid "not implemented" msgstr "não implementado" -#: ../libempathy-gtk/empathy-chat.c:1168 +#: ../libempathy-gtk/empathy-chat.c:1279 msgid "unknown" msgstr "desconhecido" -#: ../libempathy-gtk/empathy-chat.c:1172 +#: ../libempathy-gtk/empathy-chat.c:1283 #, c-format msgid "Error sending message '%s': %s" msgstr "Erro ao enviar a mensagem '%s': %s" -#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691 +#: ../libempathy-gtk/empathy-chat.c:1344 ../src/empathy-chat-window.c:704 msgid "Topic:" msgstr "Tópico:" -#: ../libempathy-gtk/empathy-chat.c:1294 +#: ../libempathy-gtk/empathy-chat.c:1356 #, c-format msgid "Topic set to: %s" msgstr "Tópico definido como: %s" -#: ../libempathy-gtk/empathy-chat.c:1296 +#: ../libempathy-gtk/empathy-chat.c:1358 msgid "No topic defined" msgstr "Nenhum tópico definido" -#: ../libempathy-gtk/empathy-chat.c:1775 +#: ../libempathy-gtk/empathy-chat.c:1857 msgid "(No Suggestions)" msgstr "(Nenhuma Sugestão)" -#: ../libempathy-gtk/empathy-chat.c:1829 +#. translators: %s is the selected word +#: ../libempathy-gtk/empathy-chat.c:1925 +#, c-format +msgid "Add '%s' to Dictionary" +msgstr "Adicionar '%s' ao Dicionário" + +#. translators: first %s is the selected word, +#. * second %s is the language name of the target dictionary +#: ../libempathy-gtk/empathy-chat.c:1962 +#, c-format +msgid "Add '%s' to %s Dictionary" +msgstr "Adicionar '%s' ao Dicionário %s" + +#: ../libempathy-gtk/empathy-chat.c:2021 msgid "Insert Smiley" msgstr "Inserir Risonho" #. send button -#: ../libempathy-gtk/empathy-chat.c:1847 -#: ../libempathy-gtk/empathy-ui-utils.c:1801 +#: ../libempathy-gtk/empathy-chat.c:2039 +#: ../libempathy-gtk/empathy-ui-utils.c:1810 msgid "_Send" msgstr "_Enviar" -#: ../libempathy-gtk/empathy-chat.c:1881 +#. Spelling suggestions +#: ../libempathy-gtk/empathy-chat.c:2074 msgid "_Spelling Suggestions" msgstr "_Sugestões de Ortografia" -#: ../libempathy-gtk/empathy-chat.c:1958 +#: ../libempathy-gtk/empathy-chat.c:2163 msgid "Failed to retrieve recent logs" msgstr "Falha ao obter os registos recentes" -#: ../libempathy-gtk/empathy-chat.c:2064 +#: ../libempathy-gtk/empathy-chat.c:2274 #, c-format msgid "%s has disconnected" msgstr "%s terminou a sessão" @@ -1375,12 +1429,12 @@ msgstr "%s terminou a sessão" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2071 +#: ../libempathy-gtk/empathy-chat.c:2281 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s foi expulso por %2$s" -#: ../libempathy-gtk/empathy-chat.c:2074 +#: ../libempathy-gtk/empathy-chat.c:2284 #, c-format msgid "%s was kicked" msgstr "%s foi expulso" @@ -1388,17 +1442,17 @@ msgstr "%s foi expulso" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2082 +#: ../libempathy-gtk/empathy-chat.c:2292 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s foi banifo por %2$s" -#: ../libempathy-gtk/empathy-chat.c:2085 +#: ../libempathy-gtk/empathy-chat.c:2295 #, c-format msgid "%s was banned" msgstr "%s foi banido" -#: ../libempathy-gtk/empathy-chat.c:2089 +#: ../libempathy-gtk/empathy-chat.c:2299 #, c-format msgid "%s has left the room" msgstr "%s abandonou a sala" @@ -1408,79 +1462,95 @@ msgstr "%s abandonou a sala" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2098 +#: ../libempathy-gtk/empathy-chat.c:2308 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2123 +#: ../libempathy-gtk/empathy-chat.c:2333 #, c-format msgid "%s has joined the room" msgstr "%s entrou na sala" -#: ../libempathy-gtk/empathy-chat.c:2148 +#: ../libempathy-gtk/empathy-chat.c:2358 #, c-format msgid "%s is now known as %s" msgstr "%s é agora conhecido como %s" -#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932 +#: ../libempathy-gtk/empathy-chat.c:2497 +#: ../src/empathy-streamed-media-window.c:1942 +#: ../src/empathy-event-manager.c:1122 msgid "Disconnected" msgstr "Desligado" -#: ../libempathy-gtk/empathy-chat.c:2934 -msgid "Wrong password; please try again:" -msgstr "Senha incorrecta; tente novamente:" +#. Add message +#: ../libempathy-gtk/empathy-chat.c:3127 +msgid "Would you like to store this password?" +msgstr "Deseja armazenar esta senha?" + +#: ../libempathy-gtk/empathy-chat.c:3133 +msgid "Remember" +msgstr "Recordar" + +#: ../libempathy-gtk/empathy-chat.c:3143 +msgid "Not now" +msgstr "Agora não" -#: ../libempathy-gtk/empathy-chat.c:2935 +#: ../libempathy-gtk/empathy-chat.c:3187 msgid "Retry" msgstr "Tentar Novamente" -#: ../libempathy-gtk/empathy-chat.c:2940 +#: ../libempathy-gtk/empathy-chat.c:3191 +msgid "Wrong password; please try again:" +msgstr "Senha incorrecta; tente novamente:" + +#. Add message +#: ../libempathy-gtk/empathy-chat.c:3308 msgid "This room is protected by a password:" msgstr "Esta sala está protegida por uma senha:" -#: ../libempathy-gtk/empathy-chat.c:2941 +#: ../libempathy-gtk/empathy-chat.c:3335 msgid "Join" msgstr "Juntar" -#: ../libempathy-gtk/empathy-chat.c:3081 +#: ../libempathy-gtk/empathy-chat.c:3505 ../src/empathy-event-manager.c:1144 msgid "Connected" msgstr "Ligado" -#: ../libempathy-gtk/empathy-chat.c:3134 -#: ../libempathy-gtk/empathy-log-window.c:653 +#: ../libempathy-gtk/empathy-chat.c:3558 +#: ../libempathy-gtk/empathy-log-window.c:654 msgid "Conversation" msgstr "Diálogo" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:324 -#: ../libempathy-gtk/empathy-theme-adium.c:791 +#: ../libempathy-gtk/empathy-chat-text-view.c:320 +#: ../libempathy-gtk/empathy-theme-adium.c:794 msgid "_Copy Link Address" msgstr "_Copiar o Endereço do Link" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:331 -#: ../libempathy-gtk/empathy-theme-adium.c:798 +#: ../libempathy-gtk/empathy-chat-text-view.c:327 +#: ../libempathy-gtk/empathy-theme-adium.c:801 msgid "_Open Link" msgstr "_Abrir Link" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:424 +#: ../libempathy-gtk/empathy-chat-text-view.c:420 msgid "%A %B %d %Y" msgstr "%A %B %d %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:243 -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248 +#: ../libempathy-gtk/empathy-contact-dialogs.c:265 +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 msgid "Edit Contact Information" msgstr "Editar Informação de Contacto" -#: ../libempathy-gtk/empathy-contact-dialogs.c:295 +#: ../libempathy-gtk/empathy-contact-dialogs.c:316 msgid "Personal Information" msgstr "Informação Pessoal" -#: ../libempathy-gtk/empathy-contact-dialogs.c:401 -#: ../libempathy-gtk/empathy-individual-dialogs.c:112 +#: ../libempathy-gtk/empathy-contact-dialogs.c:425 +#: ../libempathy-gtk/empathy-individual-dialogs.c:115 msgid "New Contact" msgstr "Novo Contacto" @@ -1500,280 +1570,297 @@ msgstr "Sem Grupo" msgid "Favorite People" msgstr "Pessoas Favoritas" -#: ../libempathy-gtk/empathy-contact-list-view.c:2004 -#: ../libempathy-gtk/empathy-individual-view.c:2232 +#: ../libempathy-gtk/empathy-contact-list-view.c:2012 +#: ../libempathy-gtk/empathy-individual-view.c:2309 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Deseja mesmo remover o grupo '%s'?" -#: ../libempathy-gtk/empathy-contact-list-view.c:2006 -#: ../libempathy-gtk/empathy-individual-view.c:2235 +#: ../libempathy-gtk/empathy-contact-list-view.c:2014 +#: ../libempathy-gtk/empathy-individual-view.c:2312 msgid "Removing group" msgstr "A remover o grupo" #. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:2055 -#: ../libempathy-gtk/empathy-contact-list-view.c:2132 -#: ../libempathy-gtk/empathy-individual-view.c:2289 -#: ../libempathy-gtk/empathy-individual-view.c:2387 +#: ../libempathy-gtk/empathy-contact-list-view.c:2063 +#: ../libempathy-gtk/empathy-contact-list-view.c:2140 +#: ../libempathy-gtk/empathy-individual-view.c:2367 +#: ../libempathy-gtk/empathy-individual-view.c:2514 #: ../src/empathy-accounts-dialog.ui.h:7 msgid "_Remove" msgstr "_Remover" -#: ../libempathy-gtk/empathy-contact-list-view.c:2085 -#: ../libempathy-gtk/empathy-individual-view.c:2320 +#: ../libempathy-gtk/empathy-contact-list-view.c:2093 +#: ../libempathy-gtk/empathy-individual-view.c:2417 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Deseja mesmo remover o contacto '%s'?" -#: ../libempathy-gtk/empathy-contact-list-view.c:2087 -#: ../libempathy-gtk/empathy-individual-view.c:2322 +#: ../libempathy-gtk/empathy-contact-list-view.c:2095 +#: ../libempathy-gtk/empathy-individual-view.c:2433 msgid "Removing contact" msgstr "A remover o contacto" -#: ../libempathy-gtk/empathy-contact-menu.c:203 +#: ../libempathy-gtk/empathy-contact-menu.c:204 #: ../src/empathy-main-window.ui.h:13 msgid "_Add Contact…" msgstr "_Adicionar Contacto…" -#: ../libempathy-gtk/empathy-contact-menu.c:230 -#: ../libempathy-gtk/empathy-individual-menu.c:514 +#: ../libempathy-gtk/empathy-contact-menu.c:231 +#: ../libempathy-gtk/empathy-individual-menu.c:517 #: ../src/empathy-main-window.ui.h:14 msgid "_Chat" msgstr "_Diálogo" -#: ../libempathy-gtk/empathy-contact-menu.c:260 -#: ../libempathy-gtk/empathy-individual-menu.c:557 +#: ../libempathy-gtk/empathy-contact-menu.c:262 +#: ../libempathy-gtk/empathy-individual-menu.c:560 msgctxt "menu item" msgid "_Audio Call" msgstr "Ch_amada Áudio" -#: ../libempathy-gtk/empathy-contact-menu.c:290 -#: ../libempathy-gtk/empathy-individual-menu.c:599 +#: ../libempathy-gtk/empathy-contact-menu.c:293 +#: ../libempathy-gtk/empathy-individual-menu.c:602 msgctxt "menu item" msgid "_Video Call" msgstr "Chamada de _Vídeo" -#: ../libempathy-gtk/empathy-contact-menu.c:330 -#: ../libempathy-gtk/empathy-individual-menu.c:642 +#: ../libempathy-gtk/empathy-contact-menu.c:339 +#: ../libempathy-gtk/empathy-individual-menu.c:645 #: ../src/empathy-main-window.ui.h:25 msgid "_Previous Conversations" msgstr "Diálogos _Anteriores" -#: ../libempathy-gtk/empathy-contact-menu.c:352 -#: ../libempathy-gtk/empathy-individual-menu.c:683 +#: ../libempathy-gtk/empathy-contact-menu.c:361 +#: ../libempathy-gtk/empathy-individual-menu.c:686 msgid "Send File" msgstr "Enviar Ficheiro" -#: ../libempathy-gtk/empathy-contact-menu.c:375 -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-contact-menu.c:384 +#: ../libempathy-gtk/empathy-individual-menu.c:728 msgid "Share My Desktop" msgstr "Partilhar o Meu Ambiente de Trabalho" -#: ../libempathy-gtk/empathy-contact-menu.c:415 -#: ../libempathy-gtk/empathy-contact-widget.c:1539 -#: ../libempathy-gtk/empathy-individual-menu.c:759 -#: ../libempathy-gtk/empathy-individual-widget.c:1292 +#: ../libempathy-gtk/empathy-contact-menu.c:424 +#: ../libempathy-gtk/empathy-contact-widget.c:1681 +#: ../libempathy-gtk/empathy-individual-menu.c:762 +#: ../libempathy-gtk/empathy-individual-widget.c:1370 msgid "Favorite" msgstr "Favorito" -#: ../libempathy-gtk/empathy-contact-menu.c:444 -#: ../libempathy-gtk/empathy-individual-menu.c:786 +#: ../libempathy-gtk/empathy-contact-menu.c:453 +#: ../libempathy-gtk/empathy-individual-menu.c:789 msgid "Infor_mation" msgstr "Infor_mação" -#: ../libempathy-gtk/empathy-contact-menu.c:490 +#: ../libempathy-gtk/empathy-contact-menu.c:499 msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "_Editar" -#: ../libempathy-gtk/empathy-contact-menu.c:544 +#: ../libempathy-gtk/empathy-contact-menu.c:553 #: ../libempathy-gtk/empathy-individual-menu.c:970 -#: ../src/empathy-chat-window.c:903 +#: ../src/empathy-chat-window.c:916 msgid "Inviting you to this room" msgstr "A convidá-lo para esta sala" -#: ../libempathy-gtk/empathy-contact-menu.c:575 +#: ../libempathy-gtk/empathy-contact-menu.c:584 #: ../libempathy-gtk/empathy-individual-menu.c:1017 msgid "_Invite to Chat Room" msgstr "_Convidar Para a Sala de Diálogo" +#. Title +#: ../libempathy-gtk/empathy-contact-search-dialog.c:508 +msgid "Search contacts" +msgstr "Procurar nos contactos" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:538 +msgid "Search: " +msgstr "Procurar: " + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:596 +msgid "_Add Contact" +msgstr "_Adicionar Contacto" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:614 +msgid "No contacts found" +msgstr "Nenhum contacto encontrado" + #: ../libempathy-gtk/empathy-contact-selector.c:129 msgid "Select a contact" msgstr "Seleccione um contacto" -#: ../libempathy-gtk/empathy-contact-widget.c:217 -#: ../libempathy-gtk/empathy-individual-widget.c:148 +#: ../libempathy-gtk/empathy-contact-widget.c:276 +#: ../libempathy-gtk/empathy-individual-widget.c:153 msgid "Full name:" msgstr "Nome completo:" -#: ../libempathy-gtk/empathy-contact-widget.c:218 -#: ../libempathy-gtk/empathy-individual-widget.c:149 +#: ../libempathy-gtk/empathy-contact-widget.c:277 +#: ../libempathy-gtk/empathy-individual-widget.c:154 msgid "Phone number:" msgstr "Número de telefone:" -#: ../libempathy-gtk/empathy-contact-widget.c:219 -#: ../libempathy-gtk/empathy-individual-widget.c:150 +#: ../libempathy-gtk/empathy-contact-widget.c:278 +#: ../libempathy-gtk/empathy-individual-widget.c:155 msgid "E-mail address:" msgstr "Endereço de email:" -#: ../libempathy-gtk/empathy-contact-widget.c:220 -#: ../libempathy-gtk/empathy-individual-widget.c:151 +#: ../libempathy-gtk/empathy-contact-widget.c:279 +#: ../libempathy-gtk/empathy-individual-widget.c:156 msgid "Website:" msgstr "Página web:" -#: ../libempathy-gtk/empathy-contact-widget.c:221 -#: ../libempathy-gtk/empathy-individual-widget.c:152 +#: ../libempathy-gtk/empathy-contact-widget.c:280 +#: ../libempathy-gtk/empathy-individual-widget.c:157 msgid "Birthday:" msgstr "Data de Nascimento:" -#: ../libempathy-gtk/empathy-contact-widget.c:578 -#: ../libempathy-gtk/empathy-individual-widget.c:454 +#: ../libempathy-gtk/empathy-contact-widget.c:724 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Country ISO Code:" msgstr "Código de País ISO:" -#: ../libempathy-gtk/empathy-contact-widget.c:580 -#: ../libempathy-gtk/empathy-individual-widget.c:456 +#: ../libempathy-gtk/empathy-contact-widget.c:726 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Country:" msgstr "País:" -#: ../libempathy-gtk/empathy-contact-widget.c:582 -#: ../libempathy-gtk/empathy-individual-widget.c:458 +#: ../libempathy-gtk/empathy-contact-widget.c:728 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "State:" msgstr "Estado:" -#: ../libempathy-gtk/empathy-contact-widget.c:584 -#: ../libempathy-gtk/empathy-individual-widget.c:460 +#: ../libempathy-gtk/empathy-contact-widget.c:730 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "City:" msgstr "Cidade:" -#: ../libempathy-gtk/empathy-contact-widget.c:586 -#: ../libempathy-gtk/empathy-individual-widget.c:462 +#: ../libempathy-gtk/empathy-contact-widget.c:732 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Area:" msgstr "Área:" -#: ../libempathy-gtk/empathy-contact-widget.c:588 -#: ../libempathy-gtk/empathy-individual-widget.c:464 +#: ../libempathy-gtk/empathy-contact-widget.c:734 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Postal Code:" msgstr "Código Postal:" -#: ../libempathy-gtk/empathy-contact-widget.c:590 -#: ../libempathy-gtk/empathy-individual-widget.c:466 +#: ../libempathy-gtk/empathy-contact-widget.c:736 +#: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Street:" msgstr "Rua:" -#: ../libempathy-gtk/empathy-contact-widget.c:592 -#: ../libempathy-gtk/empathy-individual-widget.c:468 +#: ../libempathy-gtk/empathy-contact-widget.c:738 +#: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Building:" msgstr "Edifício:" -#: ../libempathy-gtk/empathy-contact-widget.c:594 -#: ../libempathy-gtk/empathy-individual-widget.c:470 +#: ../libempathy-gtk/empathy-contact-widget.c:740 +#: ../libempathy-gtk/empathy-individual-widget.c:503 msgid "Floor:" msgstr "Piso:" -#: ../libempathy-gtk/empathy-contact-widget.c:596 -#: ../libempathy-gtk/empathy-individual-widget.c:472 +#: ../libempathy-gtk/empathy-contact-widget.c:742 +#: ../libempathy-gtk/empathy-individual-widget.c:505 msgid "Room:" msgstr "Sala:" -#: ../libempathy-gtk/empathy-contact-widget.c:598 -#: ../libempathy-gtk/empathy-individual-widget.c:474 +#: ../libempathy-gtk/empathy-contact-widget.c:744 +#: ../libempathy-gtk/empathy-individual-widget.c:507 msgid "Text:" msgstr "Texto:" -#: ../libempathy-gtk/empathy-contact-widget.c:600 -#: ../libempathy-gtk/empathy-individual-widget.c:476 +#: ../libempathy-gtk/empathy-contact-widget.c:746 +#: ../libempathy-gtk/empathy-individual-widget.c:509 msgid "Description:" msgstr "Descrição:" -#: ../libempathy-gtk/empathy-contact-widget.c:602 -#: ../libempathy-gtk/empathy-individual-widget.c:478 +#: ../libempathy-gtk/empathy-contact-widget.c:748 +#: ../libempathy-gtk/empathy-individual-widget.c:511 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:604 -#: ../libempathy-gtk/empathy-individual-widget.c:480 +#: ../libempathy-gtk/empathy-contact-widget.c:750 +#: ../libempathy-gtk/empathy-individual-widget.c:513 msgid "Accuracy Level:" msgstr "Nível de Precisão:" -#: ../libempathy-gtk/empathy-contact-widget.c:606 -#: ../libempathy-gtk/empathy-individual-widget.c:482 +#: ../libempathy-gtk/empathy-contact-widget.c:752 +#: ../libempathy-gtk/empathy-individual-widget.c:515 msgid "Error:" msgstr "Erro:" -#: ../libempathy-gtk/empathy-contact-widget.c:608 -#: ../libempathy-gtk/empathy-individual-widget.c:484 +#: ../libempathy-gtk/empathy-contact-widget.c:754 +#: ../libempathy-gtk/empathy-individual-widget.c:517 msgid "Vertical Error (meters):" msgstr "Erro Vertical (metros):" -#: ../libempathy-gtk/empathy-contact-widget.c:610 -#: ../libempathy-gtk/empathy-individual-widget.c:486 +#: ../libempathy-gtk/empathy-contact-widget.c:756 +#: ../libempathy-gtk/empathy-individual-widget.c:519 msgid "Horizontal Error (meters):" msgstr "Erro Horizontal (metros):" -#: ../libempathy-gtk/empathy-contact-widget.c:612 -#: ../libempathy-gtk/empathy-individual-widget.c:488 +#: ../libempathy-gtk/empathy-contact-widget.c:758 +#: ../libempathy-gtk/empathy-individual-widget.c:521 msgid "Speed:" msgstr "Velocidade:" -#: ../libempathy-gtk/empathy-contact-widget.c:614 -#: ../libempathy-gtk/empathy-individual-widget.c:490 +#: ../libempathy-gtk/empathy-contact-widget.c:760 +#: ../libempathy-gtk/empathy-individual-widget.c:523 msgid "Bearing:" msgstr "Orientação:" -#: ../libempathy-gtk/empathy-contact-widget.c:616 -#: ../libempathy-gtk/empathy-individual-widget.c:492 +#: ../libempathy-gtk/empathy-contact-widget.c:762 +#: ../libempathy-gtk/empathy-individual-widget.c:525 msgid "Climb Speed:" msgstr "Velocidade de Escalada:" -#: ../libempathy-gtk/empathy-contact-widget.c:618 -#: ../libempathy-gtk/empathy-individual-widget.c:494 +#: ../libempathy-gtk/empathy-contact-widget.c:764 +#: ../libempathy-gtk/empathy-individual-widget.c:527 msgid "Last Updated on:" msgstr "Última Actualização a:" -#: ../libempathy-gtk/empathy-contact-widget.c:620 -#: ../libempathy-gtk/empathy-individual-widget.c:496 +#: ../libempathy-gtk/empathy-contact-widget.c:766 +#: ../libempathy-gtk/empathy-individual-widget.c:529 msgid "Longitude:" msgstr "Longitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:622 -#: ../libempathy-gtk/empathy-individual-widget.c:498 +#: ../libempathy-gtk/empathy-contact-widget.c:768 +#: ../libempathy-gtk/empathy-individual-widget.c:531 msgid "Latitude:" msgstr "Latitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:624 -#: ../libempathy-gtk/empathy-individual-widget.c:500 +#: ../libempathy-gtk/empathy-contact-widget.c:770 +#: ../libempathy-gtk/empathy-individual-widget.c:533 msgid "Altitude:" msgstr "Altitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:687 -#: ../libempathy-gtk/empathy-contact-widget.c:704 -#: ../libempathy-gtk/empathy-individual-widget.c:582 -#: ../libempathy-gtk/empathy-individual-widget.c:599 +#: ../libempathy-gtk/empathy-contact-widget.c:833 +#: ../libempathy-gtk/empathy-contact-widget.c:850 +#: ../libempathy-gtk/empathy-individual-widget.c:615 +#: ../libempathy-gtk/empathy-individual-widget.c:632 #: ../src/empathy-preferences.ui.h:12 msgid "Location" msgstr "Localização" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:706 -#: ../libempathy-gtk/empathy-individual-widget.c:601 +#: ../libempathy-gtk/empathy-contact-widget.c:852 +#: ../libempathy-gtk/empathy-individual-widget.c:634 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:758 -#: ../libempathy-gtk/empathy-individual-widget.c:650 +#: ../libempathy-gtk/empathy-contact-widget.c:904 +#: ../libempathy-gtk/empathy-individual-widget.c:683 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y às %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:841 -#: ../libempathy-gtk/empathy-individual-widget.c:841 +#: ../libempathy-gtk/empathy-contact-widget.c:986 +#: ../libempathy-gtk/empathy-individual-widget.c:918 msgid "Save Avatar" msgstr "Gravar Avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:897 -#: ../libempathy-gtk/empathy-individual-widget.c:899 +#: ../libempathy-gtk/empathy-contact-widget.c:1042 +#: ../libempathy-gtk/empathy-individual-widget.c:976 msgid "Unable to save avatar" msgstr "Incapaz de gravar o avatar" @@ -1783,7 +1870,7 @@ msgstr "<b>Localização</b> em (data)\t" #. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-individual-widget.c:1227 +#: ../libempathy-gtk/empathy-individual-widget.c:1305 msgid "Alias:" msgstr "Alcunha:" @@ -1803,7 +1890,7 @@ msgstr "Detalhes 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:1431 +#: ../libempathy-gtk/empathy-individual-widget.c:1509 msgid "Identifier:" msgstr "Identificador:" @@ -1836,18 +1923,18 @@ msgstr "" msgid "_Add Group" msgstr "_Adicionar Grupo" -#: ../libempathy-gtk/empathy-groups-widget.c:397 -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554 +#: ../libempathy-gtk/empathy-groups-widget.c:398 +msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Seleccionar" -#: ../libempathy-gtk/empathy-groups-widget.c:407 -#: ../src/empathy-main-window.c:1247 +#: ../libempathy-gtk/empathy-groups-widget.c:408 +#: ../src/empathy-main-window.c:1437 msgid "Group" msgstr "Grupo" #. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:282 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:281 msgid "Linked Contacts" msgstr "Contactos Associados" @@ -1867,7 +1954,7 @@ msgstr "" #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:132 +#: ../libempathy-gtk/empathy-individual-menu.c:131 #, c-format msgid "%s (%s)" msgstr "%s (%s)" @@ -1884,25 +1971,47 @@ msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "A_ssociar Contactos…" -#: ../libempathy-gtk/empathy-individual-widget.c:1569 +#: ../libempathy-gtk/empathy-individual-view.c:2425 +#, 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 "" +"Deseja realmente remover o contacto ligado '%s'? Note que tal irá remover " +"todos os contactos que constituem este contacto ligado." + +#: ../libempathy-gtk/empathy-individual-widget.c:1650 #, c-format -msgid "Meta-contact containing %u contact" -msgid_plural "Meta-contact containing %u contacts" -msgstr[0] "Meta-contacto contendo %u contacto" -msgstr[1] "Meta-contacto contendo %u contactos" +msgid "Linked contact containing %u contact" +msgid_plural "Linked contacts containing %u contacts" +msgstr[0] "Contacto ligado contendo %u contacto" +msgstr[1] "Contacto ligado contendo %u contactos" #: ../libempathy-gtk/empathy-individual-widget.ui.h:1 msgid "<b>Location</b> at (date)" msgstr "<b>Localização</b> em (data)" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:4 +msgid "Online from a phone or mobile device" +msgstr "Ligado a partir de um telefone ou dispositivo móvel" + +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332 msgid "New Network" msgstr "Nova Rede" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527 msgid "Choose an IRC network" msgstr "Seleccione uma rede de IRC" +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584 +msgid "Reset _Networks List" +msgstr "Reiniciar a Lista de _Redes" + +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588 +msgctxt "verb displayed on a button to select an IRC network" +msgid "Select" +msgstr "Seleccionar" + #: ../libempathy-gtk/empathy-irc-network-dialog.c:280 msgid "new server" msgstr "novo servidor" @@ -1914,49 +2023,49 @@ 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:116 +#: ../libempathy-gtk/empathy-linking-dialog.c:115 msgid "Link Contacts" msgstr "Associar Contactos" -#: ../libempathy-gtk/empathy-linking-dialog.c:121 +#: ../libempathy-gtk/empathy-linking-dialog.c:120 msgctxt "Unlink individual (button)" msgid "_Unlink…" -msgstr "_Desassociar…" +msgstr "_Separar…" -#: ../libempathy-gtk/empathy-linking-dialog.c:122 +#: ../libempathy-gtk/empathy-linking-dialog.c:121 msgid "" -"Completely split the displayed meta-contact into the contacts it contains." +"Completely split the displayed linked contacts into the separate contacts." msgstr "" -"Separar completamente o meta-contacto apresentado nos contactos que o " +"Separar completamente o contacto ligado apresentado nos contactos que o " "compõem." #. 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:137 +#: ../libempathy-gtk/empathy-linking-dialog.c:136 msgid "_Link" msgstr "_Associar" #: ../libempathy-gtk/empathy-linking-dialog.c:183 #, c-format -msgid "Unlink meta-contact '%s'?" -msgstr "Desassociar o meta-contacto '%s'?" +msgid "Unlink linked contacts '%s'?" +msgstr "Separar os contactos ligados '%s'?" #: ../libempathy-gtk/empathy-linking-dialog.c:186 msgid "" -"Are you sure you want to unlink this meta-contact? This will completely " -"split the meta-contact into the contacts it contains." +"Are you sure you want to unlink these linked contacts? This will completely " +"split the linked contacts into separate contacts." msgstr "" -"Tem a certeza de que deseja desassociar este meta-contacto? Isto irá separar " -"o meta-contacto nos contactos que o compõem." +"Tem a certeza de que deseja separar estes contactos ligados? Isto irá separar " +"os contactos ligados nos contactos que o compõem." -#: ../libempathy-gtk/empathy-linking-dialog.c:191 +#: ../libempathy-gtk/empathy-linking-dialog.c:190 msgctxt "Unlink individual (button)" msgid "_Unlink" -msgstr "_Desassociar" +msgstr "_Separar" -#: ../libempathy-gtk/empathy-log-window.c:663 +#: ../libempathy-gtk/empathy-log-window.c:664 msgid "Date" msgstr "Data" @@ -1966,10 +2075,12 @@ msgid "Conversations" msgstr "Diálogos" #: ../libempathy-gtk/empathy-log-window.ui.h:3 +#: ../libempathy-gtk/empathy-search-bar.ui.h:1 msgid "Find Next" msgstr "Procurar Seguinte" #: ../libempathy-gtk/empathy-log-window.ui.h:4 +#: ../libempathy-gtk/empathy-search-bar.ui.h:2 msgid "Find Previous" msgstr "Procurar Anterior" @@ -1992,116 +2103,134 @@ msgid "Contact ID:" msgstr "ID de Contacto:" #. add chat button -#: ../libempathy-gtk/empathy-new-message-dialog.c:145 +#: ../libempathy-gtk/empathy-new-message-dialog.c:171 msgid "C_hat" msgstr "_Diálogo" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:155 +#: ../libempathy-gtk/empathy-new-message-dialog.c:181 msgid "New Conversation" msgstr "Novo Diálogo" #. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:205 +#: ../libempathy-gtk/empathy-new-call-dialog.c:252 msgid "Send _Video" msgstr "Enviar _Vídeo" #. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:213 +#: ../libempathy-gtk/empathy-new-call-dialog.c:260 msgid "C_all" msgstr "Ch_amar" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:223 +#: ../libempathy-gtk/empathy-new-call-dialog.c:270 msgid "New Call" msgstr "Nova Chamada" +#: ../libempathy-gtk/empathy-password-dialog.c:274 +#, c-format +msgid "" +"Enter your password for account\n" +"<b>%s</b>" +msgstr "" +"Introduza a sua senha para a conta\n" +"<b>%s</b>" + #. COL_STATUS_TEXT #. COL_STATE_ICON_NAME #. COL_STATE #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:168 -#: ../libempathy-gtk/empathy-presence-chooser.c:204 +#: ../libempathy-gtk/empathy-presence-chooser.c:170 +#: ../libempathy-gtk/empathy-presence-chooser.c:206 msgid "Custom Message…" msgstr "Mensagem Personalizada…" -#: ../libempathy-gtk/empathy-presence-chooser.c:221 #: ../libempathy-gtk/empathy-presence-chooser.c:223 +#: ../libempathy-gtk/empathy-presence-chooser.c:225 msgid "Edit Custom Messages…" msgstr "Editar as Mensagens Personalizadas…" -#: ../libempathy-gtk/empathy-presence-chooser.c:346 +#: ../libempathy-gtk/empathy-presence-chooser.c:348 msgid "Click to remove this status as a favorite" msgstr "Clique para remover este estado dos favoritos" -#: ../libempathy-gtk/empathy-presence-chooser.c:355 +#: ../libempathy-gtk/empathy-presence-chooser.c:357 msgid "Click to make this status a favorite" msgstr "Clique para tornar este estado num favorito" -#: ../libempathy-gtk/empathy-presence-chooser.c:389 +#: ../libempathy-gtk/empathy-presence-chooser.c:391 msgid "Set status" msgstr "Definir estado" -#: ../libempathy-gtk/empathy-presence-chooser.c:939 +#: ../libempathy-gtk/empathy-presence-chooser.c:948 msgid "Set your presence and current status" msgstr "Defina a sua presença e estado actual" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1124 +#: ../libempathy-gtk/empathy-presence-chooser.c:1136 msgid "Custom messages…" msgstr "Mensagens personalizadas…" -#: ../libempathy-gtk/empathy-search-bar.ui.h:1 +#. 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 "Nova conta %s" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:3 msgid "Find:" msgstr "Procurar:" -#: ../libempathy-gtk/empathy-search-bar.ui.h:2 +#: ../libempathy-gtk/empathy-search-bar.ui.h:4 msgid "Match case" msgstr "Coincidir a capitalização" -#: ../libempathy-gtk/empathy-search-bar.ui.h:3 +#: ../libempathy-gtk/empathy-search-bar.ui.h:5 msgid "Phrase not found" msgstr "Frase não encontrada" -#: ../libempathy-gtk/empathy-sound.c:50 +#: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Received an instant message" msgstr "Mensagem instantânea recebida" -#: ../libempathy-gtk/empathy-sound.c:52 +#: ../libempathy-gtk/empathy-sound-manager.c:53 msgid "Sent an instant message" msgstr "Mensagem instantânea enviada" -#: ../libempathy-gtk/empathy-sound.c:54 +#: ../libempathy-gtk/empathy-sound-manager.c:55 msgid "Incoming chat request" msgstr "Recebido um pedido de diálogo" -#: ../libempathy-gtk/empathy-sound.c:56 +#: ../libempathy-gtk/empathy-sound-manager.c:57 msgid "Contact connected" msgstr "Contacto iniciou sessão" -#: ../libempathy-gtk/empathy-sound.c:58 +#: ../libempathy-gtk/empathy-sound-manager.c:59 msgid "Contact disconnected" msgstr "Contacto terminou a sessão" -#: ../libempathy-gtk/empathy-sound.c:60 +#: ../libempathy-gtk/empathy-sound-manager.c:61 msgid "Connected to server" msgstr "Ligado ao servidor" -#: ../libempathy-gtk/empathy-sound.c:62 +#: ../libempathy-gtk/empathy-sound-manager.c:63 msgid "Disconnected from server" msgstr "Desligado do servidor" -#: ../libempathy-gtk/empathy-sound.c:64 +#: ../libempathy-gtk/empathy-sound-manager.c:65 msgid "Incoming voice call" msgstr "Chamada de voz a receber" -#: ../libempathy-gtk/empathy-sound.c:66 +#: ../libempathy-gtk/empathy-sound-manager.c:67 msgid "Outgoing voice call" msgstr "A realizar chamada de voz" -#: ../libempathy-gtk/empathy-sound.c:68 +#: ../libempathy-gtk/empathy-sound-manager.c:69 msgid "Voice call ended" msgstr "Chamada de voz terminada" @@ -2114,12 +2243,12 @@ msgid "Edit Custom Messages" msgstr "Editar as Mensagens Personalizadas" #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -msgid "Add _New Preset" -msgstr "Adicionar _Nova Pré-definição" +msgid "Save _New Status Message" +msgstr "Gravar a _Nova Mensagem de Estado" #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2 -msgid "Saved Presets" -msgstr "Pré-definições Gravadas" +msgid "Saved Status Messages" +msgstr "Mensagens de Estado Gravadas" #: ../libempathy-gtk/empathy-theme-manager.c:67 msgid "Classic" @@ -2138,87 +2267,101 @@ msgid "Blue" msgstr "Azul" #: ../libempathy-gtk/empathy-tls-dialog.c:150 -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ão é possível verificar a identidade apresentada pelo servidor de diálogo.\n" +"Não é possível verificar a identidade apresentada pelo servidor de diálogo." -#: ../libempathy-gtk/empathy-tls-dialog.c:156 -msgid "The certificate is not signed by a Certification Authority" -msgstr "O certificado não é assinado pela Autoridade de Certificação" +#: ../libempathy-gtk/empathy-tls-dialog.c:157 +msgid "The certificate is not signed by a Certification Authority." +msgstr "O certificado não é assinado por uma Autoridade de Certificação." -#: ../libempathy-gtk/empathy-tls-dialog.c:160 -msgid "The certificate has expired" -msgstr "O certificado expirou" +#: ../libempathy-gtk/empathy-tls-dialog.c:161 +msgid "The certificate has expired." +msgstr "O certificado expirou." -#: ../libempathy-gtk/empathy-tls-dialog.c:163 -msgid "The certificate hasn't yet been activated" -msgstr "O certificado ainda não está activo" +#: ../libempathy-gtk/empathy-tls-dialog.c:164 +msgid "The certificate hasn't yet been activated." +msgstr "O certificado ainda não está activo." -#: ../libempathy-gtk/empathy-tls-dialog.c:166 -msgid "The certificate does not have the expected fingerprint" -msgstr "O certificado não contém a impressão digital esperada" +#: ../libempathy-gtk/empathy-tls-dialog.c:167 +msgid "The certificate does not have the expected fingerprint." +msgstr "O certificado não contém a impressão digital esperada." -#: ../libempathy-gtk/empathy-tls-dialog.c:169 -msgid "The hostname verified by the certificate doesn't match the server name" +#: ../libempathy-gtk/empathy-tls-dialog.c:170 +msgid "The hostname verified by the certificate doesn't match the server name." msgstr "" "O nome de máquina verificado pelo certificado não corresponde ao nome do " -"servidor" +"servidor." -#: ../libempathy-gtk/empathy-tls-dialog.c:173 -msgid "The certificate is self-signed" -msgstr "O certificado é assinado pelo próprio" +#: ../libempathy-gtk/empathy-tls-dialog.c:174 +msgid "The certificate is self-signed." +msgstr "O certificado é assinado pelo próprio." -#: ../libempathy-gtk/empathy-tls-dialog.c:176 -msgid "The certificate has been revoked by the issuing Certification Authority" -msgstr "O certificado foi revogado pela Autoridade de Certificação emitente" +#: ../libempathy-gtk/empathy-tls-dialog.c:177 +msgid "" +"The certificate has been revoked by the issuing Certification Authority." +msgstr "O certificado foi revogado pela Autoridade de Certificação emissora." -#: ../libempathy-gtk/empathy-tls-dialog.c:180 -msgid "The certificate is cryptographically weak" -msgstr "O certificado é criptograficamente fraco" +#: ../libempathy-gtk/empathy-tls-dialog.c:181 +msgid "The certificate is cryptographically weak." +msgstr "O certificado é criptograficamente fraco." -#: ../libempathy-gtk/empathy-tls-dialog.c:183 -msgid "The certificate length exceeds verifiable limits" -msgstr "A dimensão do certificado excede os limites verificáveis" +#: ../libempathy-gtk/empathy-tls-dialog.c:184 +msgid "The certificate length exceeds verifiable limits." +msgstr "A dimensão do certificado excede os limites verificáveis." -#: ../libempathy-gtk/empathy-tls-dialog.c:187 -msgid "The certificate is malformed" -msgstr "O certificado está mal formado" +#: ../libempathy-gtk/empathy-tls-dialog.c:188 +msgid "The certificate is malformed." +msgstr "O certificado está mal formado." -#: ../libempathy-gtk/empathy-tls-dialog.c:205 +#: ../libempathy-gtk/empathy-tls-dialog.c:206 #, c-format msgid "Expected hostname: %s" msgstr "Nome de servidor esperado: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:208 +#: ../libempathy-gtk/empathy-tls-dialog.c:209 #, c-format msgid "Certificate hostname: %s" msgstr "Nome de servidor do certificado: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:263 +#: ../libempathy-gtk/empathy-tls-dialog.c:281 msgid "Continue" msgstr "Continuar" -#: ../libempathy-gtk/empathy-tls-dialog.c:269 +#: ../libempathy-gtk/empathy-tls-dialog.c:287 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Esta ligação não é segura. Ainda assim deseja continuar?" -#: ../libempathy-gtk/empathy-tls-dialog.c:286 +#: ../libempathy-gtk/empathy-tls-dialog.c:304 msgid "Remember this choice for future connections" msgstr "Recordar esta selecção para ligações futuras" -#: ../libempathy-gtk/empathy-tls-dialog.c:294 +#: ../libempathy-gtk/empathy-tls-dialog.c:312 msgid "Certificate Details" msgstr "Detalhes do Certificado" -#: ../libempathy-gtk/empathy-ui-utils.c:1698 +#: ../libempathy-gtk/empathy-ui-utils.c:1707 msgid "Unable to open URI" msgstr "Incapaz de abrir o URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1793 +#: ../libempathy-gtk/empathy-ui-utils.c:1802 msgid "Select a file" msgstr "Seleccione um ficheiro" -#: ../libempathy-gtk/empathy-ui-utils.c:1862 +#: ../libempathy-gtk/empathy-ui-utils.c:1874 +msgid "Insufficient free space to save file" +msgstr "Espaço disponível em disco é insuficiente para gravar o ficheiro" + +#: ../libempathy-gtk/empathy-ui-utils.c:1882 +#, c-format +msgid "" +"%s of free space are required to save this file, but only %s is available. " +"Please choose another location." +msgstr "" +"É necessário %s de espaço livre para gravar este ficheiro, mas apenas está " +"disponível %s. Seleccione outra localização." + +#: ../libempathy-gtk/empathy-ui-utils.c:1926 #, c-format msgid "Incoming file from %s" msgstr "Ficheiro recebido de %s" @@ -2406,20 +2549,37 @@ msgstr "Nenhuma mensagem de erro" msgid "Instant Message (Empathy)" msgstr "Mensagem Instantânea (Empathy)" -#: ../src/empathy.c:414 +#: ../src/empathy.c:308 msgid "Don't connect on startup" msgstr "Não estabelecer ligação ao iniciar" -#: ../src/empathy.c:418 +#: ../src/empathy.c:312 msgid "Don't display the contact list or any other dialogs on startup" msgstr "" "Não apresentar a lista de contactos nem qualquer outro diálogo ao iniciar" -#: ../src/empathy.c:435 +#: ../src/empathy.c:320 msgid "- Empathy IM Client" msgstr "- Cliente de MI Empathy" -#: ../src/empathy-about-dialog.c:85 +#: ../src/empathy.c:499 +msgid "Error contacting the Account Manager" +msgstr "Erro ao contactar o Gestor de Conta" + +#: ../src/empathy.c:501 +#, c-format +msgid "" +"There was an error while trying to connect to the Telepathy Account Manager. " +"The error was:\n" +"\n" +"%s" +msgstr "" +"Ocorreu um erro ao tentar a ligação ao Gestor de Conta do Telepathy. " +"O erro foi:\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 " @@ -2431,7 +2591,7 @@ msgstr "" "Foundation; ou a versão 2 da Licença, ou (à sua discrição) qualquer versão " "posterior." -#: ../src/empathy-about-dialog.c:89 +#: ../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 " @@ -2443,7 +2603,7 @@ msgstr "" "UM FIM ESPECÍFICO. Consulte a Licença Pública Genérica GNU para mais " "detalhes." -#: ../src/empathy-about-dialog.c:93 +#: ../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 " @@ -2453,11 +2613,11 @@ msgstr "" "o Empathy; caso contrário, escreva para a Free Software Foundation, Inc., 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA (em inglês)" -#: ../src/empathy-about-dialog.c:121 +#: ../src/empathy-about-dialog.c:107 msgid "An Instant Messaging client for GNOME" msgstr "Um cliente de Mensagens Instantâneas para o GNOME" -#: ../src/empathy-about-dialog.c:127 +#: ../src/empathy-about-dialog.c:113 msgid "translator-credits" msgstr "Duarte Loreto <happyguy_pt@hotmail.com>" @@ -2491,45 +2651,35 @@ msgstr "" "sair deste assistente e adicionar contas mais tarde a partir do menu Editar." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1316 +#: ../src/empathy-account-assistant.c:1268 msgid "An error occurred" msgstr "Ocorreu um erro" -#. To translator: %s is the protocol name -#. Create account -#. To translator: %s is the name of the protocol, such as "Google Talk" or -#. * "Yahoo!" -#. -#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614 -#, c-format -msgid "New %s account" -msgstr "Nova conta %s" - -#: ../src/empathy-account-assistant.c:515 +#: ../src/empathy-account-assistant.c:467 msgid "What kind of chat account do you have?" msgstr "Que tipo de conta de diálogo possui?" -#: ../src/empathy-account-assistant.c:521 +#: ../src/empathy-account-assistant.c:473 msgid "Do you have any other chat accounts you want to set up?" msgstr "Possui quaisquer outras contas de diálogo que deseja configurar?" -#: ../src/empathy-account-assistant.c:527 +#: ../src/empathy-account-assistant.c:479 msgid "Enter your account details" msgstr "Introduza os detalhes da sua conta" -#: ../src/empathy-account-assistant.c:532 +#: ../src/empathy-account-assistant.c:484 msgid "What kind of chat account do you want to create?" msgstr "Que tipo de conta de diálogo deseja criar?" -#: ../src/empathy-account-assistant.c:538 +#: ../src/empathy-account-assistant.c:490 msgid "Do you want to create other chat accounts?" msgstr "Deseja criar outras contas de diálogo?" -#: ../src/empathy-account-assistant.c:545 +#: ../src/empathy-account-assistant.c:497 msgid "Enter the details for the new account" msgstr "Introduza os detalhes da nova conta" -#: ../src/empathy-account-assistant.c:660 +#: ../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 " @@ -2541,42 +2691,42 @@ msgstr "" "mensagens instantâneas. Com um microfone ou webcam pode também fazer " "chamadas e videoconferências." -#: ../src/empathy-account-assistant.c:677 +#: ../src/empathy-account-assistant.c:629 msgid "Do you have an account you've been using with another chat program?" msgstr "" "Tem alguma conta que tenha estado a utilizar com outra aplicação de diálogo?" -#: ../src/empathy-account-assistant.c:700 +#: ../src/empathy-account-assistant.c:652 msgid "Yes, import my account details from " msgstr "Sim, importar os meus detalhes de conta de " -#: ../src/empathy-account-assistant.c:721 +#: ../src/empathy-account-assistant.c:673 msgid "Yes, I'll enter my account details now" msgstr "Sim, irei introduzir os meus detalhes de conta" -#: ../src/empathy-account-assistant.c:743 +#: ../src/empathy-account-assistant.c:695 msgid "No, I want a new account" msgstr "Não, quero uma conta nova" -#: ../src/empathy-account-assistant.c:753 +#: ../src/empathy-account-assistant.c:705 msgid "No, I just want to see people online nearby for now" msgstr "Não, apenas quero ver as pessoas que estão por perto" -#: ../src/empathy-account-assistant.c:774 +#: ../src/empathy-account-assistant.c:726 msgid "Select the accounts you want to import:" msgstr "Seleccione as contas que deseja importar:" -#: ../src/empathy-account-assistant.c:858 -#: ../src/empathy-new-chatroom-dialog.c:609 -#: ../src/empathy-new-chatroom-dialog.c:610 +#: ../src/empathy-account-assistant.c:810 +#: ../src/empathy-new-chatroom-dialog.c:562 +#: ../src/empathy-new-chatroom-dialog.c:563 msgid "Yes" msgstr "Sim" -#: ../src/empathy-account-assistant.c:865 +#: ../src/empathy-account-assistant.c:817 msgid "No, that's all for now" msgstr "Não, é tudo por agora" -#: ../src/empathy-account-assistant.c:1130 +#: ../src/empathy-account-assistant.c:1082 msgid "" "Empathy can automatically discover and chat with the people connected on the " "same network as you. If you want to use this feature, please check that the " @@ -2588,16 +2738,16 @@ msgstr "" "detalhes abaixo estão correctos. Poderá facilmente alterar estes detalhes " "mais tarde ou desactivar esta funcionalidade utilizando o diálogo de 'Contas'" -#: ../src/empathy-account-assistant.c:1136 -#: ../src/empathy-account-assistant.c:1192 +#: ../src/empathy-account-assistant.c:1088 +#: ../src/empathy-account-assistant.c:1144 msgid "Edit->Accounts" msgstr "Editar->Contas" -#: ../src/empathy-account-assistant.c:1152 -msgid "I don't want to enable this feature for now" -msgstr "Não desejo activar esta conta no futuro" +#: ../src/empathy-account-assistant.c:1104 +msgid "I do _not want to enable this feature for now" +msgstr "De momento _não desejo activar esta funcionalidade" -#: ../src/empathy-account-assistant.c:1188 +#: ../src/empathy-account-assistant.c:1140 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -2609,66 +2759,67 @@ msgstr "" "instale o pacote telepathy-salut e crie uma conta de Pessoas Próximas a " "partir do diálogo de Contas" -#: ../src/empathy-account-assistant.c:1194 +#: ../src/empathy-account-assistant.c:1146 msgid "telepathy-salut not installed" msgstr "telepathy-salut não está instalado" -#: ../src/empathy-account-assistant.c:1240 +#: ../src/empathy-account-assistant.c:1192 msgid "Messaging and VoIP Accounts Assistant" msgstr "Assistente de Contas de Mensagens e VoIP" -#: ../src/empathy-account-assistant.c:1274 +#: ../src/empathy-account-assistant.c:1226 msgid "Welcome to Empathy" msgstr "Bem vindo ao Empathy" -#: ../src/empathy-account-assistant.c:1283 +#: ../src/empathy-account-assistant.c:1235 msgid "Import your existing accounts" msgstr "Importar as suas contas existentes" -#: ../src/empathy-account-assistant.c:1301 +#: ../src/empathy-account-assistant.c:1253 msgid "Please enter personal details" msgstr "Introduza os seus detalhes pessoais" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:65 +#: ../src/empathy-accounts-dialog.c:64 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Existem alterações por gravar na sua 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:69 +#: ../src/empathy-accounts-dialog.c:68 msgid "Your new account has not been saved yet." msgstr "A sua nova conta ainda não foi gravada." -#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818 +#: ../src/empathy-accounts-dialog.c:286 +#: ../src/empathy-streamed-media-window.c:809 msgid "Connecting…" msgstr "A estabelecer ligação…" -#: ../src/empathy-accounts-dialog.c:322 +#: ../src/empathy-accounts-dialog.c:327 #, c-format msgid "Offline — %s" msgstr "Desligado — %s" -#: ../src/empathy-accounts-dialog.c:334 +#: ../src/empathy-accounts-dialog.c:339 #, c-format msgid "Disconnected — %s" msgstr "Desligado — %s" -#: ../src/empathy-accounts-dialog.c:345 +#: ../src/empathy-accounts-dialog.c:350 msgid "Offline — No Network Connection" msgstr "Desligado — Nenhuma Ligação de Rede" -#: ../src/empathy-accounts-dialog.c:352 +#: ../src/empathy-accounts-dialog.c:357 msgid "Unknown Status" msgstr "Estado Desconhecido" -#: ../src/empathy-accounts-dialog.c:364 +#: ../src/empathy-accounts-dialog.c:369 msgid "Offline — Account Disabled" msgstr "Desligado — Conta Desactivada" -#: ../src/empathy-accounts-dialog.c:811 +#: ../src/empathy-accounts-dialog.c:772 msgid "" "You are about to create a new account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2676,16 +2827,16 @@ msgstr "" "Está prestes a criar uma nova conta, que irá descartar as\n" "suas alterações. Tem a certeza de que deseja continuar?" -#: ../src/empathy-accounts-dialog.c:1158 +#: ../src/empathy-accounts-dialog.c:1133 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Deseja remover %s do seu computador?" -#: ../src/empathy-accounts-dialog.c:1162 +#: ../src/empathy-accounts-dialog.c:1137 msgid "This will not remove your account on the server." msgstr "Isto não irá remover a sua conta no servidor." -#: ../src/empathy-accounts-dialog.c:1400 +#: ../src/empathy-accounts-dialog.c:1375 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2693,7 +2844,16 @@ msgstr "" "Está prestes a seleccionar outra conta, o que irá descartar\n" "as suas alterações. Tem a certeza de que deseja continuar?" -#: ../src/empathy-accounts-dialog.c:2003 +#. Menu items: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1571 +msgid "_Enable" +msgstr "_Activar" + +#: ../src/empathy-accounts-dialog.c:1572 +msgid "_Disable" +msgstr "_Desactivar" + +#: ../src/empathy-accounts-dialog.c:2086 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2729,11 +2889,11 @@ msgstr "_Adicionar…" msgid "_Import…" msgstr "_Importar…" -#: ../src/empathy-auth-client.c:217 +#: ../src/empathy-auth-client.c:243 msgid " - Empathy authentication client" msgstr " - Cliente de autenticação do Empathy" -#: ../src/empathy-auth-client.c:233 +#: ../src/empathy-auth-client.c:259 msgid "Empathy authentication client" msgstr "Cliente de autenticação do Empathy" @@ -2741,96 +2901,96 @@ msgstr "Cliente de autenticação do Empathy" # 48x48/emblems/emblem-people.icon.in.h:1 #: ../src/empathy-auto-salut-account-helper.c:83 msgid "People nearby" -msgstr "Pessoas por perto" +msgstr "Pessoas próximas" -#: ../src/empathy-av.c:133 +#: ../src/empathy-av.c:118 msgid "- Empathy Audio/Video Client" msgstr "- Cliente de Áudio/Vídeo do Empathy" -#: ../src/empathy-av.c:149 +#: ../src/empathy-av.c:134 msgid "Empathy Audio/Video Client" msgstr "Cliente de Áudio/Vídeo do Empathy" -#: ../src/empathy-call-window.c:479 +#: ../src/empathy-streamed-media-window.c:479 msgid "Contrast" msgstr "Contraste" -#: ../src/empathy-call-window.c:482 +#: ../src/empathy-streamed-media-window.c:482 msgid "Brightness" msgstr "Brilho" -#: ../src/empathy-call-window.c:485 +#: ../src/empathy-streamed-media-window.c:485 msgid "Gamma" msgstr "Gama" -#: ../src/empathy-call-window.c:590 +#: ../src/empathy-streamed-media-window.c:590 msgid "Volume" msgstr "Volume" -#: ../src/empathy-call-window.c:1173 +#: ../src/empathy-streamed-media-window.c:1165 msgid "_Sidebar" msgstr "Barra _Lateral" -#: ../src/empathy-call-window.c:1192 +#: ../src/empathy-streamed-media-window.c:1185 msgid "Audio input" msgstr "Entrada áudio" -#: ../src/empathy-call-window.c:1196 +#: ../src/empathy-streamed-media-window.c:1189 msgid "Video input" msgstr "Entrada vídeo" -#: ../src/empathy-call-window.c:1200 +#: ../src/empathy-streamed-media-window.c:1193 msgid "Dialpad" msgstr "Teclado Numérico" -#: ../src/empathy-call-window.c:1205 +#: ../src/empathy-streamed-media-window.c:1198 msgid "Details" msgstr "Detalhes" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:1273 +#: ../src/empathy-streamed-media-window.c:1267 #, c-format msgid "Call with %s" msgstr "Chamada com %s" #. translators: Call is a noun. This string is used in the window #. * title -#: ../src/empathy-call-window.c:1352 +#: ../src/empathy-streamed-media-window.c:1346 msgid "Call" msgstr "Chamada" -#: ../src/empathy-call-window.c:1506 +#: ../src/empathy-streamed-media-window.c:1500 msgid "The IP address as seen by the machine" msgstr "O endereço IP tal como visto pela máquina" -#: ../src/empathy-call-window.c:1508 +#: ../src/empathy-streamed-media-window.c:1502 msgid "The IP address as seen by a server on the Internet" msgstr "O endereço IP tal como visto por um servidor na Internet" -#: ../src/empathy-call-window.c:1510 +#: ../src/empathy-streamed-media-window.c:1504 msgid "The IP address of the peer as seen by the other side" msgstr "O endereço IP do par tal como visto pelo outro lado" -#: ../src/empathy-call-window.c:1512 +#: ../src/empathy-streamed-media-window.c:1506 msgid "The IP address of a relay server" msgstr "O endereço IP de um servidor de relay" -#: ../src/empathy-call-window.c:1514 +#: ../src/empathy-streamed-media-window.c:1508 msgid "The IP address of the multicast group" msgstr "O endereço IP do grupo multicast" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:2247 +#: ../src/empathy-streamed-media-window.c:2259 #, c-format msgid "Connected — %d:%02dm" msgstr "Ligado — %d:%02dm" -#: ../src/empathy-call-window.c:2308 +#: ../src/empathy-streamed-media-window.c:2320 msgid "Technical Details" msgstr "Detalhes Técnicos" -#: ../src/empathy-call-window.c:2346 +#: ../src/empathy-streamed-media-window.c:2358 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -2839,7 +2999,7 @@ msgstr "" "As aplicações de %s não suportam nenhum dos formatos áudio suportados pelo " "seu computador" -#: ../src/empathy-call-window.c:2351 +#: ../src/empathy-streamed-media-window.c:2363 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -2848,7 +3008,7 @@ msgstr "" "As aplicações de %s não suportam nenhum dos formatos vídeo suportados pelo " "seu computador" -#: ../src/empathy-call-window.c:2357 +#: ../src/empathy-streamed-media-window.c:2369 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -2857,25 +3017,25 @@ msgstr "" "Incapaz de estabelecer uma ligação com %s. Um dos utilizadores deve estar " "numa rede que não permite ligações directas." -#: ../src/empathy-call-window.c:2363 +#: ../src/empathy-streamed-media-window.c:2375 msgid "There was a failure on the network" msgstr "Ocorreu um erro na rede" -#: ../src/empathy-call-window.c:2367 +#: ../src/empathy-streamed-media-window.c:2379 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "Os formatos áudio necessários para esta chamada não estão instalados no seu " "computador" -#: ../src/empathy-call-window.c:2370 +#: ../src/empathy-streamed-media-window.c:2382 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Os formatos vídeo necessários para esta chamada não estão instalados no seu " "computador" -#: ../src/empathy-call-window.c:2380 +#: ../src/empathy-streamed-media-window.c:2392 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -2886,19 +3046,19 @@ msgstr "" "\">Relate isto como um erro</a> e junte os registos obtidos pela janela " "'Depuração' no menu Ajuda." -#: ../src/empathy-call-window.c:2388 +#: ../src/empathy-streamed-media-window.c:2400 msgid "There was a failure in the call engine" msgstr "Ocorreu um erro no motor de chamadas" -#: ../src/empathy-call-window.c:2391 +#: ../src/empathy-streamed-media-window.c:2403 msgid "The end of the stream was reached" msgstr "Foi alcançado o final do fluxo" -#: ../src/empathy-call-window.c:2431 +#: ../src/empathy-streamed-media-window.c:2443 msgid "Can't establish audio stream" msgstr "Incapaz de estabelecer fluxo áudio" -#: ../src/empathy-call-window.c:2441 +#: ../src/empathy-streamed-media-window.c:2453 msgid "Can't establish video stream" msgstr "Incapaz de estabelecer fluxo vídeo" @@ -2994,39 +3154,39 @@ msgstr "Antevisão do Vídeo" msgid "_Call" msgstr "_Chamar" -#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27 +#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28 msgid "_View" msgstr "_Visualizar" -#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472 +#: ../src/empathy-chat-window.c:469 ../src/empathy-chat-window.c:489 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d por ler)" msgstr[1] "%s (%d por ler)" -#: ../src/empathy-chat-window.c:464 +#: ../src/empathy-chat-window.c:481 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (e %u outro)" msgstr[1] "%s (e %u outros)" -#: ../src/empathy-chat-window.c:480 +#: ../src/empathy-chat-window.c:497 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d por ler de outros)" msgstr[1] "%s (%d por ler de outros)" -#: ../src/empathy-chat-window.c:489 +#: ../src/empathy-chat-window.c:506 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d por ler de todos)" msgstr[1] "%s (%d por ler de todos)" -#: ../src/empathy-chat-window.c:695 +#: ../src/empathy-chat-window.c:708 msgid "Typing a message." msgstr "A escrever uma mensagem." @@ -3122,86 +3282,90 @@ msgstr "Ligar Automaticamente" msgid "Manage Favorite Rooms" msgstr "Gerir as Salas Favoritas" -#: ../src/empathy-event-manager.c:468 +#: ../src/empathy-event-manager.c:507 msgid "Incoming video call" msgstr "Chamada de vídeo a receber" -#: ../src/empathy-event-manager.c:468 +#: ../src/empathy-event-manager.c:507 msgid "Incoming call" msgstr "Chamada a receber" -#: ../src/empathy-event-manager.c:472 +#: ../src/empathy-event-manager.c:511 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s está a ligar-lhe em videoconferência. Deseja atender?" -#: ../src/empathy-event-manager.c:473 +#: ../src/empathy-event-manager.c:512 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s está a ligar-lhe. Deseja atender?" -#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618 +#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660 #, c-format msgid "Incoming call from %s" msgstr "Chamada a receber de %s" -#: ../src/empathy-event-manager.c:501 +#: ../src/empathy-event-manager.c:540 msgid "_Reject" msgstr "_Rejeitar" -#: ../src/empathy-event-manager.c:507 +#: ../src/empathy-event-manager.c:546 msgid "_Answer" msgstr "_Atender" -#: ../src/empathy-event-manager.c:618 +#: ../src/empathy-event-manager.c:660 #, c-format msgid "Incoming video call from %s" msgstr "Chamada vídeo a receber de %s" -#: ../src/empathy-event-manager.c:695 +#: ../src/empathy-event-manager.c:737 msgid "Room invitation" msgstr "Convite para uma sala" -#: ../src/empathy-event-manager.c:697 +#: ../src/empathy-event-manager.c:739 #, c-format msgid "Invitation to join %s" msgstr "Convite para entrar na sala %s" -#: ../src/empathy-event-manager.c:704 +#: ../src/empathy-event-manager.c:746 #, c-format msgid "%s is inviting you to join %s" msgstr "%s está a convidá-lo para entrar na sala %s" -#: ../src/empathy-event-manager.c:712 +#: ../src/empathy-event-manager.c:754 msgid "_Decline" msgstr "_Recusar" -#: ../src/empathy-event-manager.c:717 +#: ../src/empathy-event-manager.c:759 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Entrar" -#: ../src/empathy-event-manager.c:743 +#: ../src/empathy-event-manager.c:786 #, c-format msgid "%s invited you to join %s" msgstr "%s convidou-o a entrar na sala %s" -#: ../src/empathy-event-manager.c:749 +#: ../src/empathy-event-manager.c:792 #, c-format msgid "You have been invited to join %s" msgstr "Foi convidado para se juntar à sala %s" -#: ../src/empathy-event-manager.c:797 +#: ../src/empathy-event-manager.c:843 #, c-format msgid "Incoming file transfer from %s" msgstr "A receber transferência de ficheiro de %s" -#: ../src/empathy-event-manager.c:1005 +#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:369 +msgid "Password required" +msgstr "É necessária senha" + +#: ../src/empathy-event-manager.c:1069 #, c-format -msgid "Subscription requested by %s" -msgstr "Subscrição já pedida por %s" +msgid "%s would like permission to see when you are online" +msgstr "%s gostaria de ter permissão para o poder ver quando está ligado" -#: ../src/empathy-event-manager.c:1009 +#: ../src/empathy-event-manager.c:1073 #, c-format msgid "" "\n" @@ -3210,16 +3374,6 @@ msgstr "" "\n" "Mensagem: %s" -#: ../src/empathy-event-manager.c:1052 -#, c-format -msgid "%s is now offline." -msgstr "%s terminou a sessão." - -#: ../src/empathy-event-manager.c:1072 -#, c-format -msgid "%s is now online." -msgstr "%s iniciou uma sessão." - #. Translators: time left, when it is more than one hour #: ../src/empathy-ft-manager.c:99 #, c-format @@ -3311,15 +3465,15 @@ msgstr "A verificar a integridade de \"%s\"" msgid "Hashing \"%s\"" msgstr "A calcular o código de verificação de \"%s\"" -#: ../src/empathy-ft-manager.c:996 +#: ../src/empathy-ft-manager.c:1016 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1008 +#: ../src/empathy-ft-manager.c:1028 msgid "File" msgstr "Ficheiro" -#: ../src/empathy-ft-manager.c:1030 +#: ../src/empathy-ft-manager.c:1050 msgid "Remaining" msgstr "Remanescente" @@ -3346,43 +3500,51 @@ msgid "Import Accounts" msgstr "Importar Contas" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:292 +#: ../src/empathy-import-widget.c:301 msgid "Import" msgstr "Importar" -#: ../src/empathy-import-widget.c:301 +#: ../src/empathy-import-widget.c:310 msgid "Protocol" msgstr "Protocolo" -#: ../src/empathy-import-widget.c:325 +#: ../src/empathy-import-widget.c:334 msgid "Source" msgstr "Origem" -#: ../src/empathy-main-window.c:383 +#: ../src/empathy-main-window.c:386 +msgid "Provide Password" +msgstr "Indique a Senha" + +#: ../src/empathy-main-window.c:392 +msgid "Disconnect" +msgstr "Desligar" + +#: ../src/empathy-main-window.c:532 msgid "No match found" msgstr "Nenhuma equivalência encontrada" -#: ../src/empathy-main-window.c:535 +#: ../src/empathy-main-window.c:687 msgid "Reconnect" msgstr "Ligar Novamente" -#: ../src/empathy-main-window.c:541 +#: ../src/empathy-main-window.c:693 msgid "Edit Account" msgstr "Editar a Conta" -#: ../src/empathy-main-window.c:547 +#: ../src/empathy-main-window.c:699 msgid "Close" msgstr "Fechar" -#: ../src/empathy-main-window.c:1229 +#: ../src/empathy-main-window.c:1419 msgid "Contact" msgstr "Contacto" -#: ../src/empathy-main-window.c:1554 +#: ../src/empathy-main-window.c:1753 msgid "Contact List" msgstr "Lista de Contactos" -#: ../src/empathy-main-window.c:1663 +#: ../src/empathy-main-window.c:1868 msgid "Show and edit accounts" msgstr "Apresentar e editar contas" @@ -3391,8 +3553,8 @@ msgid "Contacts on a _Map" msgstr "Contactos num _Mapa" #: ../src/empathy-main-window.ui.h:2 -msgid "Context" -msgstr "Contexto" +msgid "Find in Contact _List" +msgstr "Procurar na _Lista de Contactos" #: ../src/empathy-main-window.ui.h:3 msgid "Join _Favorites" @@ -3466,17 +3628,21 @@ msgstr "Informação _Pessoal" msgid "_Room" msgstr "_Sala" -#: ../src/empathy-new-chatroom-dialog.c:379 +#: ../src/empathy-main-window.ui.h:27 +msgid "_Search for Contacts…" +msgstr "_Procurar por Contactos…" + +#: ../src/empathy-new-chatroom-dialog.c:337 msgid "Chat Room" msgstr "Sala de Diálogo" -#: ../src/empathy-new-chatroom-dialog.c:395 +#: ../src/empathy-new-chatroom-dialog.c:353 msgid "Members" 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:607 +#: ../src/empathy-new-chatroom-dialog.c:560 #, c-format msgid "" "%s\n" @@ -3489,16 +3655,16 @@ msgstr "" "Requer senha: %s\n" "Membros: %s" -#: ../src/empathy-new-chatroom-dialog.c:609 -#: ../src/empathy-new-chatroom-dialog.c:610 +#: ../src/empathy-new-chatroom-dialog.c:562 +#: ../src/empathy-new-chatroom-dialog.c:563 msgid "No" msgstr "Não" -#: ../src/empathy-new-chatroom-dialog.c:638 +#: ../src/empathy-new-chatroom-dialog.c:591 msgid "Could not start room listing" msgstr "Incapaz de iniciar uma listagem de salas" -#: ../src/empathy-new-chatroom-dialog.c:648 +#: ../src/empathy-new-chatroom-dialog.c:601 msgid "Could not stop room listing" msgstr "Incapaz de parar uma listagem de salas" @@ -3533,39 +3699,39 @@ msgstr "Lista de Salas" msgid "_Room:" msgstr "_Sala:" -#: ../src/empathy-preferences.c:138 +#: ../src/empathy-preferences.c:139 msgid "Message received" msgstr "Mensagem recebida" -#: ../src/empathy-preferences.c:139 +#: ../src/empathy-preferences.c:140 msgid "Message sent" msgstr "Mensagem enviada" -#: ../src/empathy-preferences.c:140 +#: ../src/empathy-preferences.c:141 msgid "New conversation" msgstr "Novo diálogo" -#: ../src/empathy-preferences.c:141 +#: ../src/empathy-preferences.c:142 msgid "Contact goes online" msgstr "Contacto iniciou uma sessão" -#: ../src/empathy-preferences.c:142 +#: ../src/empathy-preferences.c:143 msgid "Contact goes offline" msgstr "Contacto terminou a sessão" -#: ../src/empathy-preferences.c:143 +#: ../src/empathy-preferences.c:144 msgid "Account connected" msgstr "Conta ligou-se" -#: ../src/empathy-preferences.c:144 +#: ../src/empathy-preferences.c:145 msgid "Account disconnected" msgstr "Conta desligou-se" -#: ../src/empathy-preferences.c:445 +#: ../src/empathy-preferences.c:446 msgid "Language" msgstr "Idioma" -#: ../src/empathy-preferences.c:882 +#: ../src/empathy-preferences.c:875 msgid "Preferences" msgstr "Preferências" @@ -3708,26 +3874,6 @@ msgstr "_Publicar a localização para os meus contactos" msgid "_Reduce location accuracy" msgstr "_Reduzir a precisão da localização" -#: ../src/empathy-status-icon.c:141 -msgid "Respond" -msgstr "Responder" - -#: ../src/empathy-status-icon.c:147 -msgid "Reject" -msgstr "Rejeitar" - -#: ../src/empathy-status-icon.c:151 -msgid "Answer" -msgstr "Responder" - -#: ../src/empathy-status-icon.c:158 -msgid "Decline" -msgstr "Recusar" - -#: ../src/empathy-status-icon.c:162 -msgid "Accept" -msgstr "Aceitar" - #: ../src/empathy-status-icon.ui.h:2 msgid "Status" msgstr "Estado" @@ -3736,67 +3882,67 @@ msgstr "Estado" msgid "_Quit" msgstr "_Sair" -#: ../src/empathy-map-view.c:452 +#: ../src/empathy-map-view.c:442 msgid "Contact Map View" msgstr "Vista de Mapa de Contactos" -#: ../src/empathy-debug-window.c:1219 +#: ../src/empathy-debug-window.c:1218 msgid "Save" msgstr "Gravar" -#: ../src/empathy-debug-window.c:1395 +#: ../src/empathy-debug-window.c:1394 msgid "Debug Window" msgstr "Janela de Depuração" -#: ../src/empathy-debug-window.c:1475 +#: ../src/empathy-debug-window.c:1476 msgid "Pause" msgstr "Pausa" -#: ../src/empathy-debug-window.c:1487 +#: ../src/empathy-debug-window.c:1488 msgid "Level " msgstr "Nível " -#: ../src/empathy-debug-window.c:1507 +#: ../src/empathy-debug-window.c:1508 msgid "Debug" msgstr "Depuração" -#: ../src/empathy-debug-window.c:1513 +#: ../src/empathy-debug-window.c:1514 msgid "Info" msgstr "Informação" -#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568 +#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569 msgid "Message" msgstr "Mensagem" -#: ../src/empathy-debug-window.c:1525 +#: ../src/empathy-debug-window.c:1526 msgid "Warning" msgstr "Aviso" -#: ../src/empathy-debug-window.c:1531 +#: ../src/empathy-debug-window.c:1532 msgid "Critical" msgstr "Crítico" -#: ../src/empathy-debug-window.c:1537 +#: ../src/empathy-debug-window.c:1538 msgid "Error" msgstr "Erro" -#: ../src/empathy-debug-window.c:1556 +#: ../src/empathy-debug-window.c:1557 msgid "Time" msgstr "Hora" -#: ../src/empathy-debug-window.c:1559 +#: ../src/empathy-debug-window.c:1560 msgid "Domain" msgstr "Domínio" -#: ../src/empathy-debug-window.c:1561 +#: ../src/empathy-debug-window.c:1562 msgid "Category" msgstr "Categoria" -#: ../src/empathy-debug-window.c:1563 +#: ../src/empathy-debug-window.c:1564 msgid "Level" msgstr "Nível" -#: ../src/empathy-debug-window.c:1600 +#: ../src/empathy-debug-window.c:1601 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -3816,39 +3962,97 @@ msgstr "Seleccione um contacto a convidar para o diálogo:" msgid "Invite" msgstr "Convidar" -#: ../src/empathy-accounts.c:182 +#: ../src/empathy-accounts.c:183 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "" "Não apresentar quaisquer diálogos; realizar o trabalho (por ex, importar) e " "sair" -#: ../src/empathy-accounts.c:186 -msgid "Don't display any dialogs if there are any non-Salut accounts" +#: ../src/empathy-accounts.c:187 +msgid "" +"Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "" -"Não apresentar quaisquer diálogos se existirem quaisquer contas não-Salut" +"Não apresentar quaisquer diálogos excepto se apenas existirem contas \"Pessoas Próximas\"" -#: ../src/empathy-accounts.c:190 +#: ../src/empathy-accounts.c:191 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "Seleccionar inicialmente a conta indicada (por ex, gabble/jabber/" "foo_40exemplo_2eorg0)" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:193 msgid "<account-id>" msgstr "<id de conta>" -#: ../src/empathy-accounts.c:200 +#: ../src/empathy-accounts.c:198 msgid "- Empathy Accounts" msgstr "- Contas Empathy" -#: ../src/empathy-accounts.c:216 +#: ../src/empathy-accounts.c:237 msgid "Empathy Accounts" msgstr "Contas Empathy" -#: ../src/empathy-debugger.c:40 +#: ../src/empathy-debugger.c:66 msgid "Empathy Debugger" msgstr "Depurador Empathy" +#: ../src/empathy-chat.c:107 +msgid "- Empathy Chat Client" +msgstr "- Cliente de Diálogo Empathy" + +#: ../src/empathy-notifications-approver.c:184 +msgid "Respond" +msgstr "Responder" + +#: ../src/empathy-notifications-approver.c:190 +msgid "Reject" +msgstr "Rejeitar" + +#: ../src/empathy-notifications-approver.c:194 +msgid "Answer" +msgstr "Responder" + +#: ../src/empathy-notifications-approver.c:201 +#: ../src/empathy-notifications-approver.c:211 +msgid "Decline" +msgstr "Recusar" + +#: ../src/empathy-notifications-approver.c:205 +#: ../src/empathy-notifications-approver.c:216 +msgid "Accept" +msgstr "Aceitar" + +#~ msgid "Empathy has asked about importing accounts" +#~ msgstr "O Empathy questionou sobre importar contas" + +#~ msgid "" +#~ "Whether Empathy has asked about importing accounts from other programs." +#~ msgstr "" +#~ "Se o Empathy perguntou ou não sobre importar contas de outras aplicações." + +#~ msgid "The hash of the received file and the sent one do not match" +#~ msgstr "" +#~ "O código de verificação do ficheiro recebido não coincide com a do " +#~ "ficheiro enviado" + +#~ msgid "Add _New Preset" +#~ msgstr "Adicionar _Nova Pré-definição" + +#~ msgid "Saved Presets" +#~ msgstr "Pré-definições Gravadas" + +#~ msgid "Subscription requested by %s" +#~ msgstr "Subscrição já pedida por %s" + +#~ msgid "%s is now offline." +#~ msgstr "%s terminou a sessão." + +#~ msgid "%s is now online." +#~ msgstr "%s iniciou uma sessão." + +#~ msgid "Context" +#~ msgstr "Contexto" + #~ msgid "Use _Yahoo! Japan" #~ msgstr "Utilizar o _Yahoo! Japão" @@ -4183,10 +4387,6 @@ msgstr "Depurador Empathy" #~ msgid "unknown size" #~ msgstr "tamanho desconhecido" -#~| msgid "I would like to add you to my contact list." -#~ msgid "%s would like to send you a file" -#~ msgstr "%s gostaria de lhe enviar um ficheiro" - #~ msgid "Do you want to accept the file \"%s\" (%s)?" #~ msgstr "Deseja aceitar o ficheiro \"%s\" (%s)?" @@ -9,16 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: empathy trunk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-01 13:47+0200\n" -"PO-Revision-Date: 2011-02-24 20:31+0300\n" -"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n" +"POT-Creation-Date: 2011-03-07 23:43+0000\n" +"PO-Revision-Date: 2011-03-08 09:22+0400\n" +"Last-Translator: Yuri Myaseodov <omerta13@yandex.ru>\n" "Language-Team: <gnome-cyr@gnome.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Russian\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Generator: KBabel 1.11.4\n" @@ -44,23 +43,16 @@ msgid "Always open a separate chat window for new chats." msgstr "Всегда открывать новую беседу в новом окне." #: ../data/org.gnome.Empathy.gschema.xml.in.h:2 -msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." -msgstr "" -"Символ для добавления после псевдонима, если в беседе используется " -"автодополнение псевдонимов по клавише Tab." +msgid "Character to add after nickname when using nick completion (tab) in group chat." +msgstr "Символ для добавления после псевдонима, если в беседе используется автодополнение псевдонимов по клавише Tab." #: ../data/org.gnome.Empathy.gschema.xml.in.h:3 msgid "Chat window theme" msgstr "Тема окна беседы" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -msgid "" -"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "" -"Список языков, используемых при проверке орфографии, разделённых запятыми " -"(например «en, fr, ru»)." +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:5 msgid "Compact contact list" @@ -91,12 +83,8 @@ msgid "Display incoming events in the status area" msgstr "Показывать наступающие события в области состояния" #: ../data/org.gnome.Empathy.gschema.xml.in.h:12 -msgid "" -"Display incoming events in the status area. If false, present them to the " -"user immediately." -msgstr "" -"Показывать наступающие события в области состояния. Если ключ не установлен, " -"показывать их непосредственно пользователю." +msgid "Display incoming events in the status area. If false, present them to the user immediately." +msgstr "Показывать наступающие события в области состояния. Если ключ не установлен, показывать их непосредственно пользователю." #: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Empathy can publish the user's location" @@ -172,8 +160,7 @@ msgstr "Путь к используемой теме Adium" #: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Path of the Adium theme to use if the theme used for chat is Adium." -msgstr "" -"Путь к используемой теме Adium, если тема, используемая для беседы — Adium." +msgstr "Путь к используемой теме Adium, если тема, используемая для беседы — Adium." #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Play a sound for incoming messages" @@ -273,9 +260,7 @@ msgstr "Использовать тему для бесед" #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "" -"Может ли Empathy публиковать местоположение пользователя для его " -"собеседников." +msgstr "Может ли Empathy публиковать местоположение пользователя для его собеседников." #: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "Whether Empathy can use the GPS to guess the location." @@ -283,8 +268,7 @@ msgstr "Может ли Empathy использовать GPS для опреде #: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "" -"Может ли Empathy использовать сотовую сеть для определения местоположения." +msgstr "Может ли Empathy использовать сотовую сеть для определения местоположения." #: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "Whether Empathy can use the network to guess the location." @@ -296,61 +280,42 @@ msgstr "Был ли перенос журнала сообщений MSN." #: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "" -"Должен ли Empathy автоматически входить в ваши учётные записи при запуске." +msgstr "Должен ли Empathy автоматически входить в ваши учётные записи при запуске." #: ../data/org.gnome.Empathy.gschema.xml.in.h:62 -msgid "" -"Whether Empathy should go into away mode automatically if the user is idle." -msgstr "" -"Должен ли Empathy автоматически устанавливать статус «отошёл», когда " -"компьютер простаивает." +msgid "Whether Empathy should go into away mode automatically if the user is idle." +msgstr "Должен ли Empathy автоматически устанавливать статус «отошёл», когда компьютер простаивает." #: ../data/org.gnome.Empathy.gschema.xml.in.h:63 -msgid "" -"Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "" -"Должен ли Empathy уменьшать точность определения местоположения по причинам " -"приватности." +msgid "Whether Empathy should reduce the location's accuracy for privacy reasons." +msgstr "Должен ли Empathy уменьшать точность определения местоположения по причинам приватности." #: ../data/org.gnome.Empathy.gschema.xml.in.h:64 -msgid "" -"Whether 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 "Использовать ли аватар собеседника в качестве значка окна беседы." #: ../data/org.gnome.Empathy.gschema.xml.in.h:65 -msgid "" -"Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "" -"Должны ли быть включены инструменты разработчика WebKit, например Web " -"Inspector." +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:66 -msgid "" -"Whether connectivity managers should be used to automatically disconnect/" -"reconnect." -msgstr "" -"Использовать ли менеджеры связности для автоматического отключения или " -"переподключения." +msgid "Whether connectivity managers should be used to automatically disconnect/reconnect." +msgstr "Использовать ли менеджеры связности для автоматического отключения или переподключения." #: ../data/org.gnome.Empathy.gschema.xml.in.h:67 -msgid "" -"Whether to check words typed against the languages you want to check with." +msgid "Whether to check words typed against the languages you want to check with." msgstr "Проверять ли введённые слова из списка языков для проверки орфографии." #: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Whether to convert smileys into graphical images in conversations." -msgstr "" -"Преобразовывать ли текстовые улыбки (смайлы) в беседах в графические " -"изображения." +msgstr "Преобразовывать ли текстовые улыбки (смайлы) в беседах в графические изображения." #: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "Воспроизводить ли звук для уведомления о входе собеседников в сеть." #: ../data/org.gnome.Empathy.gschema.xml.in.h:70 -msgid "" -"Whether to play a sound to notify of contacts logging out of the network." +msgid "Whether to play a sound to notify of contacts logging out of the network." msgstr "Воспроизводить ли звук для уведомления о выходе собеседников из сети." #: ../data/org.gnome.Empathy.gschema.xml.in.h:71 @@ -379,36 +344,27 @@ msgstr "Воспроизводить ли звук при выходе из се #: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to play sound notifications when away or busy." -msgstr "" -"Воспроизводить ли звуковые уведомления в состояниях «отошёл» или «занят»." +msgstr "Воспроизводить ли звуковые уведомления в состояниях «отошёл» или «занят»." #: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to show a popup notification when a contact goes offline." -msgstr "" -"Показывать ли всплывающее уведомление, когда собеседник выходит из сети." +msgstr "Показывать ли всплывающее уведомление, когда собеседник выходит из сети." #: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "Whether to show a popup notification when a contact goes online." -msgstr "" -"Показывать ли всплывающее уведомление, когда собеседник выходит в сеть." +msgstr "Показывать ли всплывающее уведомление, когда собеседник выходит в сеть." #: ../data/org.gnome.Empathy.gschema.xml.in.h:80 -msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." -msgstr "" -"Показывать ли всплывающее уведомление о получении нового сообщения, когда " -"беседа уже ведётся, но не находится в фокусе." +msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused." +msgstr "Показывать ли всплывающее уведомление о получении нового сообщения, когда беседа уже ведётся, но не находится в фокусе." #: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to show a popup notification when receiving a new message." msgstr "Показывать ли всплывающее уведомление при получении нового сообщения." #: ../data/org.gnome.Empathy.gschema.xml.in.h:82 -msgid "" -"Whether to show avatars for contacts in the contact list and chat windows." -msgstr "" -"Показывать ли аватары собеседников в списке собеседников и окнах беседы." +msgid "Whether to show avatars for contacts in the contact list and chat windows." +msgstr "Показывать ли аватары собеседников в списке собеседников и окнах беседы." #: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to show contacts that are offline in the contact list." @@ -431,26 +387,16 @@ msgid "Whether to show the contact list in compact mode." msgstr "Показывать ли компактный список собеседников." #: ../data/org.gnome.Empathy.gschema.xml.in.h:88 -msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." -msgstr "" -"Показывать ли диалоговое окно при закрытии главного окна с помощью кнопки «x» " -"в строке заголовка." +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:89 msgid "Whether to use the theme for chat rooms." msgstr "Использовать ли темы для комнат." #: ../data/org.gnome.Empathy.gschema.xml.in.h:90 -msgid "" -"Which criterion to use when sorting the contact list. Default is to sort by " -"the contact's name with the value \"name\". A value of \"state\" will sort " -"the contact list by state." -msgstr "" -"Критерий упорядочивания списка собеседников. По умолчанию упорядочивается по " -"имени собеседника — «name». При значении «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 "Критерий упорядочивания списка собеседников. По умолчанию упорядочивается по имени собеседника — «name». При значении «state» список будет упорядочен по статусу." #: ../data/empathy-accounts.desktop.in.in.h:1 msgid "Manage Messaging and VoIP accounts" @@ -506,7 +452,8 @@ msgstr "Во время передачи файла возникла ошибк msgid "The other participant is unable to transfer the file" msgstr "Собеседник не может передавать файлы" -#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383 +#: ../libempathy/empathy-tp-file.c:405 +#: ../libempathy/empathy-utils.c:383 msgid "Unknown reason" msgstr "Неизвестная причина" @@ -543,19 +490,23 @@ msgstr "Неизвестно" msgid "No reason specified" msgstr "Причина не указана" -#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413 +#: ../libempathy/empathy-utils.c:357 +#: ../libempathy/empathy-utils.c:413 msgid "Status is set to offline" msgstr "Установлен статус «не в сети»" -#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393 +#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:393 msgid "Network error" msgstr "Ошибка сети" -#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395 +#: ../libempathy/empathy-utils.c:361 +#: ../libempathy/empathy-utils.c:395 msgid "Authentication failed" msgstr "Аутентификация не удалась" -#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397 +#: ../libempathy/empathy-utils.c:363 +#: ../libempathy/empathy-utils.c:397 msgid "Encryption error" msgstr "Ошибка шифрования" @@ -563,31 +514,38 @@ msgstr "Ошибка шифрования" msgid "Name in use" msgstr "Имя уже занято" -#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399 +#: ../libempathy/empathy-utils.c:367 +#: ../libempathy/empathy-utils.c:399 msgid "Certificate not provided" msgstr "Сертификат недоступен" -#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401 +#: ../libempathy/empathy-utils.c:369 +#: ../libempathy/empathy-utils.c:401 msgid "Certificate untrusted" msgstr "Сертификат не является доверенным" -#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403 +#: ../libempathy/empathy-utils.c:371 +#: ../libempathy/empathy-utils.c:403 msgid "Certificate expired" msgstr "Сертификат устарел" -#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405 +#: ../libempathy/empathy-utils.c:373 +#: ../libempathy/empathy-utils.c:405 msgid "Certificate not activated" msgstr "Сертификат не активирован" -#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407 +#: ../libempathy/empathy-utils.c:375 +#: ../libempathy/empathy-utils.c:407 msgid "Certificate hostname mismatch" msgstr "Имена узлов сертификатов не совпадают" -#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409 +#: ../libempathy/empathy-utils.c:377 +#: ../libempathy/empathy-utils.c:409 msgid "Certificate fingerprint mismatch" msgstr "Отпечатки сертификатов не совпадают" -#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411 +#: ../libempathy/empathy-utils.c:379 +#: ../libempathy/empathy-utils.c:411 msgid "Certificate self-signed" msgstr "Сертификат подписан самостоятельно" @@ -620,8 +578,7 @@ msgid "This resource is already connected to the server" msgstr "Этот ресурс уже подключён к серверу" #: ../libempathy/empathy-utils.c:427 -msgid "" -"Connection has been replaced by a new connection using the same resource" +msgid "Connection has been replaced by a new connection using the same resource" msgstr "Подключение было замещено новым подключение с этим же ресурсом" #: ../libempathy/empathy-utils.c:430 @@ -630,26 +587,19 @@ msgstr "Учётная запись уже существует на серве #: ../libempathy/empathy-utils.c:432 msgid "Server is currently too busy to handle the connection" -msgstr "" -"В настоящий момент сервер слишком загружен, чтобы обработать подключение." +msgstr "В настоящий момент сервер слишком загружен, чтобы обработать подключение." #: ../libempathy/empathy-utils.c:434 msgid "Certificate has been revoked" msgstr "Сертификат аннулирован" #: ../libempathy/empathy-utils.c:436 -msgid "" -"Certificate uses an insecure cipher algorithm or is cryptographically weak" -msgstr "" -"Сертификат использует небезопасный алгоритм шифра или криптографически слаб" +msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak" +msgstr "Сертификат использует небезопасный алгоритм шифра или криптографически слаб" #: ../libempathy/empathy-utils.c:439 -msgid "" -"The length of the server certificate, or the depth of the server certificate " -"chain, exceed the limits imposed by the cryptography library" -msgstr "" -"Длина сертификата сервера или глубина цепочки сертификатов сервера превышает " -"предел, установленный криптографической библиотекой" +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:602 #: ../libempathy-gtk/empathy-contact-list-store.h:73 @@ -778,7 +728,7 @@ msgstr "_Войти" #. Account and Identifier #: ../libempathy-gtk/empathy-account-widget.c:1990 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:451 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:515 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 #: ../libempathy-gtk/empathy-individual-widget.c:1479 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 @@ -1047,13 +997,11 @@ msgstr "Ре_сурс:" msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n" -"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a " -"Facebook username if you don't have one." +"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one." msgstr "" "Это ваше имя пользователя, а не имя для входа в систему Facebook.\n" "Если ваш адрес facebook.com/<b>badger</b>, введите <b>badger</b>.\n" -"Используйте <a href=\"http://www.facebook.com/username/\">эту страницу</a> " -"для выбора имени пользователя Facebook, если у вас его ещё нет." +"Используйте <a href=\"http://www.facebook.com/username/\">эту страницу</a> для выбора имени пользователя Facebook, если у вас его ещё нет." #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 msgid "Use old SS_L" @@ -1226,8 +1174,7 @@ msgstr "Не удалось преобразовать изображение" #: ../libempathy-gtk/empathy-avatar-chooser.c:449 msgid "None of the accepted image formats are supported on your system" -msgstr "" -"Ни один из разрешённых форматов изображений не поддерживается в вашей системе" +msgstr "Ни один из разрешённых форматов изображений не поддерживается в вашей системе" #: ../libempathy-gtk/empathy-avatar-chooser.c:936 msgid "Select Your Avatar Image" @@ -1278,10 +1225,8 @@ msgid "/j <chat room ID>: join a new chat room" msgstr "/j <ID комнаты>: войти в новую комнату" #: ../libempathy-gtk/empathy-chat.c:923 -msgid "" -"/part [<chat room ID>] [<reason>]: leave the chat room, by default the " -"current one" -msgstr "" +msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one" +msgstr "/part [<ID комнаты>] [<причина>]: покинуть комнату, по умолчанию — текущую" #: ../libempathy-gtk/empathy-chat.c:928 msgid "/query <contact ID> [<message>]: open a private chat" @@ -1300,22 +1245,12 @@ msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <сообщение>: отправить сообщение о ДЕЙСТВИИ" #: ../libempathy-gtk/empathy-chat.c:940 -msgid "" -"/say <message>: send <message> to the current conversation. This is used to " -"send a message starting with a '/'. For example: \"/say /join is used to " -"join a new chat room\"" -msgstr "" -"/say <сообщение>: отправить <сообщение> в текущей беседе. Используется для " -"отправки сообщения, начинающегося с «/». Например: «/say /join используется " -"для входа в новую комнату»" +msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\"" +msgstr "/say <сообщение>: отправить <сообщение> в текущей беседе. Используется для отправки сообщения, начинающегося с «/». Например: «/say /join используется для входа в новую комнату»" #: ../libempathy-gtk/empathy-chat.c:945 -msgid "" -"/help [<command>]: show all supported commands. If <command> is defined, " -"show its usage." -msgstr "" -"/help [<команда>]: показать все поддерживаемые команды. Если <команда> " -"определена, показать её использование." +msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage." +msgstr "/help [<команда>]: показать все поддерживаемые команды. Если <команда> определена, показать её использование." #: ../libempathy-gtk/empathy-chat.c:955 #, c-format @@ -1359,7 +1294,8 @@ msgstr "неизвестно" msgid "Error sending message '%s': %s" msgstr "Ошибка при отправке сообщения «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:1344 ../src/empathy-chat-window.c:704 +#: ../libempathy-gtk/empathy-chat.c:1344 +#: ../src/empathy-chat-window.c:704 msgid "Topic:" msgstr "Тема:" @@ -1500,7 +1436,8 @@ msgstr "Эта комната защищена паролем:" msgid "Join" msgstr "Войти" -#: ../libempathy-gtk/empathy-chat.c:3505 ../src/empathy-event-manager.c:1144 +#: ../libempathy-gtk/empathy-chat.c:3505 +#: ../src/empathy-event-manager.c:1144 msgid "Connected" msgstr "Соединён" @@ -1656,15 +1593,20 @@ msgid "_Invite to Chat Room" msgstr "_Пригласить в комнату" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:445 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:508 msgid "Search contacts" msgstr "Поиск собеседников" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:473 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:538 msgid "Search: " msgstr "Поиск:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:534 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:596 +#| msgid "_Add Contact…" +msgid "_Add Contact" +msgstr "_Добавить собеседника" + +#: ../libempathy-gtk/empathy-contact-search-dialog.c:614 msgid "No contacts found" msgstr "Собеседники не найдены" @@ -1855,7 +1797,7 @@ msgstr "<b>Местоположение</b> от (дата)\t" #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 #: ../libempathy-gtk/empathy-individual-widget.c:1305 msgid "Alias:" -msgstr "Прозвище:" +msgstr "Псевдоним:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:4 msgid "Client Information" @@ -1863,7 +1805,7 @@ msgstr "Информация о клиенте" #: ../libempathy-gtk/empathy-contact-widget.ui.h:5 msgid "Client:" -msgstr "Программа:" +msgstr "Программа-клиент:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 #: ../libempathy-gtk/empathy-individual-widget.ui.h:2 @@ -1895,12 +1837,8 @@ msgid "Groups" msgstr "Группы" #: ../libempathy-gtk/empathy-groups-widget.c:344 -msgid "" -"Select the groups you want this contact to appear in. Note that you can " -"select more than one group or no groups." -msgstr "" -"Выберите группы, в которых должен появиться собеседник. Можно выбрать больше " -"одной группы или не выбирать вообще." +msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups." +msgstr "Выберите группы, в которых должен появиться собеседник. Можно выбрать больше одной группы или не выбирать вообще." #: ../libempathy-gtk/empathy-groups-widget.c:363 msgid "_Add Group" @@ -1912,7 +1850,7 @@ msgid "Select" msgstr "Выбрать" #: ../libempathy-gtk/empathy-groups-widget.c:408 -#: ../src/empathy-main-window.c:1432 +#: ../src/empathy-main-window.c:1437 msgid "Group" msgstr "Группа" @@ -1955,12 +1893,8 @@ msgstr "_Объединить контакты…" #: ../libempathy-gtk/empathy-individual-view.c:2425 #, 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»? Это приведёт к удалению всех " -"контактов, которые являются частью этого связанного контакта." +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:1650 #, c-format @@ -2016,8 +1950,7 @@ msgid "_Unlink…" msgstr "_Разъединить…" #: ../libempathy-gtk/empathy-linking-dialog.c:121 -msgid "" -"Completely split the displayed linked contacts into the separate contacts." +msgid "Completely split the displayed linked contacts into the separate contacts." msgstr "Полностью разъединить связанные контакты на отдельные контакты." #. Add button @@ -2034,12 +1967,8 @@ 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 "" -"Действительно разъединить эти связанные контакты? Это полностью разделит " -"связанные контакты на отдельные контакты." +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)" @@ -2276,8 +2205,7 @@ msgid "The certificate is self-signed." msgstr "Сертификат подписан самостоятельно." #: ../libempathy-gtk/empathy-tls-dialog.c:177 -msgid "" -"The certificate has been revoked by the issuing Certification Authority." +msgid "The certificate has been revoked by the issuing Certification Authority." msgstr "Сертификат отозван центром сертификации." #: ../libempathy-gtk/empathy-tls-dialog.c:181 @@ -2326,7 +2254,16 @@ msgstr "Невозможно открыть URL" msgid "Select a file" msgstr "Выберите файл" -#: ../libempathy-gtk/empathy-ui-utils.c:1871 +#: ../libempathy-gtk/empathy-ui-utils.c:1874 +msgid "Insufficient free space to save file" +msgstr "Недостаточно свободного места для сохранения файла" + +#: ../libempathy-gtk/empathy-ui-utils.c:1882 +#, 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:1926 #, c-format msgid "Incoming file from %s" msgstr "Входящий файл от %s" @@ -2533,50 +2470,25 @@ msgstr "Ошибка связи с диспетчером учётных зап #: ../src/empathy.c:501 #, c-format msgid "" -"There was an error while trying to connect to the Telepathy Account Manager. " -"The error was:\n" +"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n" "\n" "%s" msgstr "" -"Во время попытки связаться с диспетчером учётных записей Telepathy произошла " -"ошибка:\n" +"Во время попытки связаться с диспетчером учётных записей Telepathy произошла ошибка:\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 "" -"Empathy — свободная программа, вы можете распространять и/или модифицировать " -"её на условиях, указанных в GNU General Public License опубликованой Free " -"Software Foundation; либо в версии 2 или (по вашему выбору) любой более " -"поздней версии." +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 — свободная программа, вы можете распространять и/или модифицировать её на условиях, указанных в GNU General Public License опубликованой Free Software Foundation; либо в версии 2 или (по вашему выбору) любой более поздней версии." #: ../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 распространяется в расчёте на то, что будет полезной, " -"однако БЕЗ КАКИХ ЛИБО ГАРАНТИЙ в том числе подразумеваемых гарантий " -"ПОЛЕЗНОСТИ или ПРИГОДНОСТИ ДЛЯ КАКИХ_ЛИБО ЦЕЛЕЙ. Смотрите GNU General Public " -"License." +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 распространяется в расчёте на то, что будет полезной, однако БЕЗ КАКИХ ЛИБО ГАРАНТИЙ в том числе подразумеваемых гарантий ПОЛЕЗНОСТИ или ПРИГОДНОСТИ ДЛЯ КАКИХ_ЛИБО ЦЕЛЕЙ. Смотрите GNU General Public License." #: ../src/empathy-about-dialog.c:89 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " -"Street, Fifth Floor, Boston, MA 02110-130159 USA" -msgstr "" -"Вы должны были получить копию GNU General Public License вместе с программой " -"Empathy. Если этого не произошло, напишите в Фонд Свободного Программного " -"Обеспечения: Free Software Foundation, Inc., 51 Franklin Street, Fifth " -"Floor, Boston, MA 02110-130159 USA" +msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" +msgstr "Вы должны были получить копию 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 msgid "An Instant Messaging client for GNOME" @@ -2612,13 +2524,8 @@ 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 "" -"Вы можете вернуться назад и попытаться ввести информацию об учётной записи " -"ещё раз, или закрыть этот мастер и добавить учётные записи позже из меню " -"«Правка»." +msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu." +msgstr "Вы можете вернуться назад и попытаться ввести информацию об учётной записи ещё раз, или закрыть этот мастер и добавить учётные записи позже из меню «Правка»." #: ../src/empathy-account-assistant.c:220 #: ../src/empathy-account-assistant.c:1268 @@ -2650,16 +2557,8 @@ 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 "" -"С помощью Empathy можно общаться с людьми, находящимися поблизости, а также " -"с друзьями и коллегами, использующими Google Talk, AIM, Windows Live и " -"многие другие программы. При наличии микрофона и веб-камеры можно совершать " -"аудио- и видеовызовы." +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 msgid "Do you have an account you've been using with another chat program?" @@ -2696,17 +2595,8 @@ msgid "No, that's all for now" msgstr "Нет, на данный момент это всё" #: ../src/empathy-account-assistant.c:1082 -msgid "" -"Empathy can automatically discover and chat with the people connected on the " -"same network as you. If you want to use this feature, please check that the " -"details below are correct. You can easily change these details later or " -"disable this feature by using the 'Accounts' dialog" -msgstr "" -"Empathy может автоматически найти людей, подключённых к той же сети, что и " -"вы. Если вы хотите использовать эту возможность, отметьте, что информация, " -"представленная ниже является корректной. Вы можете изменить эту информацию " -"позже или отключить эту возможность, используя диалоговое окно «Учётные " -"записи»." +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:1088 #: ../src/empathy-account-assistant.c:1144 @@ -2714,20 +2604,13 @@ msgid "Edit->Accounts" msgstr "Правка->Учётные записи" #: ../src/empathy-account-assistant.c:1104 -msgid "I don't want to enable this feature for now" -msgstr "Я не хочу сейчас включать эту возможность" +#| msgid "I don't want to enable this feature for now" +msgid "I do _not want to enable this feature for now" +msgstr "_Я не хочу сейчас включать эту возможность" #: ../src/empathy-account-assistant.c:1140 -msgid "" -"You won't be able to chat with people connected to your local network, as " -"telepathy-salut is not installed. If you want to enable this feature, please " -"install the telepathy-salut package and create a People Nearby account from " -"the Accounts dialog" -msgstr "" -"Вы не можете общаться с людьми, подключёнными к вашей локальной сети, т. к. " -"telepathy-salut не установлен. Если вы хотите включить эту возможность, " -"установите пакет telepathy-salut и создайте учётную запись «Люди поблизости» " -"в диалоговом окне «Учётные записи»" +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:1146 msgid "telepathy-salut not installed" @@ -2844,12 +2727,8 @@ msgid "Protocol:" msgstr "Протокол:" #: ../src/empathy-accounts-dialog.ui.h:4 -msgid "" -"To add a new account, you first have to install a backend for each protocol " -"you want to use." -msgstr "" -"Чтобы добавить новую учётную запись установите поддержку каждого " -"необходимого протокола." +msgid "To add a new account, you first have to install a backend for each protocol you want to use." +msgstr "Чтобы добавить новую учётную запись установите поддержку каждого необходимого протокола." #: ../src/empathy-accounts-dialog.ui.h:5 msgid "_Add…" @@ -2960,59 +2839,35 @@ msgstr "Информация о собеседнике" #: ../src/empathy-streamed-media-window.c:2358 #, c-format -msgid "" -"%s's software does not understand any of the audio formats supported by your " -"computer" -msgstr "" -"Программное обеспечение %s не понимает аудиоформаты, поддерживаемые вашим " -"компьютером" +msgid "%s's software does not understand any of the audio formats supported by your computer" +msgstr "Программное обеспечение %s не понимает аудиоформаты, поддерживаемые вашим компьютером" #: ../src/empathy-streamed-media-window.c:2363 #, c-format -msgid "" -"%s's software does not understand any of the video formats supported by your " -"computer" -msgstr "" -"Программное обеспечение %s не понимает видеоформаты, поддерживаемые вашим " -"компьютером" +msgid "%s's software does not understand any of the video formats supported by your computer" +msgstr "Программное обеспечение %s не понимает видеоформаты, поддерживаемые вашим компьютером" #: ../src/empathy-streamed-media-window.c:2369 #, 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. Один из вас может находиться в сети, " -"которая не поддерживает прямые подключения." +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:2375 msgid "There was a failure on the network" msgstr "Сбой сети" #: ../src/empathy-streamed-media-window.c:2379 -msgid "" -"The audio formats necessary for this call are not installed on your computer" -msgstr "" -"Аудиоформаты, необходимые для этого вызова, не установлены на вашем " -"компьютере" +msgid "The audio formats necessary for this call are not installed on your computer" +msgstr "Аудиоформаты, необходимые для этого вызова, не установлены на вашем компьютере" #: ../src/empathy-streamed-media-window.c:2382 -msgid "" -"The video formats necessary for this call are not installed on your computer" -msgstr "" -"Видеоформаты, необходимые для этого вызова, не установлены на вашем " -"компьютере" +msgid "The video formats necessary for this call are not installed on your computer" +msgstr "Видеоформаты, необходимые для этого вызова, не установлены на вашем компьютере" #: ../src/empathy-streamed-media-window.c:2392 #, c-format -msgid "" -"Something unexpected happened in a Telepathy component. Please <a href=\"%s" -"\">report this bug</a> and attach logs gathered from the 'Debug' window in " -"the Help menu." -msgstr "" -"Что-то неожиданное случилось с компонентом Telepathy. <a href=\"%s" -"\">Сообщите об этой ошибке</a> и прикрепите журналы, собранные из окна " -"отладки в меню «Справка»." +msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu." +msgstr "Что-то неожиданное случилось с компонентом Telepathy. <a href=\"%s\">Сообщите об этой ошибке</a> и прикрепите журналы, собранные из окна отладки в меню «Справка»." #: ../src/empathy-streamed-media-window.c:2400 msgid "There was a failure in the call engine" @@ -3122,11 +2977,13 @@ msgstr "Предварительный просмотр видео" msgid "_Call" msgstr "_Вызов" -#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28 +#: ../src/empathy-call-window.ui.h:25 +#: ../src/empathy-main-window.ui.h:28 msgid "_View" msgstr "_Вид" -#: ../src/empathy-chat-window.c:469 ../src/empathy-chat-window.c:489 +#: ../src/empathy-chat-window.c:469 +#: ../src/empathy-chat-window.c:489 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -3194,7 +3051,8 @@ msgstr "Передвинуть вкладку в_право" msgid "Notify for All Messages" msgstr "Уведомлять обо всех сообщениях" -#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16 +#: ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-main-window.ui.h:16 msgid "_Contents" msgstr "_Содержание" @@ -3206,7 +3064,8 @@ msgstr "_Беседа" msgid "_Detach Tab" msgstr "_Отсоединить вкладку" -#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18 +#: ../src/empathy-chat-window.ui.h:12 +#: ../src/empathy-main-window.ui.h:18 msgid "_Edit" msgstr "_Правка" @@ -3214,7 +3073,8 @@ msgstr "_Правка" msgid "_Favorite Chat Room" msgstr "_Избранная комната" -#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20 +#: ../src/empathy-chat-window.ui.h:14 +#: ../src/empathy-main-window.ui.h:20 msgid "_Help" msgstr "_Справка" @@ -3226,7 +3086,8 @@ msgstr "На след_ующую вкладку" msgid "_Previous Tab" msgstr "На пред_ыдущую вкладку" -#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5 +#: ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-status-icon.ui.h:5 msgid "_Show Contact List" msgstr "_Показывать список собеседников" @@ -3272,7 +3133,8 @@ msgstr "%s делает видеовызов. Хотите ответить?" msgid "%s is calling you. Do you want to answer?" msgstr "%s вызывает вас. Хотите ответить?" -#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660 +#: ../src/empathy-event-manager.c:515 +#: ../src/empathy-event-manager.c:660 #, c-format msgid "Incoming call from %s" msgstr "Входящий вызов от %s" @@ -3328,7 +3190,8 @@ msgstr "Вам предложили присоединиться к %s" msgid "Incoming file transfer from %s" msgstr "Входящий файл от %s" -#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367 +#: ../src/empathy-event-manager.c:1013 +#: ../src/empathy-main-window.c:369 msgid "Password required" msgstr "Требуется пароль" @@ -3423,16 +3286,19 @@ msgstr "«%s» отправлен %s" msgid "File transfer completed" msgstr "Передача файла завершена" -#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782 +#: ../src/empathy-ft-manager.c:615 +#: ../src/empathy-ft-manager.c:782 msgid "Waiting for the other participant's response" msgstr "Ожидание ответа от других участников" -#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 +#: ../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:644 ../src/empathy-ft-manager.c:682 +#: ../src/empathy-ft-manager.c:644 +#: ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Хэширование «%s»" @@ -3455,16 +3321,11 @@ msgstr "Передачи файлов" #: ../src/empathy-ft-manager.ui.h:2 msgid "Remove completed, canceled and failed file transfers from the list" -msgstr "" -"Удалить из списка завершённые, отменённые или прерванные передачи файлов" +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." +msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin." +msgstr "Не найдено учётных записей для импортирования. На данный момент возможно импортировать учётные записи только из Pidgin." #: ../src/empathy-import-dialog.c:199 msgid "Import Accounts" @@ -3483,39 +3344,39 @@ msgstr "Протокол" msgid "Source" msgstr "Источник" -#: ../src/empathy-main-window.c:384 +#: ../src/empathy-main-window.c:386 msgid "Provide Password" msgstr "Указать пароль" -#: ../src/empathy-main-window.c:390 +#: ../src/empathy-main-window.c:392 msgid "Disconnect" msgstr "Разъединить" -#: ../src/empathy-main-window.c:530 +#: ../src/empathy-main-window.c:532 msgid "No match found" msgstr "Нет совпадений" -#: ../src/empathy-main-window.c:685 +#: ../src/empathy-main-window.c:687 msgid "Reconnect" msgstr "Переподключиться" -#: ../src/empathy-main-window.c:691 +#: ../src/empathy-main-window.c:693 msgid "Edit Account" msgstr "Правка учётной записи" -#: ../src/empathy-main-window.c:697 +#: ../src/empathy-main-window.c:699 msgid "Close" msgstr "Закрыть" -#: ../src/empathy-main-window.c:1414 +#: ../src/empathy-main-window.c:1419 msgid "Contact" msgstr "Собеседник" -#: ../src/empathy-main-window.c:1748 +#: ../src/empathy-main-window.c:1753 msgid "Contact List" msgstr "Список собеседников" -#: ../src/empathy-main-window.c:1863 +#: ../src/empathy-main-window.c:1868 msgid "Show and edit accounts" msgstr "_Показать и редактировать учётные записи" @@ -3539,7 +3400,8 @@ msgstr "Настроить избранные" msgid "N_ormal Size" msgstr "Обычный _размер" -#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1 +#: ../src/empathy-main-window.ui.h:6 +#: ../src/empathy-status-icon.ui.h:1 msgid "New _Call…" msgstr "Новый _вызов…" @@ -3583,7 +3445,8 @@ msgstr "Передачи _файлов" msgid "_Join…" msgstr "_Войти…" -#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3 +#: ../src/empathy-main-window.ui.h:22 +#: ../src/empathy-status-icon.ui.h:3 msgid "_New Conversation…" msgstr "Новая _беседа…" @@ -3644,19 +3507,12 @@ msgid "Couldn't load room list" msgstr "Не удалось загрузить список комнат" #: ../src/empathy-new-chatroom-dialog.ui.h:3 -msgid "" -"Enter the room name to join here or click on one or more rooms in the list." -msgstr "" -"Введите имя беседы, к которой хотите присоединиться, или выберите одну (или " -"более) в списке." +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 "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" @@ -3771,14 +3627,8 @@ msgid "Privacy" msgstr "Приватность" #: ../src/empathy-preferences.ui.h:18 -msgid "" -"Reduced location accuracy means that nothing more precise than your city, " -"state and country will be published. GPS coordinates will be accurate to 1 " -"decimal place." -msgstr "" -"Примерное определение местоположения означает, что публикуется только ваш " -"город, регион и страна. Координаты GPS будут отображаться с точностью до 1 " -"знака после запятой." +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 msgid "Show _smileys as images" @@ -3797,11 +3647,8 @@ msgid "Spell Checking" msgstr "Проверка орфографии" #: ../src/empathy-preferences.ui.h:23 -msgid "" -"The list of languages reflects only the languages for which you have a " -"dictionary installed." -msgstr "" -"В этом списке показаны только те языки, для которых установлены словари." +msgid "The list of languages reflects only the languages for which you have a dictionary installed." +msgstr "В этом списке показаны только те языки, для которых установлены словари." #: ../src/empathy-preferences.ui.h:24 msgid "Themes" @@ -3864,60 +3711,58 @@ msgstr "Сохранить" msgid "Debug Window" msgstr "Окно отладки" -#: ../src/empathy-debug-window.c:1474 +#: ../src/empathy-debug-window.c:1476 msgid "Pause" msgstr "Пауза" -#: ../src/empathy-debug-window.c:1486 +#: ../src/empathy-debug-window.c:1488 msgid "Level " msgstr "Уровень" -#: ../src/empathy-debug-window.c:1506 +#: ../src/empathy-debug-window.c:1508 msgid "Debug" msgstr "Отладка" -#: ../src/empathy-debug-window.c:1512 +#: ../src/empathy-debug-window.c:1514 msgid "Info" msgstr "Информация" -#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567 +#: ../src/empathy-debug-window.c:1520 +#: ../src/empathy-debug-window.c:1569 msgid "Message" msgstr "Сообщение" -#: ../src/empathy-debug-window.c:1524 +#: ../src/empathy-debug-window.c:1526 msgid "Warning" msgstr "Предупреждение" -#: ../src/empathy-debug-window.c:1530 +#: ../src/empathy-debug-window.c:1532 msgid "Critical" msgstr "Критическая ошибка" -#: ../src/empathy-debug-window.c:1536 +#: ../src/empathy-debug-window.c:1538 msgid "Error" msgstr "Ошибка" -#: ../src/empathy-debug-window.c:1555 +#: ../src/empathy-debug-window.c:1557 msgid "Time" msgstr "Время" -#: ../src/empathy-debug-window.c:1558 +#: ../src/empathy-debug-window.c:1560 msgid "Domain" msgstr "Домен" -#: ../src/empathy-debug-window.c:1560 +#: ../src/empathy-debug-window.c:1562 msgid "Category" msgstr "Категория" -#: ../src/empathy-debug-window.c:1562 +#: ../src/empathy-debug-window.c:1564 msgid "Level" msgstr "Уровень" -#: ../src/empathy-debug-window.c:1599 -msgid "" -"The selected connection manager does not support the remote debugging " -"extension." -msgstr "" -"Выбранный менеджер соединений не поддерживает расширение удалённой отладки." +#: ../src/empathy-debug-window.c:1601 +msgid "The selected connection manager does not support the remote debugging extension." +msgstr "Выбранный менеджер соединений не поддерживает расширение удалённой отладки." #: ../src/empathy-invite-participant-dialog.c:34 #: ../src/empathy-invite-participant-dialog.c:48 @@ -3934,22 +3779,15 @@ 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 "" -"Don't display any dialogs unless there are only \"People Nearby\" accounts" -msgstr "" -"Не показывать диалоговые окна до тех пор, пока используются только уч. " -"записи «Люди поблизости»" +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)" +msgstr "Сначала выберите учётную запись (например, gabble/jabber/foo_40example_2eorg0)" #: ../src/empathy-accounts.c:193 msgid "<account-id>" @@ -3993,5 +3831,3 @@ msgstr "Отклонить" msgid "Accept" msgstr "Принять" -#~ msgid "Context" -#~ msgstr "Содержание" diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c index d724a40ff..ee8adc406 100644 --- a/src/empathy-call-observer.c +++ b/src/empathy-call-observer.c @@ -20,19 +20,28 @@ #include <config.h> +#include <glib/gi18n-lib.h> + #include <telepathy-glib/telepathy-glib.h> +#include <libnotify/notification.h> + #include <libempathy/empathy-channel-factory.h> #include <libempathy/empathy-utils.h> +#include <libempathy-gtk/empathy-images.h> +#include <libempathy-gtk/empathy-notify-manager.h> + #include <extensions/extensions.h> #include "empathy-call-observer.h" -#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER +#define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include <libempathy/empathy-debug.h> struct _EmpathyCallObserverPriv { + EmpathyNotifyManager *notify_mgr; + TpBaseClient *observer; /* Ongoing calls, as reffed TpChannels */ @@ -57,18 +66,118 @@ on_channel_closed (TpProxy *proxy, gchar *message, EmpathyCallObserver *self) { + DEBUG ("channel %s has been invalidated; stop observing it", + tp_proxy_get_object_path (proxy)); + self->priv->channels = g_list_remove (self->priv->channels, proxy); g_object_unref (proxy); } +typedef struct +{ + EmpathyCallObserver *self; + TpObserveChannelsContext *context; + TpChannel *main_channel; +} AutoRejectCtx; + +static AutoRejectCtx * +auto_reject_ctx_new (EmpathyCallObserver *self, + TpObserveChannelsContext *context, + TpChannel *main_channel) +{ + AutoRejectCtx *ctx = g_slice_new (AutoRejectCtx); + + ctx->self = g_object_ref (self); + ctx->context = g_object_ref (context); + ctx->main_channel = g_object_ref (main_channel); + return ctx; +} + +static void +auto_reject_ctx_free (AutoRejectCtx *ctx) +{ + g_object_unref (ctx->self); + g_object_unref (ctx->context); + g_object_unref (ctx->main_channel); + g_slice_free (AutoRejectCtx, ctx); +} + +static void +get_contact_cb (TpConnection *connection, + guint n_contacts, + TpContact * const *contacts, + guint n_failed, + const TpHandle *failed, + const GError *error, + gpointer user_data, + GObject *weak_object) +{ + EmpathyCallObserver *self = (EmpathyCallObserver *) weak_object; + NotifyNotification *notification; + TpContact *contact; + gchar *summary, *body; + EmpathyContact *emp_contact; + GdkPixbuf *pixbuf; + + if (n_contacts != 1) + { + DEBUG ("Failed to get TpContact; ignoring notification bubble"); + return; + } + + contact = contacts[0]; + + summary = g_strdup_printf (_("Missed call from %s"), + tp_contact_get_alias (contact)); + body = g_strdup_printf ( + _("%s just tried to call you, but you were in another call."), + tp_contact_get_alias (contact)); + + notification = notify_notification_new (summary, body, NULL); + + emp_contact = empathy_contact_dup_from_tp_contact (contact); + pixbuf = empathy_notify_manager_get_pixbuf_for_notification ( + self->priv->notify_mgr, emp_contact, EMPATHY_IMAGE_AVATAR_DEFAULT); + + if (pixbuf != NULL) + { + notify_notification_set_icon_from_pixbuf (notification, pixbuf); + g_object_unref (pixbuf); + } + + notify_notification_show (notification, NULL); + + g_object_unref (notification); + g_free (summary); + g_free (body); + g_object_unref (emp_contact); +} + +static void +display_reject_notification (EmpathyCallObserver *self, + TpChannel *channel) +{ + TpHandle handle; + TpContactFeature features[] = { TP_CONTACT_FEATURE_ALIAS, + TP_CONTACT_FEATURE_AVATAR_DATA }; + + handle = tp_channel_get_handle (channel, NULL); + + tp_connection_get_contacts_by_handle (tp_channel_borrow_connection (channel), + 1, &handle, G_N_ELEMENTS (features), features, get_contact_cb, + g_object_ref (channel), g_object_unref, G_OBJECT (self)); +} + static void on_cdo_claim_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) { + AutoRejectCtx *ctx = user_data; TpChannelDispatchOperation *cdo; - TpChannel *channel = TP_CHANNEL (user_data); GError *error = NULL; + GPtrArray *channels; + guint i; cdo = TP_CHANNEL_DISPATCH_OPERATION (source_object); @@ -77,12 +186,50 @@ on_cdo_claim_cb (GObject *source_object, { DEBUG ("Could not claim CDO: %s", error->message); g_error_free (error); + goto out; + } + + channels = tp_channel_dispatch_operation_borrow_channels (cdo); + for (i = 0; i < channels->len; i++) + { + TpChannel *channel = g_ptr_array_index (channels, i); + + tp_channel_leave_async (channel, + TP_CHANNEL_GROUP_CHANGE_REASON_BUSY, "Already in a call", + NULL, NULL); + } + + display_reject_notification (ctx->self, ctx->main_channel); + +out: + auto_reject_ctx_free (ctx); +} + +static void +cdo_prepare_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + AutoRejectCtx *ctx = user_data; + GError *error = NULL; + TpChannelDispatchOperation *cdo; + + cdo = TP_CHANNEL_DISPATCH_OPERATION (source_object); + + if (!tp_proxy_prepare_finish (source_object, result, &error)) + { + DEBUG ("Failed to prepare ChannelDispatchOperation: %s", error->message); + + tp_observe_channels_context_fail (ctx->context, error); + + g_error_free (error); + auto_reject_ctx_free (ctx); return; } - tp_channel_leave_async (channel, - TP_CHANNEL_GROUP_CHANGE_REASON_BUSY, "Already in a call", - NULL, NULL); + tp_channel_dispatch_operation_claim_async (cdo, on_cdo_claim_cb, ctx); + + tp_observe_channels_context_accept (ctx->context); } static TpChannel * @@ -145,10 +292,18 @@ observe_channels (TpSimpleObserver *observer, /* Autoreject if there are other ongoing calls */ if (has_ongoing_calls (self)) { + AutoRejectCtx *ctx = auto_reject_ctx_new (self, context, channel); + GQuark features[] = { TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE, 0 }; + DEBUG ("Autorejecting incoming call since there are others in " "progress: %s", tp_proxy_get_object_path (channel)); - tp_channel_dispatch_operation_claim_async (dispatch_operation, - on_cdo_claim_cb, g_object_ref (channel)); + + /* We have to prepare dispatch_operation so we'll be able to get the + * channels from it. */ + tp_proxy_prepare_async (dispatch_operation, features, + cdo_prepare_cb, ctx); + + tp_observe_channels_context_delay (context); return; } @@ -156,9 +311,13 @@ observe_channels (TpSimpleObserver *observer, { DEBUG ("The channel has already been invalidated: %s", error->message); + + tp_observe_channels_context_fail (context, error); return; } + DEBUG ("Observing channel %s", tp_proxy_get_object_path (channel)); + tp_g_signal_connect_object (channel, "invalidated", G_CALLBACK (on_channel_closed), self, 0); self->priv->channels = g_list_prepend (self->priv->channels, @@ -195,6 +354,7 @@ observer_dispose (GObject *object) { EmpathyCallObserver *self = EMPATHY_CALL_OBSERVER (object); + tp_clear_object (&self->priv->notify_mgr); tp_clear_object (&self->priv->observer); g_list_free_full (self->priv->channels, g_object_unref); self->priv->channels = NULL; @@ -222,6 +382,8 @@ empathy_call_observer_init (EmpathyCallObserver *self) self->priv = priv; + self->priv->notify_mgr = empathy_notify_manager_dup_singleton (); + dbus = tp_dbus_daemon_dup (&error); if (dbus == NULL) { @@ -230,7 +392,7 @@ empathy_call_observer_init (EmpathyCallObserver *self) return; } - self->priv->observer = tp_simple_observer_new (dbus, FALSE, + self->priv->observer = tp_simple_observer_new (dbus, TRUE, "Empathy.CallObserver", FALSE, observe_channels, self, NULL); diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 8ca2547fd..8f08f74be 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -875,9 +875,7 @@ empathy_main_window_finalize (GObject *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); @@ -1935,10 +1933,7 @@ empathy_main_window_init (EmpathyMainWindow *window) empathy_geometry_bind (GTK_WINDOW (window), GEOMETRY_NAME); /* Enable event handling */ - /* - * FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=644127 priv->call_observer = empathy_call_observer_dup_singleton (); - */ priv->event_manager = empathy_event_manager_dup_singleton (); g_signal_connect (priv->event_manager, "event-added", |