aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--help/.gitignore6
-rw-r--r--help/Makefile.am2
-rw-r--r--help/sl/sl.po2312
-rw-r--r--libempathy-gtk/empathy-account-widget.c113
-rw-r--r--libempathy-gtk/empathy-chat.c90
-rw-r--r--libempathy-gtk/empathy-individual-dialogs.c3
-rw-r--r--libempathy-gtk/empathy-individual-menu.c7
-rw-r--r--libempathy-gtk/empathy-individual-store.c14
-rw-r--r--libempathy-gtk/empathy-individual-store.h1
-rw-r--r--libempathy-gtk/empathy-individual-view.c51
-rw-r--r--libempathy-gtk/empathy-individual-view.h3
-rw-r--r--libempathy-gtk/empathy-spell.c91
-rw-r--r--libempathy-gtk/empathy-spell.h4
-rw-r--r--libempathy-gtk/empathy-tls-dialog.c38
-rw-r--r--libempathy/empathy-account-settings.c106
-rw-r--r--libempathy/empathy-account-settings.h8
-rw-r--r--libempathy/empathy-contact.c1
-rw-r--r--libempathy/empathy-individual-manager.c35
-rw-r--r--libempathy/empathy-individual-manager.h13
-rw-r--r--libempathy/empathy-utils.c80
-rw-r--r--libempathy/empathy-utils.h5
-rw-r--r--po/ca.po1932
-rw-r--r--po/es.po439
-rw-r--r--po/et.po100
-rw-r--r--po/gl.po706
-rw-r--r--po/he.po103
-rw-r--r--po/ko.po1994
-rw-r--r--po/nb.po815
-rw-r--r--po/pa.po737
-rw-r--r--po/zh_HK.po707
-rw-r--r--po/zh_TW.po705
-rw-r--r--src/empathy-import-pidgin.c53
-rw-r--r--src/empathy-import-utils.c1
-rw-r--r--src/empathy-import-utils.h2
-rw-r--r--src/empathy-import-widget.c11
-rw-r--r--src/empathy-main-window.c14
-rw-r--r--src/empathy-preferences.c35
-rw-r--r--src/empathy.c14
39 files changed, 7556 insertions, 3797 deletions
diff --git a/configure.ac b/configure.ac
index faa18f493..21fb15966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_COPYRIGHT([
# Minimal version required
# Hardp deps
-FOLKS_REQUIRED=0.3.0
+FOLKS_REQUIRED=0.3.1
GCONF_REQUIRED=1.2.0
GLIB_REQUIRED=2.25.9
GNUTLS_REQUIRED=2.8.5
diff --git a/help/.gitignore b/help/.gitignore
index 4432357d7..58e8c0cbd 100644
--- a/help/.gitignore
+++ b/help/.gitignore
@@ -7,12 +7,13 @@ de/*.xml
el/*.xml
en_GB/*.xml
es/*.xml
-hu/*.xml
fi/*.xml
fr/*.xml
gl/*.xml
+hu/*.xml
it/*.xml
ru/*.xml
+sl/*.xml
sv/*.xml
zh_CN/*.xml
@@ -22,11 +23,12 @@ de/*.page
el/*.page
en_GB/*.page
es/*.page
-hu/*.page
fi/*.page
fr/*.page
gl/*.page
+hu/*.page
it/*.page
ru/*.page
+sl/*.page
sv/*.page
zh_CN/*.page
diff --git a/help/Makefile.am b/help/Makefile.am
index f2b407275..f898ccb67 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -61,5 +61,5 @@ DOC_PAGES = \
status-icons.page \
video-call.page
-DOC_LINGUAS = ca cs de el en_GB es fi fr gl hu it ru sv zh_CN
+DOC_LINGUAS = ca cs de el en_GB es fi fr gl hu it ru sl sv zh_CN
dist-hook: doc-dist-hook
diff --git a/help/sl/sl.po b/help/sl/sl.po
new file mode 100644
index 000000000..55595eca0
--- /dev/null
+++ b/help/sl/sl.po
@@ -0,0 +1,2312 @@
+# Slovenian translation for empathy-help.
+# This file is distributed under the same license as the empathy-help package.
+# Andrej Žnidaršič <andrej.znidarsic@gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: Empathy manual\n"
+"POT-Creation-Date: 2010-10-06 13:07+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/video-call.page:38(None)
+#: C/audio-video.page:70(None)
+#: C/audio-call.page:36(None)
+msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+msgstr "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+
+#: C/video-call.page:10(desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Začnite video pogovor z enim od vaših stikov"
+
+#: C/video-call.page:21(name)
+#: C/status-icons.page:16(name)
+#: C/share-desktop.page:13(name)
+#: C/set-custom-status.page:19(name)
+#: C/send-file.page:21(name)
+#: C/salut-protocol.page:18(name)
+#: C/remove-account.page:18(name)
+#: C/prob-conn-neterror.page:18(name)
+#: C/prob-conn-name.page:17(name)
+#: C/prob-conn-auth.page:21(name)
+#: C/prob-conn-acctdisabled.page:18(name)
+#: C/prev-conv.page:16(name)
+#: C/link-contacts.page:15(name)
+#: C/irc-start-conversation.page:15(name)
+#: C/irc-send-file.page:16(name)
+#: C/irc-nick-password.page:18(name)
+#: C/irc-manage.page:19(name)
+#: C/irc-join-room.page:16(name)
+#: C/irc-join-pwd.page:17(name)
+#: C/irc-commands.page:10(name)
+#: C/introduction.page:13(name)
+#: C/index.page:19(name)
+#: C/import-account.page:23(name)
+#: C/hide-contacts.page:11(name)
+#: C/group-conversations.page:19(name)
+#: C/geolocation-what-is.page:18(name)
+#: C/geolocation-turn.page:18(name)
+#: C/geolocation-supported.page:16(name)
+#: C/geolocation-privacy.page:17(name)
+#: C/geolocation-not-showing.page:17(name)
+#: C/geolocation.page:17(name)
+#: C/favorite-rooms.page:14(name)
+#: C/disable-account.page:20(name)
+#: C/create-account.page:19(name)
+#: C/audio-video.page:17(name)
+#: C/audio-call.page:19(name)
+#: C/add-account.page:20(name)
+msgid "Milo Casagrande"
+msgstr "Milo Casagrande"
+
+#: C/video-call.page:22(email)
+#: C/status-icons.page:17(email)
+#: C/share-desktop.page:14(email)
+#: C/set-custom-status.page:20(email)
+#: C/send-file.page:22(email)
+#: C/salut-protocol.page:19(email)
+#: C/remove-account.page:19(email)
+#: C/prob-conn-neterror.page:19(email)
+#: C/prob-conn-name.page:18(email)
+#: C/prob-conn-auth.page:22(email)
+#: C/prob-conn-acctdisabled.page:19(email)
+#: C/prev-conv.page:17(email)
+#: C/link-contacts.page:16(email)
+#: C/irc-start-conversation.page:16(email)
+#: C/irc-send-file.page:17(email)
+#: C/irc-nick-password.page:19(email)
+#: C/irc-manage.page:20(email)
+#: C/irc-join-room.page:17(email)
+#: C/irc-join-pwd.page:18(email)
+#: C/irc-commands.page:11(email)
+#: C/introduction.page:14(email)
+#: C/index.page:20(email)
+#: C/import-account.page:24(email)
+#: C/hide-contacts.page:12(email)
+#: C/group-conversations.page:20(email)
+#: C/geolocation-what-is.page:19(email)
+#: C/geolocation-turn.page:19(email)
+#: C/geolocation-supported.page:17(email)
+#: C/geolocation-privacy.page:18(email)
+#: C/geolocation-not-showing.page:18(email)
+#: C/geolocation.page:18(email)
+#: C/favorite-rooms.page:15(email)
+#: C/disable-account.page:21(email)
+#: C/create-account.page:20(email)
+#: C/audio-video.page:18(email)
+#: C/audio-call.page:20(email)
+#: C/add-account.page:21(email)
+msgid "milo@ubuntu.com"
+msgstr "milo@ubuntu.com"
+
+#: C/video-call.page:25(p)
+#: C/status-icons.page:24(p)
+#: C/share-desktop.page:17(p)
+#: C/set-custom-status.page:23(p)
+#: C/send-message.page:21(p)
+#: C/send-file.page:25(p)
+#: C/salut-protocol.page:22(p)
+#: C/remove-account.page:22(p)
+#: C/prob-conn.page:18(p)
+#: C/prob-conn-neterror.page:22(p)
+#: C/prob-conn-name.page:21(p)
+#: C/prob-conn-auth.page:25(p)
+#: C/prob-conn-acctdisabled.page:22(p)
+#: C/prev-conv.page:24(p)
+#: C/link-contacts.page:19(p)
+#: C/irc-start-conversation.page:19(p)
+#: C/irc-send-file.page:20(p)
+#: C/irc-nick-password.page:22(p)
+#: C/irc-manage.page:23(p)
+#: C/irc-join-room.page:20(p)
+#: C/irc-join-pwd.page:21(p)
+#: C/irc-commands.page:14(p)
+#: C/introduction.page:17(p)
+#: C/index.page:23(p)
+#: C/import-account.page:31(p)
+#: C/hide-contacts.page:15(p)
+#: C/group-conversations.page:23(p)
+#: C/geolocation-what-is.page:22(p)
+#: C/geolocation-turn.page:22(p)
+#: C/geolocation-supported.page:20(p)
+#: C/geolocation-privacy.page:21(p)
+#: C/geolocation-not-showing.page:21(p)
+#: C/geolocation.page:21(p)
+#: C/favorite-rooms.page:18(p)
+#: C/disable-account.page:28(p)
+#: C/create-account.page:23(p)
+#: C/change-status.page:23(p)
+#: C/audio-video.page:21(p)
+#: C/audio-call.page:23(p)
+#: C/add-contact.page:22(p)
+#: C/add-account.page:28(p)
+#: C/accounts-window.page:22(p)
+#: C/account-jabber.page:18(p)
+#: C/account-irc.page:20(p)
+msgid "Creative Commons Share Alike 3.0"
+msgstr "Dovoljenje Creative Commons - deljenje pod istimi pogoji 3.0"
+
+#: C/video-call.page:28(title)
+msgid "Start a video conversation"
+msgstr "Začni video konferenco"
+
+#: C/video-call.page:30(p)
+msgid "If you have a webcam, you can call your contacts and have a video conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports video calls."
+msgstr "V primeru da imate spletno kamero lahko svoje stike pokličite in imate z njimi video pogovor. Ta zmožnost deluje le z določenimi vrstami računov in zahteva da ima druga oseba program, ki podpira video klice."
+
+#: C/video-call.page:37(p)
+msgid "From the <gui>Contact List</gui> window, click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to the name of the contact you wish to call and choose <gui style=\"menuitem\">Video Call</gui>."
+msgstr "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video klic</media> poleg imena stika, ki ga želite poklicati in izberite <gui style=\"menuitem\">Video klic</gui>. Dodatno lahko desno kliknete na stik in izberete <gui style=\"menuitem\">Video klic</gui>. "
+
+#: C/video-call.page:43(p)
+#: C/audio-call.page:42(p)
+msgid "A new window will open. When the connection is established, you will see <gui>Connected</gui> at the bottom of the window, along with the total conversation time."
+msgstr "Odprlo se bo novo okno. Ko je povezava vzpostavljena boste na dnu okna videli <gui>Povezano</giu> skupaj s celotnim časom pogovora."
+
+#: C/video-call.page:48(p)
+#: C/audio-call.page:48(p)
+msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
+msgstr "Za končanje pogovora izberite <guiseq><gui style=\"menu\">Klic</gui><gui style=\"menuitem\">Odloži</gui></guiseq>."
+
+#: C/video-call.page:54(p)
+msgid "To turn a video conversation into an audio conversation, choose <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
+msgstr "Za pretvorbo video pogovora v zvočni pogovor izberite <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Izklopi</gui></guiseq>."
+
+#: C/video-call.page:60(title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "Začnite video pogovor z enim od svojih meta-stikov"
+
+#: C/video-call.page:63(p)
+#: C/send-message.page:53(p)
+#: C/audio-call.page:66(p)
+msgid "From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "V oknu <gui>Seznam stikov</gui> desno kliknite na meta-stik."
+
+#: C/video-call.page:68(p)
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Video Call</gui>."
+msgstr "Desno kliknite na ime stika s katerim želite imeti pogovor in izberite <gui style=\"menuitem\">Klepet</gui>."
+
+#: C/video-call.page:75(p)
+#: C/send-message.page:65(p)
+#: C/audio-call.page:78(p)
+msgid "To recognize if a contact is a <em>meta-contact</em>, move your mouse on a contact in the <gui>Contact List</gui> window, and stop over it for a second: a small pop-up message will appear showing the number of the contacts that form the meta-contact."
+msgstr "Če želite videti ali je stik <em>meta-stik</em>, premaknite miško na stik v oknu <gui>Seznam stikov</gui> in se nad njim za trenutek zaustavite: pojavilo se bo majhno pojavno sporočilo, ki prikazuje število stikov, ki tvorijo meta-stik."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:39(None)
+msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:45(None)
+msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:53(None)
+msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:62(None)
+#: C/status-icons.page:69(None)
+msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+msgstr "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+
+#: C/status-icons.page:7(desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "Razumevanje različnih stanj in ikon stanja."
+
+#: C/status-icons.page:20(name)
+#: C/salut-protocol.page:36(cite)
+#: C/prev-conv.page:20(name)
+#: C/prev-conv.page:38(cite)
+#: C/import-account.page:27(name)
+#: C/disable-account.page:24(name)
+#: C/audio-video.page:109(cite)
+#: C/audio-video.page:117(cite)
+#: C/add-account.page:24(name)
+#: C/accounts-window.page:18(name)
+#: C/account-jabber.page:14(name)
+#: C/account-irc.page:16(name)
+msgid "Shaun McCance"
+msgstr "Shaun McCance"
+
+#: C/status-icons.page:21(email)
+#: C/prev-conv.page:21(email)
+#: C/import-account.page:28(email)
+#: C/disable-account.page:25(email)
+#: C/add-account.page:25(email)
+#: C/accounts-window.page:19(email)
+#: C/account-jabber.page:15(email)
+#: C/account-irc.page:17(email)
+msgid "shaunm@gnome.org"
+msgstr "shaunm@gnome.org"
+
+#: C/status-icons.page:35(title)
+msgid "Status Types and Icons"
+msgstr "Vrste stanj in ikone"
+
+#: C/status-icons.page:39(media)
+msgid "Available icon"
+msgstr "Ikona stanja na voljo"
+
+#: C/status-icons.page:40(gui)
+msgid "Available"
+msgstr "Na voljo"
+
+#: C/status-icons.page:41(p)
+msgid "Use the <em>Available</em> status when you are at your computer and able to chat with your contacts. You can set a custom message for this status."
+msgstr "Stanje <em>Na voljo</em> uporabite, ko ste za računalnikom in zmožni klepetati s svojimi stiki. Za to stanje lahko nastavite sporočilo po meri."
+
+#: C/status-icons.page:45(media)
+msgid "Busy icon"
+msgstr "Ikona zasedenosti"
+
+#: C/status-icons.page:46(gui)
+msgid "Busy"
+msgstr "Zaseden"
+
+#: C/status-icons.page:47(p)
+msgid "Use the <em>Busy</em> status to let your contacts know that you don’t want to chat right now. They can still contact you, for instance if they have something urgent they need to discuss. By default, <app>Empathy</app> will not use notification bubbles and sounds when you are busy. You can set a custom message for this status."
+msgstr "Uporabite stanje <em>Zaposlen</em> da bodo vaši stiki vedeli, da trenutno ne želite klepetati. Še vedno lahko vzpostavijo stik z vami, na primer če želijo razpravljati o nečem nujnem. Privzeto <app>Empathy</app> ne uporablja zvokov in balonskih opomnikov, ko ste zaposleni. Za to stanje lahko nastavite sporočilo po meri."
+
+#: C/status-icons.page:53(media)
+msgid "Away icon"
+msgstr "Ikona odsotnosti"
+
+#: C/status-icons.page:54(gui)
+msgid "Away"
+msgstr "Odsoten"
+
+#: C/status-icons.page:55(p)
+msgid "Use the <em>Away</em> status when you are going away from your computer. <app>Empathy</app> automatically sets your status to Away if you do not use your computer for a while, or if your screensaver is on. By default, <app>Empathy</app> will not use notification bubbles and sounds when you are away. You can set a custom message for this status."
+msgstr "Stanje <em>Odsoten</em> uporabite, ko greste proč od računalnika. <app>Empathy</app> vaše stanje samodejno nastavi na odsoten, če računalnika nekaj časa ne uporabljate ali če je vklopljen vaš ohranjevalnik zaslona. Privzeto <app>Empathy</app> ne bo uporabljal zvokov in obvestilnih balončkov, ko ste odsotni. Za to stanje lahko nastavite sporočilo po meri."
+
+#: C/status-icons.page:62(media)
+#: C/status-icons.page:69(media)
+msgid "Offline icon"
+msgstr "Ikona nepovezanosti"
+
+#: C/status-icons.page:63(gui)
+msgid "Invisible"
+msgstr "Neviden"
+
+#: C/status-icons.page:64(p)
+msgid "When you set your status to <em>Invisible</em>, you will appear as offline to your contacts. You will still be connected to your accounts, and you still see your contacts’ statuses and start conversations with them."
+msgstr "Ko nastavite svoje stanje na <em>Nevidno</em>, boste za vaše stike videti nepovezani. Še vedno boste povezani s svojimi računi in še vedno boste videli stanja svojih stikov in lahko začeli pogovore z njimi. "
+
+#: C/status-icons.page:70(gui)
+msgid "Offline"
+msgstr "Nepovezano"
+
+#: C/status-icons.page:71(p)
+msgid "Setting your status to <em>Offline</em> disconnects you from all of your accounts."
+msgstr "Nastavitev vašega stanja na <em>Nepovezano</em> prekine povezavo z vsemi vašimi računi."
+
+#: C/share-desktop.page:7(desc)
+msgid "Share the desktop with your contacts."
+msgstr "Dajte namizje v souporabo z vašimi stiki."
+
+#: C/share-desktop.page:28(title)
+msgid "Share your desktop"
+msgstr "Dajte vaše namizje v souporabo"
+
+#: C/share-desktop.page:30(p)
+msgid "It is possible, with some of your contacts, to share your desktop with them, or to start using your contacts desktop. You can use this functionality to show your desktop to your contacts, to ask for help or to help your contacts resolve a problem."
+msgstr "Z nekaterimi stiki je mogoče dati svoje namizje v souporabo ali začeti uporabljati njihovo namizje. To zmožnost lahko uporabljate za prikaz svojega namizja vašim stikom, za iskanje pomoči ali za pomoč svojim stikom pri reševanju težav."
+
+#: C/share-desktop.page:38(p)
+msgid "In order to be able to share your desktop or to remotely use your contacts desktop, it is necessary to have a remote desktop viewer application installed in your system."
+msgstr "Za souporabo svojega namizja ali za oddaljeno uporabo namizja vašega stika morate imeti na svojemu sistemu nameščen program oddaljenega pregledovalnika namizja."
+
+#: C/share-desktop.page:46(p)
+#: C/send-file.page:40(p)
+#: C/favorite-rooms.page:66(p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr "V okno <gui>Seznam stikov</gui> izvedite eno od naslednjega:"
+
+#: C/share-desktop.page:51(p)
+msgid "Select the contact you want to share your desktop with, and choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></guiseq>."
+msgstr "Izberite stik kateremu želite dati svoje namizje v souporabo in izberite <guiseq><gui>Uredi</gui><gui>Stik</gui><gui>Daj moje namizje v souporabo</gui></guiseq>."
+
+#: C/share-desktop.page:57(p)
+msgid "Right-click on the name of the contact you want to share your desktop with, and select <gui>Share my desktop</gui>."
+msgstr "Desno kliknite na ime stika kateremu želite dati namizje v souporabo in izberite <gui>Daj moje namizje v souporabo</gui>."
+
+#: C/share-desktop.page:65(p)
+msgid "A request will be sent to the contact you want to share your desktop with. If they accept, the default remote desktop viewer application will be launched in order to permit you to disconnect the user that is controlling your desktop."
+msgstr "Vašemu stiku bo poslana zahteva za souporabo namizja. V primeru da sprejmejo bo zagnan privzeti oddaljeni pregledovalnik namizja, ki vam bo omogočal prekinitev povezave z uporabnikom, ki nadzira vaše namizje."
+
+#: C/share-desktop.page:70(p)
+msgid "For more information about how to use the remote desktop viewer application, refer to its help."
+msgstr "Za več podrobnosti kako uporabiti program oddaljenega pregledovalnika namizja se sklicujte na pomoč."
+
+#: C/share-desktop.page:77(p)
+msgid "When you share your desktop with someone else, it is possible to experience system performance slowdown and low Internet speed."
+msgstr "Ko svoje namizje date v souporabo z nekom drugim, boste morda izkusili upočasnjenost sistema in nizko hitrost medmrežja."
+
+#: C/share-desktop.page:83(p)
+msgid "Not all your contacts might be able to support this functionality. It is necessary for them to have at least the 2.28 version of <app>Empathy</app> and a remote desktop viewer application installed in their system."
+msgstr "Vsi stiki morda ne podpirajo te zmožnosti. Stiki morajo imeti vsaj <app>Empathy</app> različico 2.28 in na svojemu sistemu nameščen program pregledovalnika oddaljenega namizja."
+
+#: C/set-custom-status.page:9(desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "Dodajanje, urejanje ali brisanje osebnih sporočil za vaša stanja."
+
+#: C/set-custom-status.page:15(name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
+
+#: C/set-custom-status.page:16(email)
+msgid "jwcampbell@gmail.com"
+msgstr "jwcampbell@gmail.com"
+
+#: C/set-custom-status.page:34(title)
+msgid "Set a custom message"
+msgstr "Nastavitev sporočila po meri"
+
+#: C/set-custom-status.page:36(p)
+msgid "Sometimes you may want to set a custom message for your status, for example to let people know that you will be unavailable for a certain period of time."
+msgstr "Včasih si morda želite nastaviti sporočilo po meri za vaše stanje, na primer da ljudem sporočite da določen čas ne boste na voljo."
+
+#: C/set-custom-status.page:40(p)
+msgid "It is possible to set a custom message based on the different statuses available."
+msgstr "Sporočilo po meri je mogoče nastaviti na osnovi različnih razpoložljivih stanj."
+
+#: C/set-custom-status.page:46(p)
+#: C/set-custom-status.page:82(p)
+msgid "From the <gui>Contact List</gui> window, click on the drop-down list at the top."
+msgstr "V oknu <gui>Seznam stikov</gui> kliknite na spustni seznam na vrhu."
+
+#: C/set-custom-status.page:52(p)
+msgid "Select the status you want to add a custom message to. You have to select the one identified with the label <gui>Custom Message</gui>."
+msgstr "Izberite stanje, kateremu želite dodati sporočilu po meri. Izbrati morate sporočilo z oznako <gui>Sporočilo po meri</gui>."
+
+#: C/set-custom-status.page:58(p)
+msgid "Enter your custom message in the text box at the top of the window, and press <key>Enter</key> to set the message."
+msgstr "V besedilno polje na vrhu okna vnesite sporočilo po meri in pritisnite <key>Vnosno tipko</key> za nastavitev sporočila. "
+
+#: C/set-custom-status.page:64(p)
+msgid "If you want to set the custom message as a favorite, saving it in order to use it again, click on the little star on the right of the text box where you wrote your custom message."
+msgstr "V primeru da želite nastaviti sporočilo po meri kot priljubljeno in ga shraniti za ponovno uporabo, kliknite na majhno zvezdico na desni besedilnega polja, kjer ste napisali sporočilo po meri. "
+
+#: C/set-custom-status.page:69(p)
+msgid "If you do not do it, the custom message will not be available the next time you use <app>Empathy</app>. It will be saved only for the current session."
+msgstr "V primeru da tega ne storite sporočilo ne bo na voljo, ko naslednjič uporabite <app>Empathy</app>. Shranjeno bo le za trenutno sejo."
+
+#: C/set-custom-status.page:78(title)
+msgid "Edit, remove and add a custom message"
+msgstr "Urejanje, odstranjevanje in dodajanje sporočila po meri"
+
+#: C/set-custom-status.page:88(p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Izberite <gui>Uredi sporočilo po meri</gui>."
+
+#: C/set-custom-status.page:95(p)
+msgid "To edit a custom message:"
+msgstr "Za urejanje sporočila po meri:"
+
+#: C/set-custom-status.page:100(p)
+msgid "From the <gui>Saved Presets</gui> box, select the status message you want to edit and double-click on it."
+msgstr "V polju <gui>Shranjene prednastavljene</gui> izberite sporočilo stanja, ki ga želite uredi, in ga dvokliknite."
+
+#: C/set-custom-status.page:106(p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
+msgstr "Vnesite novo sporočilo po meri in pritisnite <key>Vnosno tipko</key> za njegovo spreminjanje."
+
+#: C/set-custom-status.page:113(p)
+msgid "To remove a custom message:"
+msgstr "Za odstranitev sporočila po meri:"
+
+#: C/set-custom-status.page:118(p)
+msgid "From the <gui>Saved Presets</gui> box, select the status message you want to remove."
+msgstr "V polju <gui>Shranjene prednastavljene</gui> izberite sporočilo stanja, ki ga želite odstraniti."
+
+#: C/set-custom-status.page:124(p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Kliknite na gumb <gui>Odstrani</gui>."
+
+#: C/set-custom-status.page:131(p)
+msgid "To add a new custom message, from the <gui>Add New Preset</gui> section:"
+msgstr "Za dodajanje novega sporočila po meri iz odseka <gui>Dodajanje nove prednastavljene</gui>:"
+
+#: C/set-custom-status.page:136(p)
+msgid "Click on the drop-down list to select the status you want to set a custom message to."
+msgstr "Kliknite na spustni seznam za izbiro stanja kateremu želite nastaviti sporočilo po meri. "
+
+#: C/set-custom-status.page:142(p)
+msgid "Click on the text box, and type the new custom message."
+msgstr "Kliknite na besedilno polje in vpišite novo sporočilo po meri."
+
+#: C/set-custom-status.page:147(p)
+msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+msgstr "Kliknite na <gui>Dodaj</gui> za dodajanje novega sporočila k prednastavljenim."
+
+#: C/set-custom-status.page:156(p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Ko ste končali kliknite na <gui>Zapri</gui>."
+
+#: C/set-custom-status.page:163(p)
+msgid "When you edit or add a new custom message, it will not be set as the current status message. You will need to select it from the <gui>Contact List</gui> window."
+msgstr "Ko urejate ali dodajate novo sporočilo po meri, ne bo nastavljeno kot trenutno sporočilo stanja. Morali ga boste izbrati v oknu <gui>Seznam stikov</gui>."
+
+#: C/send-message.page:8(desc)
+msgid "Send a message to one of your contacts."
+msgstr "Pošljite sporočilo enemu od vaših stikov."
+
+#: C/send-message.page:17(name)
+#: C/send-file.page:17(name)
+#: C/prob-conn.page:14(name)
+#: C/prob-conn-neterror.page:14(name)
+#: C/prob-conn-auth.page:17(name)
+#: C/prob-conn-acctdisabled.page:14(name)
+#: C/change-status.page:19(name)
+#: C/add-contact.page:18(name)
+msgid "Phil Bull"
+msgstr "Phil Bull"
+
+#: C/send-message.page:18(email)
+#: C/send-file.page:18(email)
+#: C/prob-conn.page:15(email)
+#: C/prob-conn-neterror.page:15(email)
+#: C/prob-conn-auth.page:18(email)
+#: C/prob-conn-acctdisabled.page:15(email)
+#: C/change-status.page:20(email)
+#: C/add-contact.page:19(email)
+msgid "philbull@gmail.com"
+msgstr "philbull@gmail.com"
+
+#: C/send-message.page:32(title)
+msgid "Send a message to someone"
+msgstr "Nekomu pošlji sporočilo"
+
+#: C/send-message.page:36(p)
+msgid "From the <gui>Contact List</gui> window, double-click the name of the contact that you want to have a conversation with."
+msgstr "V <gui>Seznamu stikov</gui> dvokliknite ime stika s katerim želite imeti pogovor."
+
+#: C/send-message.page:42(p)
+msgid "A new window will open. Type a message into the box at the bottom of the window and press <key>Enter</key> to send it."
+msgstr "Odprlo se bo novo okno. Vpišite sporočilo v polje na dnu okna in pritisnite <key>Vnosno tipko</key> za pošiljanje."
+
+#: C/send-message.page:50(title)
+msgid "Send a message to a meta-contact"
+msgstr "Pošljite sporočilo meta-stiku"
+
+#: C/send-message.page:58(p)
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Chat</gui>."
+msgstr "Izberite ime stika s katerim želite imeti pogovor in izberite <gui style=\"menuitem\">Klepet</gui>."
+
+#: C/send-file.page:8(desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Pošljite datoteko iz vašega računalnika enemu od vaših stikov."
+
+#: C/send-file.page:36(title)
+msgid "Send files"
+msgstr "Pošlji datoteke"
+
+#: C/send-file.page:45(p)
+msgid "Right click on the contact you want to send a file to, and choose <gui>Send file</gui>."
+msgstr "Desno kliknite na stik, kateremu želite poslati datoteko in izberite <gui>Pošlji datoteko</gui>."
+
+#: C/send-file.page:50(p)
+msgid "Click on the contact you want to send a file, and choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+msgstr "Kliknite na stik, kateremu želite poslati datoteko in izberite <guiseq><gui>Uredi</gui><gui>Stik</gui><gui>Pošlji datoteko</gui></guiseq>."
+
+#: C/send-file.page:58(p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "Izberite datoteko za pošiljanje in kliknite na <gui>Pošlji</gui>."
+
+#: C/send-file.page:63(p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "Pojavilo se bo okno <gui>Prenosi datotek</gui>."
+
+#: C/send-file.page:66(p)
+msgid "Wait for your contact to accept the file transfer, or click <gui>Stop</gui> to halt the transfer."
+msgstr "Počakajte da vaš stik sprejme prenos datotek ali kliknite <gui>Zaustavi</gui> za zaustavitev prenosa."
+
+#: C/send-file.page:72(p)
+msgid "Once the transfer is finished, it is possible to close the <gui>File Transfers</gui> window."
+msgstr "Ko je prenos končan, je mogoče okno <gui>Prenosi datotek</gui> zapreti."
+
+#: C/send-file.page:80(p)
+msgid "If you have multiple finished transfers listed in the window, click on <gui>Clear</gui> to empty the list. This will only remove the files from the list and will not delete them from your computer."
+msgstr "V primeru da imate v oknu več končanih prenosov, kliknite na <gui>Počisti</gui> za spraznjene seznama. To bo datoteke le odstranilo s seznama in jih ne bo izbrisalo z vašega računalnika."
+
+#: C/send-file.page:87(p)
+msgid "It is possible to send files only using the following services: <em>Jabber</em>, <em>Google Talk</em> and <em>People Nearby</em>."
+msgstr "Pošiljanje datotek je mogoče samo z uporabo naslednjih storitev: <em>Jabber</em>, <em>Google Talk</em> in <em>Ljudje v bližini</em>."
+
+#: C/send-file.page:93(p)
+msgid "In order to send a file to someone, you need to be connected to the Internet, or to a local area network."
+msgstr "Za pošiljanje datotek morate biti povezani na medmrežje ali krajevno omrežje."
+
+#: C/salut-protocol.page:8(desc)
+msgid "Understanding the People Nearby feature."
+msgstr "Razumevanje zmožnosti ljudje v bližini."
+
+#: C/salut-protocol.page:33(title)
+msgid "What is People Nearby?"
+msgstr "Kaj je \"Ljudje v bližini\"?"
+
+#: C/salut-protocol.page:37(p)
+msgid "I'd like to see this played up a bit more."
+msgstr ""
+
+#: C/salut-protocol.page:40(p)
+msgid "The People Nearby service is a serverless communication service: you do not need to connect and authenticate to a central server in order to use it."
+msgstr "Storitev ljudje v bližini je storitev sporočanja brez strežnika: za uporabo se vam ni potrebno povezati in overiti s centralnim strežnikom."
+
+#: C/salut-protocol.page:45(p)
+msgid "This kind of serverless messaging system is restricted to a local area network and an active Internet connection is not necessary."
+msgstr "Ta vrsta sistema sporočanja brez strežnika je omejena na krajevno omrežje in dejavna medmrežna povezava ni potrebna."
+
+#: C/salut-protocol.page:49(p)
+msgid "The people that use this service inside the same local area network will be auto-discovered, and it will be possible to send them messages and files as with other services."
+msgstr "Ljudje, ki uporabljajo to storitev znotraj istega krajevnega omrežja, bodo samodejno odkriti in mogoče jim bo poslati sporočila in datoteke kot z ostalimi storitvami. "
+
+#: C/salut-protocol.page:54(p)
+msgid "All the modern local area networks should be able to support this kind of service."
+msgstr "Vsa novejša krajevna omrežja bi morala podpirati to vrsto storitve."
+
+#: C/remove-account.page:8(desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Popolnoma odstrani račun iz <app>Empathy</app>."
+
+#: C/remove-account.page:33(title)
+msgid "Remove an account"
+msgstr "Odstrani račun"
+
+#: C/remove-account.page:35(p)
+msgid "You can completely remove an account from <app>Empathy</app> if you no longer wish to use the account. If you wish to use the account in <app>Empathy</app> again in the future, you will have to add your account details again."
+msgstr "V primeru da računa ne želite več uporabljati, lahko račun popolnoma odstranite iz <app>Empathy</app>. V primeru da želite v prihodnosti račun v <app>Empathy</app> ponovno uporabljati boste morali ponovno dodati podrobnosti svojega računa."
+
+#: C/remove-account.page:42(p)
+#: C/irc-nick-password.page:50(p)
+#: C/disable-account.page:48(p)
+#: C/add-account.page:48(p)
+msgid "From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+msgstr "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Uredi</gui><gui>Računi</gui></guiseq> ali pritisnite <key>F4</key>."
+
+#: C/remove-account.page:46(p)
+msgid "Select the account you wish to remove from the accounts list on the left side of the window."
+msgstr "Na seznamu računov na levi strani okna izberite račun, ki ga želite odstraniti."
+
+#: C/remove-account.page:50(p)
+msgid "Click on <gui style=\"button\">Remove</gui>."
+msgstr "Kliknite <gui style=\"button\">Odstrani</gui>."
+
+#: C/remove-account.page:53(p)
+msgid "A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> button to permanently remove the account."
+msgstr "Pojavilo se pogovorno okno, ki vas bo spraševalo za potrditev. Kliknite gumb <gui>Odstrani</gui> za odstranitev računa."
+
+#: C/remove-account.page:59(p)
+msgid "Even after removing an account, <app>Empathy</app> does not delete your conversation history for that account."
+msgstr "Tudi po odstraniti računa <app>Empathy</app> ne izbriše zgodovine vaših pogovorov za ta račun."
+
+#: C/prob-conn.page:7(desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr "Diagnoza pogostih težav pri povezovanju s storitvijo takojšnjega sporočanja."
+
+#: C/prob-conn.page:29(title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Težave s povezovanjem s storitvijo hipnega sporočanja"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/prob-conn-neterror.page:58(None)
+#: C/prob-conn-name.page:43(None)
+#: C/prob-conn-auth.page:58(None)
+#: C/account-irc.page:109(None)
+msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+
+#: C/prob-conn-neterror.page:7(desc)
+msgid "An error message which says “<gui>Network error</gui>” appears in the main window."
+msgstr "V glavnemu oknu se pojavi sporočilo napake, ki pravi “<gui>Network error</gui>”."
+
+#: C/prob-conn-neterror.page:33(title)
+msgid "I get a message that says “Network error”"
+msgstr "Dobim sporočilo, ki pravi “Napaka omrežja”"
+
+#: C/prob-conn-neterror.page:36(cite)
+msgid "shaunm"
+msgstr "shaunm"
+
+#: C/prob-conn-neterror.page:37(p)
+msgid "Empathy no longer allows you to create an IRC account without a valid nick. I've removed the guide link. Remove the text."
+msgstr "Empathy vam ne dovoli ustvarjanje računa IRC brez veljavnega vzdevka. Povezava vodiča je bila odstranjena. Odstrani besedilo."
+
+#: C/prob-conn-neterror.page:41(p)
+msgid "This kind of error happens when <app>Empathy</app> cannot communicate with the instant messaging service for some reason."
+msgstr "Ta vrsta napake se zgodi, ko <app>Empathy</app> zaradi nekega vzroka ne more komunicirati s storitvijo hipnega sporočanja. "
+
+#: C/prob-conn-neterror.page:45(p)
+msgid "Also, this kind of error happens when you try to use an IRC account without setting a nickname."
+msgstr "Ta vrsta napake se zgodi, ko poskušate uporabiti račun IRC brez nastavitve vzdevka."
+
+#: C/prob-conn-neterror.page:52(p)
+#: C/prob-conn-auth.page:45(p)
+#: C/prob-conn-acctdisabled.page:43(p)
+msgid "Make sure that you are connected to the Internet, or to a local area network."
+msgstr "Prepričajte se, da ste povezani na medmrežje ali na krajevno omrežje."
+
+#: C/prob-conn-neterror.page:57(p)
+#: C/prob-conn-name.page:42(p)
+#: C/prob-conn-auth.page:57(p)
+msgid "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\">edit</media> icon in the error message."
+msgstr "V sporočilu napake kliknite na ikono <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\">uredi</media>."
+
+#: C/prob-conn-neterror.page:65(p)
+#: C/prob-conn-acctdisabled.page:59(p)
+msgid "Check in the <gui>Advanced</gui> section that all the details are correct. You should be able to find these details from the website of the messaging service."
+msgstr "V odseku <gui>Napredno</gui> preverite da so vse podrobnosti pravilne. Te podrobnosti bi morali najti na spletišču storitve sporočanja."
+
+#: C/prob-conn-neterror.page:82(p)
+#: C/prob-conn-auth.page:68(p)
+msgid "Deselect the <gui>Enabled</gui>, and then select it again to try to reconnect to the service."
+msgstr "Odstranite izbiro <gui>Omogočeno</gui> in jo nato ponovno izberite za poskus ponovne povezave s storitvijo."
+
+#: C/prob-conn-neterror.page:90(title)
+msgid "Proxy support"
+msgstr "Podpora posredniških strežnikov"
+
+#: C/prob-conn-neterror.page:91(p)
+msgid "At the moment <app>Empathy</app> can not be configured to work with a proxy."
+msgstr "Trenutno <app>Empathy</app> ni mogoče nastaviti za delo s posredovalnim strežnikom."
+
+#: C/prob-conn-name.page:9(title)
+msgid "“Name in use”"
+msgstr "“Ime v uporabi”"
+
+#: C/prob-conn-name.page:10(desc)
+msgid "An error message which says “<gui>Name in use</gui>” appears in the main window."
+msgstr "V glavnemu oknu se pojavi sporočilo napake, ki pravi “<gui>Ime v uporabi</gui>”."
+
+#: C/prob-conn-name.page:32(title)
+msgid "I get a message that says “Name in use”"
+msgstr "Dobim sporočilo, ki pravi “Ime v uporabi” "
+
+#: C/prob-conn-name.page:34(p)
+msgid "This kind of error happens when you try to connect to your IRC account and you are using a nickname that is already being used by someone else on that particular network."
+msgstr "Ta vrsta napak se zgodi, ko se poskusite povezati s svojim računom IRC in uporabljate vzdevek, ki ga na istemu omrežju že uporablja nekdo drug. "
+
+#: C/prob-conn-name.page:50(p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "V besedilno polje <gui>Vzdevek</gui> vpišite nov vzdevek."
+
+#: C/prob-conn-name.page:55(p)
+msgid "If you have registered that nickname within the network you are using, set the password for that nickname. For more information, see <link xref=\"irc-nick-password\"/>."
+msgstr "V primeru da ste ta vzdevek vpisali znotraj omrežja, ki ga uporabljate, nastavite geslo za ta vzdevek. Za več podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
+
+#: C/prob-conn-name.page:64(p)
+msgid "Deselect the <gui>Enabled</gui> check-box next to the name of your account, and then select it again to try to reconnect to the service."
+msgstr "Odstranite izbiro z izbirnega polja <gui>Omogočeno</gui> poleg imena vašega računa, in ga ponovno izberite za poskus ponovne povezave s storitvijo."
+
+#: C/prob-conn-auth.page:8(desc)
+msgid "An error message which says “<gui>Authentication failed</gui>” appears in the main window."
+msgstr "V glavnemu oknu se pojavi sporočilo napake, ki pravi “<gui>Overitev je spodletela</gui>”."
+
+#: C/prob-conn-auth.page:36(title)
+msgid "I get a message that says “Authentication failed”"
+msgstr "Dobil sporočilo, ki pravi “Overitev je spodletela”"
+
+#: C/prob-conn-auth.page:38(p)
+msgid "This kind of error happens when your instant messaging service is not allowing you to connect because it does not recognize your username or password for some reason."
+msgstr "Ta vrsta napake se zgodi, ko vam storitev takojšnjega sporočanja ne dovoli povezave ker zaradi nekega vzroka ne prepozna vašega uporabniškega imena ali gesla."
+
+#: C/prob-conn-auth.page:50(p)
+msgid "Make sure that you have registered an account with the service you are trying to connect to. If you do not have an account, most services will not allow you to connect."
+msgstr "Prepričajte se, da ste vpisali račun s storitvijo na katero se želite povezati. V primeru da nimate računa, vam večina storitev ne bo dovolila povezave."
+
+#: C/prob-conn-auth.page:63(p)
+#: C/prob-conn-acctdisabled.page:54(p)
+msgid "Type your username and password again to make sure that they are correct."
+msgstr "Ponovno vpišite svoje uporabniško ime in geslo ter se prepričajte da sta pravilna."
+
+#: C/prob-conn-acctdisabled.page:7(desc)
+msgid "The instant messaging account that you want to use is not enabled in the list of accounts."
+msgstr "Račun hipnega sporočanja, ki ga želite uporabiti ni omogočen na seznamu računov."
+
+#: C/prob-conn-acctdisabled.page:33(title)
+msgid "My account is not enabled"
+msgstr "Moj račun ni omogočen"
+
+#: C/prob-conn-acctdisabled.page:35(p)
+msgid "If the instant messaging account that you want to use is not enabled in the drop-down account list when you try to start a new conversation or join a room, your account details may not be correct."
+msgstr "V primeru da račun hipnega sporočanja, ki ga želite uporabiti, v spustnemu seznamu računov ob poskusu začetka novega pogovora ali pridružitve sobe ni omogočen, so morda podrobnosti vašega računa nepravilne. "
+
+#: C/prob-conn-acctdisabled.page:48(p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the account that is not working."
+msgstr "Izberite <guiseq><gui>Uredi</gui><gui>Računi</gui></guiseq> in izberite račun, ki ne deluje."
+
+#: C/prob-conn-acctdisabled.page:65(p)
+msgid "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. If it is not, select the check-box to enable the account."
+msgstr "Preverite če je izbrano izbirno polje <gui style=\"checkbox\">Enabled</gui>. V nasprotnemu primeru izberite izbirno polje za omogočitev računa."
+
+#: C/prev-conv.page:8(desc)
+msgid "Browse or search your previous conversations."
+msgstr "Brskanje ali iskanje vaših predhodnih pogovorov."
+
+#: C/prev-conv.page:35(title)
+msgid "View previous conversations"
+msgstr "Ogled predhodnih pogovorov"
+
+#: C/prev-conv.page:39(p)
+msgid "Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug.cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, independent of the selection (like in yellow or something), we can use the term \"highlight\". Otherwise we need to use the term \"select\". Watch that bug."
+msgstr "Poudarjanje besedila je čudno: <link href=\"http://bugzilla.gnome.org/show_bug.cgi?id=593733\">#593733</link>. V primeru da pride do dejanskega poudarjanja neodvisno od izbire (na primer v rumeni barvi) lahko uporabimo izraz \"poudarijanje\". V nasprotnemu primeru moramo uporabiti \"izbira\". Opazujte ta hrošč."
+
+#: C/prev-conv.page:46(p)
+msgid "<app>Empathy</app> automatically saves all your text conversations you have with your contacts. You can <link xref=\"#search\">search through all of your previous conversations</link> or <link xref=\"#browse\">browse previous conversations</link> by contact and date."
+msgstr "<app>Empathy</app> samodejno shrani vse vaše besedilne pogovore z vašimi stiki. Lahko <link xref=\"#search\">iščete po vseh vaših predhodnih pogovorih</link> ali <link xref=\"#browse\">brskate predhodne pogovore</link> po stiku in datumu."
+
+#: C/prev-conv.page:54(p)
+msgid "You do not need to be connected to the Internet to view and search your previous conversations."
+msgstr "Za ogled in iskanje vaših predhodnih pogovorov vam ni treba biti povezan na medmrežje."
+
+#: C/prev-conv.page:61(title)
+msgid "Search previous conversations"
+msgstr "Iskanje predhodnih pogovorov"
+
+#: C/prev-conv.page:63(p)
+msgid "You can perform a full-text search through all of your previous conversations."
+msgstr "Izvedete lahko iskanje celega besedila skozi vse vaše predhodne pogovore."
+
+#: C/prev-conv.page:67(p)
+#: C/prev-conv.page:96(p)
+msgid "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</key>."
+msgstr "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Pogled</gui><gui>Predhodni pogovori</gui></guiseq>. Dodatno lahko pritisnete <key>F3</key>."
+
+#: C/prev-conv.page:71(p)
+msgid "Select the <gui>Search</gui> tab."
+msgstr "Izberite zavihek <gui>Iskanje</gui>."
+
+#: C/prev-conv.page:74(p)
+msgid "In the <gui>For</gui> field, type the text you want to search for. Click <gui>Find</gui> or press <key>Enter</key>."
+msgstr "V polje <gui>Za</gui>, vtipkajte besedilo, ki ga želite iskati. Kliknite <gui>išči</gui> ali pritisnite <key>Vnosno tipko</key>."
+
+#: C/prev-conv.page:78(p)
+msgid "Any conversations that matched your search terms will be shown in the list below the search field. By default, conversations are ordered by date."
+msgstr "Katerikoli pogovori, ki se skladajo z vašimi iskalnimi pogoji bodo prikazani v seznamu pod iskalnim poljem. Privzeto so pogovori razvrščeni po datumu."
+
+#: C/prev-conv.page:82(p)
+msgid "Click on a conversation to view it. <app>Empathy</app> will select the text in the conversation that matched your search terms."
+msgstr "Za ogled pogovora kliknite nanj. <app>Empathy</app> bo izbral besedilo v pogovoru, ki se sklada z vašimi pogoji iskanja."
+
+#: C/prev-conv.page:89(title)
+msgid "Browse previous conversations"
+msgstr "Brskaj predhodne pogovore"
+
+#: C/prev-conv.page:91(p)
+msgid "You can browse your previous conversations with your contacts or in chat rooms by date."
+msgstr "Svoje predhodne pogovore s svojimi stiki ali klepetalnicami lahko brskate po datumu."
+
+#: C/prev-conv.page:100(p)
+msgid "Select the <gui>Conversations</gui> tab."
+msgstr "Izberite zavihek <gui>Pogovori</gui>."
+
+#: C/prev-conv.page:103(p)
+msgid "Select an account from the drop-down list in the top left. A list of contacts and chat room for that account will be shown below."
+msgstr "Izberite račun s spustnega seznama zgoraj levo. Seznam vseh stikov in klepetalnic za ta račun bo prikazan spodaj."
+
+#: C/prev-conv.page:107(p)
+msgid "Select a contact or chat room to view your previous conversations from. By default the most recent conversation will be shown."
+msgstr "Izberite stik ali klepetalnico za ogled svojih predhodnih pogovorov. Privzeto bodo prikazani najbolj nedavni stiki."
+
+#: C/prev-conv.page:111(p)
+msgid "You can browse your conversations by date. Days on which you had a conversation with the selected contact will be shown in bold text. Click a date to select it. Click the arrows next to the month and year to browse earlier dates."
+msgstr "Svoje pogovore lahko brskate po datumu. Dnevi ob katerih ste imeli pogovor z izbranim stikom bodo prikazni krepko. Kliknite na datum za izbiro. Kliknite puščice poleg meseca in leta za brskanje zgodnejših datumov."
+
+#: C/prev-conv.page:117(p)
+msgid "You can search for text in the displayed conversation by typing into the search field at the top. The matching text will be highlighted."
+msgstr "Besedilo v prikazanemu pogovoru lahko iščete s pisanjem v iskalno polje na vrhu. Skladajoče besedilo bo poudarjeno."
+
+#: C/prev-conv.page:121(p)
+msgid "You can quickly view the previous conversations with one of your contacts from the <gui>Contact List</gui> window. Simply right click the contact and choose <gui>View Previous Conversations</gui>. The <gui>Previous Conversations</gui> window will open with that contact already selected."
+msgstr "Predhodne pogovore z enim od vašim stikov si lahko hitro ogledate v oknu <gui>Seznam stikov</gui>. Enostavno desno kliknite na stik in izberite <gui>Ogled predhodnih pogovorov</gui>. Okno <gui>Predhodni pogovori</gui> bo bilo odprto s predhodno izbranim stikom."
+
+#: C/link-contacts.page:11(desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Združite in ločite različne stike v enega."
+
+#: C/link-contacts.page:25(title)
+msgid "Combine and separate contacts"
+msgstr "Združevanje in ločevanje stikov"
+
+#: C/link-contacts.page:26(p)
+msgid "If one, or more, of your contacts has multiple accounts with different messaging services, you can combine these contacts into a single one."
+msgstr "Če ima eden ali več vaših stikov več računov z različnimi storitvami sporočanja, jih lahko združite v enega."
+
+#: C/link-contacts.page:30(p)
+msgid "The resulting contact is called a <em>meta-contact</em>: a contact composed from different single contacts."
+msgstr "Nastali stik se imenuje <em>meta-stik</em>: stik sestavljen iz več različnih stikov."
+
+#: C/link-contacts.page:34(p)
+msgid "If you have a Jane Smith contact that is using three different messaging services like:"
+msgstr "V primeru da imate Janeza Novaka, ki uporablja tri različne storitve sporočanja kot:"
+
+#: C/link-contacts.page:40(p)
+msgid "janes@facebook"
+msgstr "janes@facebook"
+
+#: C/link-contacts.page:45(p)
+msgid "jane.smith@gmail"
+msgstr "jane.smith@gmail"
+
+#: C/link-contacts.page:50(p)
+msgid "jane_smith@hotmail"
+msgstr "jane_smith@hotmail"
+
+#: C/link-contacts.page:55(p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "Te stike lahko združite v en stik Janez Novak."
+
+#: C/link-contacts.page:60(title)
+msgid "Combining contacts"
+msgstr "Združevanje stikov"
+
+#: C/link-contacts.page:63(p)
+msgid "From the <gui>Contact List</gui> window, right-click one of the contact that has different accounts, and select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr "V oknu <gui>Seznam stikov</gui> desno kliknite na enega od stikov, ki ima različne računa in izberite <gui style=\"menuitem\">Poveži stike ...</gui>."
+
+#: C/link-contacts.page:70(p)
+msgid "From the left pane in the <gui>Link Contacts</gui> window, select the contacts you want to combine."
+msgstr "V levem pladnju v oknu <gui>Poveži stike</gui> izberite stike, ki jih želite združiti."
+
+#: C/link-contacts.page:76(p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Kliknite <gui style=\"button\">Poveži</gui>."
+
+#: C/link-contacts.page:82(p)
+msgid "When a meta-contact has been created, the default contact that will be used to have a conversation with when you double-click on it, is the contact with the highest presence on-line."
+msgstr "Ko je bil meta-stik ustvarjen, bo za pogovarjanje uporabljen stik z najpogostejšo povezanostjo."
+
+#: C/link-contacts.page:91(title)
+msgid "Separating contacts"
+msgstr "Ločevanje stikov"
+
+#: C/link-contacts.page:94(p)
+msgid "From the <gui>Contact List</gui>, right-click the contact to separate, and select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr "V <gui>Seznam stikov</gui> desno kliknite na stik za ločevanje in izberite <gui style=\"menuitem\">Poveži stike ...</gui>."
+
+#: C/link-contacts.page:100(p)
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Kliknite <gui style=\"button\">Razveži</gui>."
+
+#: C/license.page:8(desc)
+msgid "Legal information."
+msgstr "Pravni podatki."
+
+#: C/license.page:11(title)
+msgid "License"
+msgstr "Licenca"
+
+#: C/license.page:12(p)
+msgid "This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 Unported license."
+msgstr "Ta delo je distribuirano pod CreativeCommons Attribution-Share Alike 3.0 Unported license."
+
+#: C/license.page:20(p)
+msgid "You are free:"
+msgstr "Prosto lahko:"
+
+#: C/license.page:25(em)
+msgid "To share"
+msgstr "souporabljate"
+
+#: C/license.page:26(p)
+msgid "To copy, distribute and transmit the work."
+msgstr "Za kopiranje, distribuiranje in prenašanje dela."
+
+#: C/license.page:29(em)
+msgid "To remix"
+msgstr "Predelava"
+
+#: C/license.page:30(p)
+msgid "To adapt the work."
+msgstr "Prilagajanje dela"
+
+#: C/license.page:33(p)
+msgid "Under the following conditions:"
+msgstr "Pod naslednjimi pogoji:"
+
+#: C/license.page:38(em)
+msgid "Attribution"
+msgstr "Priznanje avtorstva"
+
+#: C/license.page:39(p)
+msgid "You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work)."
+msgstr "Delo morate prilastiti na način, ki ga je navedel avtor ali dajalec licence (toda ne na kakršenkoli način, ki predlaga spodbudo vas ali vaše uporabe dela)."
+
+#: C/license.page:46(em)
+msgid "Share Alike"
+msgstr "Deljenje pod istimi pogoji"
+
+#: C/license.page:47(p)
+msgid "If you alter, transform, or build upon this work, you may distribute the resulting work only under the same, similar or a compatible license."
+msgstr "V primeru da spremenite, preoblikujete ali nadgradite to delo, lahko nastalo delo distribuirate le pod enako, podobno ali združljivo licenco."
+
+#: C/license.page:53(p)
+msgid "For the full text of the license, see the <link href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</link>, or read the full <link href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Commons Deed</link>."
+msgstr "Za polno besedilo licence si oglejte <link href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\">spletišče CreativeCommons</link>, ali preberite polno besedilo<link href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Commons Deed</link>."
+
+#: C/irc-start-conversation.page:8(desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "Začetek pogovora s stikom IRC."
+
+#: C/irc-start-conversation.page:30(title)
+msgid "Chat with somebody on IRC"
+msgstr "Klepet z nekom na IRC-u"
+
+#: C/irc-start-conversation.page:32(p)
+msgid "You can hold private conversations with other IRC users, outside of the public IRC chat rooms. To start a conversation with another IRC user:"
+msgstr "Z drugimi uporabniki IRC imate lahko zasebne pogovore zunaj javnih klepetalnic IRC. Za začetek pogovora z drugim uporabnikom IRC:"
+
+#: C/irc-start-conversation.page:37(p)
+msgid "In the contact list for an IRC chat room, double click the name of the user you want to chat with. Alternatively, right click the name of the user and choose <gui>Chat</gui>."
+msgstr "Na seznamu stikov klepetalnice IRC dvokliknite ime uporabnika s katerim želite klepetati. Dodatno lahko desno kliknete na ima uporabnika in izberete <gui>Klepet</gui>."
+
+#: C/irc-start-conversation.page:45(p)
+msgid "The IRC room contact list is not the same as <app>Empathy</app> contact list. It contains a list of users in the IRC chat room you joined. Different rooms can have different contacts listed."
+msgstr "Seznam stikov sobe IRC ni enak kot seznam stikov <app>Empathy</app>. Vsebuje seznam uporabnikov v klepetalnicah IRC, ki ste se jim pridružili. Različne sobe imajo lahko različne sezname stikov."
+
+#: C/irc-start-conversation.page:52(p)
+msgid "The IRC room contact list is usually on the right side of the IRC room window. If you do not see it, choose <guiseq><gui>Conversation</gui><gui>Show Contact List</gui></guiseq>."
+msgstr "Seznam stikov sobe IRC je običajno na desni strani okna sobe IRC. V primeru da ga ne vidite izberite <guiseq><gui>Pogovor</gui><gui>Pokaži seznam stikov</gui></guiseq>."
+
+#: C/irc-send-file.page:9(desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr "<app>Empathy</app> trenutno ne podpira pošiljanja datotek z uporabo IRC."
+
+#: C/irc-send-file.page:31(title)
+msgid "Send files over IRC"
+msgstr "Pošiljanje datotek preko IRC-a"
+
+#: C/irc-send-file.page:33(p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Trenutno z uporabo IRC ni mogoče pošiljati datotek."
+
+#: C/irc-nick-password.page:10(desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr "Zaščitite vaš vzdevek in preprečite da bi ga uporabljali drugi uporabniki IRC."
+
+#: C/irc-nick-password.page:33(title)
+msgid "Use a nickname password on IRC"
+msgstr "Uporaba gesla vzdevka na IRC"
+
+#: C/irc-nick-password.page:35(p)
+msgid "On some IRC networks, you can register your nickname with a service called NickServ. By sending special messages to NickServ, you can set your password and identify yourself. Some IRC chat rooms may not allow you to join without a registered nickname."
+msgstr "Na nekaterih omrežjih IRC lahko vpišete svoj vzdevek s storitvijo z imenom NickServ. S pošiljanjem posebnih sporočil NickServ lahko nastavite svojo geslo in se identificirate. Nekatere sobe klepeta IRC vam morda ne dovolijo pridružitve brez vpisanega vzdevka. "
+
+#: C/irc-nick-password.page:40(p)
+msgid "<app>Empathy</app> does not currently support nickname registration. Some IRC networks, however, will automatically forward a <em>server password</em> to NickServ. On these networks, you can use the IRC password in <app>Empathy</app> to identify yourself to NickServ. The popular freenode network is known to have this feature."
+msgstr "<app>Empathy</app> trenutno ne podpira vpisa vzdevkov. Nekatera omrežja IRC bodo NickServ samodejno posredovala <em>geslo strežnika</em>. Na teh omrežjih lahko uporabite geslo IRC v <app>Empathy</app> za identifikacijo sebe NickServ. Priljubljeno omrežje FreeNode ima to zmožnost."
+
+#: C/irc-nick-password.page:46(p)
+msgid "To set an IRC server password:"
+msgstr "Za nastavitev gesla strežnika IRC:"
+
+#: C/irc-nick-password.page:54(p)
+msgid "Select the IRC account from the list on the left of the dialog."
+msgstr "Izberite račun IRC s seznama na levi strani pogovornega okna."
+
+#: C/irc-nick-password.page:57(p)
+msgid "In the <gui>Password</gui> field, type the password you used to register your nikcname."
+msgstr "V polje <gui>Geslo</gui> vtipkajte geslo, ki ste ga uporabili za vpis vašega vzdevka."
+
+#: C/irc-nick-password.page:63(p)
+#: C/import-account.page:61(p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Kliknite <gui style=\"button\">Uveljavi</gui>."
+
+#: C/irc-nick-password.page:69(p)
+msgid "These instructions only allow you to use a password-protected nickname on certain IRC networks. It is not currently possible to register an IRC nickname or change your nickname password using <app>Empathy</app>."
+msgstr "Ta navodila vam dovolijo uporabo z geslom zaščitenega vzdevka na določenih omrežjih IRC. Trenutno z <app>Empathy</app> ni mogoče vpisati vzdevka IRC ali spremeniti svojega vzdevka ali gesla. "
+
+#: C/irc-manage.page:9(desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "Kako uporabiti IRC z <app>Empathy</app>."
+
+#: C/irc-manage.page:34(title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Klepet medmrežnega prenašanja (IRC)"
+
+#: C/irc-manage.page:37(p)
+#: C/account-irc.page:39(p)
+msgid "You must have the <sys>telepathy-idle</sys> package installed to use IRC in <app>Empathy</app>."
+msgstr "Za uporabo IRC-a v <app>Empathy</app> morate imeti nameščen paket <sys>telepathy-idle</sys>."
+
+#: C/irc-manage.page:43(title)
+msgid "IRC Chat Rooms and Conversations"
+msgstr "Pogovori in klepetalnice IRC"
+
+#: C/irc-manage.page:45(title)
+msgid "Chat Rooms and Conversations"
+msgstr "Klepetalnice in pogovori"
+
+#: C/irc-manage.page:50(title)
+msgid "Common IRC Problems"
+msgstr "Pogoste težave IRC"
+
+#: C/irc-manage.page:52(title)
+#: C/index.page:55(title)
+msgid "Common Problems"
+msgstr "Pogoste težave"
+
+#: C/irc-join-room.page:8(desc)
+msgid "Join an IRC channel."
+msgstr "Pridruži se kanalu IRC"
+
+#: C/irc-join-room.page:31(title)
+msgid "Join an IRC chat room"
+msgstr "Pridruži se sobi klepeta IRC"
+
+#: C/irc-join-room.page:33(p)
+msgid "You can join IRC chat rooms (also known as IRC channels) on any IRC network you’re connected to. To connect to an IRC network, see <link xref=\"add-account\"/> and <link xref=\"account-irc\"/>."
+msgstr "Pridružite se lahko klepetalnicam IRC (poznane so tudi kot kanali IRC) na kateremukoli omrežju IRC. Za povezavo z omrežjem IRC si oglejte <link xref=\"add-account\"/> in <link xref=\"account-irc\"/>."
+
+#: C/irc-join-room.page:39(p)
+#: C/group-conversations.page:58(p)
+#: C/group-conversations.page:122(p)
+msgid "From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</gui><gui>Join</gui></guiseq>."
+msgstr "V okno <gui>Seznam stikov</gui> izberite <guiseq><gui>Soba</gui><gui>Pridruži se</gui></guiseq>."
+
+#: C/irc-join-room.page:45(p)
+msgid "From the <gui>Account</gui> drop-down list, select the IRC account that corresponds to the network you want to use."
+msgstr "V spustnemu seznamu <gui>Račun</gui> izberite račun IRC, ki ustreza omrežju, ki ga želite uporabiti."
+
+#: C/irc-join-room.page:51(p)
+msgid "In the <gui>Room</gui> text box, type the name of the channel you want to join. IRC channel names start with the hash character (<sys>#</sys>)."
+msgstr "V besedilno polje <gui>Soba</gui> vnesite ime kanala, ki se mu želite pridružiti. Imena kanalov IRC se začnejo z znakom (<sys>#</sys>)."
+
+#: C/irc-join-room.page:57(p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "Kliknite <gui>Pridruži se</gui> za vstop v sobo."
+
+#: C/irc-join-room.page:64(p)
+msgid "To join multiple rooms, you need to repeat the steps above for each room."
+msgstr "Za pridružitev več sobam boste morali ponoviti korake zgoraj za vsako sobo."
+
+#: C/irc-join-pwd.page:9(desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Vstop v z geslom zaščitene klepetalnice IRC."
+
+#: C/irc-join-pwd.page:25(title)
+msgid "Join a protected IRC chat room"
+msgstr "Pridruži se zaščiteni sobi klepeta IRC"
+
+#: C/irc-join-pwd.page:27(p)
+msgid "On some IRC networks, private IRC rooms may be protected with a password. If you know the password, use the following steps to join:"
+msgstr "Na nekaterih omrežjih IRC so zasebne sobe IRC morda zaščitene z geslom. Če geslo poznate, uporabite naslednje korake za pridružitev:"
+
+#: C/irc-join-pwd.page:33(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
+msgstr "<link xref=\"irc-join-room\">Pridružite se sobi</link> kot običajno."
+
+#: C/irc-join-pwd.page:38(p)
+msgid "Empathy will prompt you for a password. Enter the password for the IRC chat room and click <gui style=\"button\">Join</gui>."
+msgstr "Empathy vas bo pozval za geslo. Vpišite geslo klepetalnice IRC in kliknite na <gui style=\"button\">Pridruži se</gui>."
+
+#: C/irc-commands.page:7(desc)
+msgid "The supported IRC commands."
+msgstr "Podprti ukazi IRC"
+
+#: C/irc-commands.page:18(title)
+msgid "Supported IRC commands"
+msgstr "Podpri ukazi IRC"
+
+#: C/irc-commands.page:19(p)
+msgid "To see the list of the supported IRC commands, in a chat room type <input>/help</input> and press <key>Enter</key>."
+msgstr "Za ogled seznama podprtih ukazov IRC v klepetalnico vpišite <input>/help</input> in pritisnite <key>Vnosno tipko</key>."
+
+#: C/irc-commands.page:24(p)
+msgid "All commands available have a small description on their usage."
+msgstr "Vsi razpoložljivi ukazi imajo kratek opis njihove uporabe. "
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/introduction.page:41(None)
+msgid "@@image: 'figures/empathy-main-window.png'; md5=489ba00b0fc377aba4c691210b6e0650"
+msgstr "@@image: 'figures/empathy-main-window.png'; md5=489ba00b0fc377aba4c691210b6e0650"
+
+#: C/introduction.page:9(desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "Uvod v <app>Empathy</app> hipni sporočevalnik."
+
+#: C/introduction.page:21(title)
+msgid "Introduction"
+msgstr "Uvod"
+
+#: C/introduction.page:23(p)
+msgid "<app>Empathy</app> is an instant messaging application for the GNOME Desktop. It supports text messaging, voice &amp; video calls, file transfers, and all the most used messaging systems such as MSN and Google Talk."
+msgstr "<app>Empathy</app> je program hipnega sporočanja za namizje GNOME. Podpira besedilno sporočanje, zvočne in video klice, prenose datotek in najbolj uporabljene sisteme za sporočanje kot sta MSN in Google Talk."
+
+#: C/introduction.page:28(p)
+msgid "<app>Empathy</app> includes features that help you better collaborate while at work, and that let you easily keep in touch with your friends."
+msgstr "<app>Empathy</app> vključuje zmožnosti, ki vam pomagajo na delu sodelovati in tiste, ki vam omogočajo vzdrževanje stikov s svojimi prijatelji."
+
+#: C/introduction.page:32(p)
+msgid "Using <app>Empathy</app>, you can group all the conversations in a single window, have multiple windows for different kind of conversations, easily search through your previous conversations, and share your desktop in just two clicks."
+msgstr "Z <app>Empathy</app> lahko vse pogovore združite v eno okno, ali imate več oken za različne vrste pogovorov; enostavno iščite skozi svoje predhodne pogovore in dajte svoje namizje v souporabo s samo dvema klikoma."
+
+#: C/introduction.page:39(title)
+msgid "<gui>Contact List</gui> window"
+msgstr "Okno <gui>Seznam stikov</gui>"
+
+#: C/introduction.page:40(desc)
+msgid "<app>Empathy</app> main window"
+msgstr "Glavno okno <app>Empathy</app>"
+
+#: C/introduction.page:42(p)
+msgid "<app>Empathy</app> main window."
+msgstr "Glavno okno <app>Empathy</app>."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:28(None)
+msgid "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+msgstr "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+
+#: C/index.page:7(title)
+#: C/index.page:8(title)
+msgid "Empathy Internet Messenger"
+msgstr "Empathy hipni sporočilnik"
+
+#: C/index.page:27(title)
+msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+msgstr "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\">Logotip hipnega sporočilnika Empathy</media> Empathy hipni sporočilnik"
+
+#: C/index.page:35(title)
+msgid "Account Management"
+msgstr "Upravljanje z računi"
+
+#: C/index.page:39(title)
+msgid "Contact Management"
+msgstr "Upravljanje s stiki"
+
+#: C/index.page:43(title)
+msgid "Text Conversations"
+msgstr "Besedilni pogovori"
+
+#: C/index.page:47(title)
+msgid "Audio and Video Conversations"
+msgstr "Zvočni in video pogovori"
+
+#: C/index.page:51(title)
+msgid "Advanced Actions"
+msgstr "Napredna dejanja"
+
+#: C/import-account.page:10(desc)
+msgid "Import an account from another instant messaging application."
+msgstr "Uvozite račun iz drugega programa hipnega sporočanja."
+
+#: C/import-account.page:19(name)
+msgid "Peter Haslam"
+msgstr "Peter Haslam"
+
+#: C/import-account.page:20(email)
+msgid "peter.haslam@freenet.de"
+msgstr "peter.haslam@freenet.de"
+
+#: C/import-account.page:42(title)
+msgid "Import an existing account"
+msgstr "Uvozi obstoječi račun"
+
+#: C/import-account.page:44(p)
+msgid "The first time you run <app>Empathy</app>, it will offer to import your accounts from other instant messaging applications. Currently, the only supported application is <app>Pidgin</app>."
+msgstr "Ob prvem zagonu <app>Empathy</app>, vam bo ponudil uvoz računov iz drugih programov hipnega sporočanja. Trenutno je edini podprti program <app>Pidgin</app>."
+
+#: C/import-account.page:50(p)
+msgid "Run <app>Empathy</app> for the first time. An assistant will offer you a number of options to create new accounts."
+msgstr "Prvič poženite <app>Empathy</app>. Pomočnik vam bo ponudil več možnosti za ustvarjanje novih računov."
+
+#: C/import-account.page:54(p)
+msgid "Select <gui>Yes, import my account details from</gui> and click <gui>Forward</gui>."
+msgstr "Izberite <gui>Da, uvozi podrobnosti mojega računa iz</gui> in kliknite <gui>Naprej</gui>."
+
+#: C/import-account.page:58(p)
+msgid "Select the check box next to each account you wish to import."
+msgstr "Izberite izbirno bolje poleg vsakega računa, ki ga želite uvoziti."
+
+#: C/import-account.page:66(p)
+msgid "It is not currently possible to import accounts after you have completed the first-run assistant."
+msgstr "Trenutno računov po končanju pomočnika prvega zagona ni mogoče uvažati."
+
+#: C/hide-contacts.page:8(desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr "Skritje nepovezanih stikov iz vašega <gui>Seznama stikov</gui>."
+
+#: C/hide-contacts.page:19(title)
+msgid "Hide offline contacts"
+msgstr "Skrij nepovezane stike"
+
+#: C/hide-contacts.page:21(p)
+msgid "Normally, <app>Empathy</app> shows all your contacts: those that are online, with which you can have a conversation, and also those that are offline."
+msgstr "Običajno <app>Emapthy</app> prikaže vse vaše stike: povezane, s katerimi lahko imate pogovor, in nepovezane."
+
+#: C/hide-contacts.page:25(p)
+msgid "To hide the contacts that are offline:"
+msgstr "Za skritje nepovezanih stikov:"
+
+#: C/hide-contacts.page:31(p)
+msgid "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</key><key>H</key></keyseq>."
+msgstr "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Pogled</gui><gui>Nepovezani stiki</gui></guiseq> ali pritisnite <keyseq><key>Ctrl</key><key>H</key></keyseq>."
+
+#: C/hide-contacts.page:36(p)
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr "Za ponoven prikaz nepovezanih stikov, ponovite postopek zgoraj."
+
+#: C/group-conversations.page:8(desc)
+msgid "Start or join a group conversation with your contacts."
+msgstr "Začetek ali pridružitev skupinskemu pogovoru z vašimi stiki."
+
+#: C/group-conversations.page:34(title)
+msgid "Group conversations"
+msgstr "Skupinski pogovori"
+
+#: C/group-conversations.page:36(p)
+msgid "Group conversations permits you to have text conversations with more than one contact at the same time."
+msgstr "Skupinski pogovori vam omogočajo besedilne pogovor z več kot enim stikom hkrati."
+
+#: C/group-conversations.page:40(p)
+msgid "To have a group conversation you need to have a registered account with either Jabber or Google Talk, or a People Nearby account."
+msgstr "Za skupinski pogovor morate imeti vpisan račun z Jabber ali Google Talk ali račun Ljudje v bližini."
+
+#: C/group-conversations.page:46(p)
+msgid "You can have a group conversation only with the contacts that are using the same service as yours."
+msgstr "Skupinske pogovore lahko imate le s stiki, ki uporabljajo enako storitev kot vi."
+
+#: C/group-conversations.page:54(title)
+msgid "Start a group conversation"
+msgstr "Začni skupinski pogovor"
+
+#: C/group-conversations.page:63(p)
+msgid "From the <gui>Account</gui> drop-down list, select the account you want to use for the group conversation."
+msgstr "V spustnemu seznamu <gui>Račun</gui> izberite račun, ki ga želite uporabiti za skupinski pogovor."
+
+#: C/group-conversations.page:69(p)
+msgid "In the <gui>Server</gui> text box, type the name of server in which the conversation will be hosted."
+msgstr "V besedilno polje <gui>Strežnik</gui> vnesite ime strežnika za gostovanje pogovora."
+
+#: C/group-conversations.page:73(p)
+msgid "Leave it empty if it will be on the current server."
+msgstr "Pustite prazno, če bo soba na trenutnemu strežniku."
+
+#: C/group-conversations.page:78(p)
+msgid "In the <gui>Room</gui> text box, type the name you want to give to the conversation."
+msgstr "V besedilno polje <gui>Soba</gui> vpišite ime, ki ga želite dati pogovoru."
+
+#: C/group-conversations.page:82(p)
+msgid "This will be the name of the room you are going to have a conversation. This name will be publicly available for other people to join. It is not possible to create a private room."
+msgstr "To bo bilo ime sobe za pogovor. To ime bo javno dostopno za druge ljudi, ki se želijo pridružiti. Zasebne sobe ni mogoče ustvariti."
+
+#: C/group-conversations.page:90(p)
+msgid "To invite other contacts to join the group conversation, from the <gui>Contact List</gui> window, select the contact you want to invite, and perform one of the following:"
+msgstr "Za povabilo drugih stikov v skupinski pogovor v oknu <gui>Seznam stikov</gui> izberite stik, ki ga želite povabiti, in izvedite nekaj od sledečega:"
+
+#: C/group-conversations.page:97(p)
+msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
+msgstr "Desno kliknite na stik in izberite <gui>Povabi v kelepetalnico</gui>."
+
+#: C/group-conversations.page:102(p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</gui></guiseq>."
+msgstr "Izberite <guiseq><gui>Uredi</gui><gui>Stik</gui><gui>Povabi v klepetalnico</gui></guiseq>."
+
+#: C/group-conversations.page:107(p)
+msgid "If you have more than one group conversation open, select the one you want to invite your contacts."
+msgstr "V primeru da imate odprt več kot en skupinski pogovor izberite tistega v katerega želite povabiti svoje stike."
+
+#: C/group-conversations.page:118(title)
+msgid "Join a group conversation"
+msgstr "Pridruži se skupinskemu pogovoru"
+
+#: C/group-conversations.page:128(p)
+msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
+msgstr "Razširite odsek <gui>Seznam sob</gui> za ogled vseh obstoječih sob."
+
+#: C/group-conversations.page:133(p)
+msgid "Double-click on the name of a room to join it."
+msgstr "Dvokiliknite na ime sobe za pridružitev."
+
+#: C/group-conversations.page:139(p)
+msgid "It is not possible to join all existing rooms. Some of the rooms might require a password, or might be invitation only. <app>Empathy</app> does not support these kind of rooms."
+msgstr "Ni se mogoče povezati z vsemi obstoječimi sobami. Nekatere sobe morda zahtevajo geslo, ali so dostopne le z vabilom. <app>Empathy</app> ne podpira teh vrst sob."
+
+#: C/geolocation-what-is.page:9(desc)
+msgid "Understanding geolocation."
+msgstr "Razumevanje geo-lege."
+
+#: C/geolocation-what-is.page:33(title)
+msgid "What is geolocation"
+msgstr "Kaj je geo-lega"
+
+#: C/geolocation-what-is.page:35(p)
+msgid "Geolocation allows you to identify the real geographical location of a computer or a device connected to the Internet."
+msgstr "Geo-lega vam omogoča identifikacijo pravega geografskega položaja računalnika ali naprave povezane na medmrežje."
+
+#: C/geolocation-what-is.page:37(p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Z geo-lego v <app>Empathy</app> lahko:"
+
+#: C/geolocation-what-is.page:42(p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Objavite svoj geografski položaj svojim stikom."
+
+#: C/geolocation-what-is.page:47(p)
+msgid "See your contacts’ geographical location and quickly contact them."
+msgstr "Oglejte si geografski položaj vaših stikov in hitro stopite v stik z njimi."
+
+#: C/geolocation-what-is.page:52(p)
+msgid "Set the accuracy of your location and the device used to discover your location."
+msgstr "Nastavite natančnost vašega položaja in napravo uporabljeno za odkritje vašega položaja."
+
+#: C/geolocation-what-is.page:60(p)
+msgid "In order to see your contacts’ geographical locations, they need to use a service and an application that supports geolocation."
+msgstr "Za ogled geografskih položajev vaših stikov, morajo uporabiti storitev in program, ki podpira geo-lego."
+
+#: C/geolocation-turn.page:9(desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "Kako omogočiti in onemogočiti geo-lego v <app>Empathy</app>."
+
+#: C/geolocation-turn.page:33(title)
+msgid "Activate/Deactivate geolocation"
+msgstr "Omogoči/onemogoči geo-lego"
+
+#: C/geolocation-turn.page:37(p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr "Izberite <guiseq><gui>Uredi</gui><gui>Možnosti</gui></guiseq>."
+
+#: C/geolocation-turn.page:42(p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Izberite zavihek <gui>Mesto</gui>."
+
+#: C/geolocation-turn.page:47(p)
+msgid "Select <gui>Publish location to my contacts</gui> to activate geolocation."
+msgstr "Za omogočenje geo-lege izberite <gui>Objavi položaj mojim stikom</gui> za objavo geo-lege."
+
+#: C/geolocation-turn.page:50(p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "Za onemogočenje geo-lege odstranite njeno izbiro."
+
+#: C/geolocation-turn.page:55(p)
+msgid "To increase the accuracy of your position, deselect <gui>Reduce location accuracy</gui>."
+msgstr "Za povečanje natančnosti vašega položaja odstranite izbiro <gui>Zmanjšaj natančnost položaja</gui>. "
+
+#: C/geolocation-turn.page:61(p)
+msgid "If you have an external device like a GPS or want to send a more accurate position, select the appropriate option in the <gui>Location sources</gui> section."
+msgstr "V primeru da imate zunanjo napravo kot je GPS ali želite poslati bolj natančen položaj, izberite primerno možnost v odseku <gui>Viri mesta</gui>."
+
+#: C/geolocation-supported.page:7(desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "Storitve, ki podpirajo geo-lego in združljivost."
+
+#: C/geolocation-supported.page:31(title)
+msgid "Supported services"
+msgstr "Podprte storitve"
+
+#: C/geolocation-supported.page:33(p)
+msgid "The geolocation feature at the moment is compatible only with the Jabber service. In order to use it, you and your contacts need to have a Jabber account."
+msgstr "Zmožnost geo-lege je trenutno združljiva le s storitvijo Jabber. Za uporabo zmožnosti morate imeti vi in vaš stik račun Jabber."
+
+#: C/geolocation-supported.page:39(p)
+msgid "It is necessary that also the server you are using supports the geolocation feature. Most of the Jabber servers support it. See your service website documentation for more information."
+msgstr "Zahtevano je, da strežnik, ki ga uporabljate, podpira zmožnost geo-lege. Podpira jo večina strežnikov Jabber. Za več podrobnosti si oglejte si dokumentacijo na spletišču vaše storitve."
+
+#: C/geolocation-supported.page:47(title)
+msgid "Compatibility"
+msgstr "Združljivost"
+
+#: C/geolocation-supported.page:49(p)
+msgid "<app>Empathy</app> geolocation feature is not compatible with other geographical position services such as <em>Google Latitude</em>, <em>Yahoo Fire Eagle</em> or <em>Brightkite</em>."
+msgstr "Zmožnost geo-lege <app>Empathy</app> ni združljiva z drugimi storitvami geografskih položajev kot so <em>Google Latitude</em>, <em>Yahoo Fire Eagle</em> ali <em>Brightkite</em>."
+
+#: C/geolocation-privacy.page:8(desc)
+msgid "What information are sent and to who."
+msgstr "Kateri podatki so poslani in komu."
+
+#: C/geolocation-privacy.page:32(title)
+msgid "Geolocation Privacy"
+msgstr "Zasebnost Geo-lege"
+
+#: C/geolocation-privacy.page:35(title)
+msgid "What information is sent"
+msgstr "Kateri podatki so poslani"
+
+#: C/geolocation-privacy.page:36(p)
+msgid "What is possible to send is: your country, region, locality, area, street, building, floor, room, and postal code, longitude, latitude and altitude, speed and bearing."
+msgstr "Mogoče je poslati: vašo državo, regijo, krajevnost, področje, ulico, zgradbo, nadstropje, sobo, poštno številko, zemljepisno širino in dolžino, nadmorsko višino, hitrost in smer."
+
+#: C/geolocation-privacy.page:40(p)
+msgid "The accuracy and the quantity of information about your geographical position are based on the software or on the infrastructure used to discover your position."
+msgstr "Natančnost in kakovost podatkov o vašemu geografskemu položaju je odvisna od programov infrastrukture uporabljene za odkritje vašega položaja."
+
+#: C/geolocation-privacy.page:44(p)
+msgid "Different kind of networks may have different accuracy settings, and may send different information. The use of external devices such as GPS or mobile phone will increase the accuracy of the information sent."
+msgstr "Drugačne vrste omrežij imajo morda različne vrste natančnosti in lahko pošljejo različne podatke. Uporaba zunanjih naprav kot sta GPS in mobilni telefon bo povečalo natančnost poslanih podatkov."
+
+#: C/geolocation-privacy.page:49(p)
+msgid "When the privacy mode is enabled, nothing more precise than your city will be sent, even if you are using an external device."
+msgstr "Ko je omogočen način zasebnosti, ne bo poslano nič bolj natančno kot vaše mesto, tudi če uporabljate zunanjo napravo."
+
+#: C/geolocation-privacy.page:56(title)
+msgid "Who can see the information sent"
+msgstr "Kdo lahko vidi poslane podatke"
+
+#: C/geolocation-privacy.page:57(p)
+msgid "Only your contacts can see your geographical position."
+msgstr "Vaš geografski položaj lahko vidijo le vaši stiki."
+
+#: C/geolocation-privacy.page:63(title)
+msgid "What is the privacy mode"
+msgstr "Kaj je način zasebnosti"
+
+#: C/geolocation-privacy.page:64(p)
+msgid "The privacy mode, enabled by default, is a reduced accuracy mode that will decrease the accuracy of the geographical position sent to your contacts."
+msgstr "Način zasebnosti je privzeto omogočen način zmanjšane natančnosti, ki bo zmanjšal natančnost geografskega položaja poslanega vašim stikom."
+
+#: C/geolocation-privacy.page:71(title)
+msgid "Privacy overview"
+msgstr "Pregled zasebnosti"
+
+#: C/geolocation-privacy.page:72(p)
+msgid "Overview of the various geolocation privacy settings in <app>Empathy</app>."
+msgstr "Pregled različnih nastavitev zasebnosti geo-lege v <app>Empathy</app>. "
+
+#: C/geolocation-privacy.page:77(p)
+msgid "Geolocation is not enabled by default."
+msgstr "Geolega privzeto ni omogočena."
+
+#: C/geolocation-privacy.page:82(p)
+msgid "Privacy mode is enabled by default."
+msgstr "Način zasebnosti je privzeto omogočen."
+
+#: C/geolocation-privacy.page:87(p)
+msgid "Privacy mode prevails even when using external and more precise devices."
+msgstr "Način zasebnosti prevlada celo pri uporabi zunanjih in bolj natančnih naprav."
+
+#: C/geolocation-privacy.page:92(p)
+msgid "Only your contacts can see your position."
+msgstr "Vaš položaj lahko vidijo le vaši stiki."
+
+#: C/geolocation-not-showing.page:8(desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app> ne objavi mojega geografskega položaja."
+
+#: C/geolocation-not-showing.page:32(title)
+msgid "Geographical position not published"
+msgstr "Geografska lega ni objavljena"
+
+#: C/geolocation-not-showing.page:34(p)
+msgid "If your contacts cannot see your location, <app>Empathy</app> might not be able to discover with a good margin of precision your geographical position."
+msgstr "V primeru da vaši stiki ne morejo videti vašega položaj, <app>Empathy</app> morda ne more odkriti vašega geografskega položaja z dobro natančnostjo. "
+
+#: C/geolocation-not-showing.page:38(p)
+msgid "In this case, your position will not be published, but you are still able to see the location of your contacts."
+msgstr "V temu primeru vaš položaj ne bo objavljen, toda še vedno boste lahko videli položaje vaših stikov."
+
+#: C/geolocation-not-showing.page:42(p)
+msgid "If you want to publish your geographical position, you can try to use an external device such as a GPS."
+msgstr "V primeru da želite objaviti vaš geografski položaj, lahko poskusite z uporabo zunanje naprave kot je GPS."
+
+#: C/geolocation-not-showing.page:48(p)
+msgid "In order to publish your geographical location, your Jabber server needs to support the Personal Eventing Protocal (PEP). A list of <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support PEP</link> is maintained online. Google Talk does not support this feature at this time."
+msgstr "Za objavo svojega geografskega položaja, mora vaš strežnik Jabber podpirati Osebni protokol dogodkov (PEP). Seznam <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">strežnikov s podporo PEP</link> je vdrževan na spletu. Google Talk trenutno te zmožnosti ne podpira."
+
+#: C/geolocation.page:8(desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "Uporabite in razumite geolego v <app>Empathy</app>."
+
+#: C/geolocation.page:32(title)
+msgid "Geographical position"
+msgstr "Geografska lega"
+
+#: C/geolocation.page:35(title)
+msgid "Geolocation"
+msgstr "Geo-lega"
+
+#: C/geolocation.page:39(title)
+msgid "Fix common problems"
+msgstr "Popravi pogoste napake"
+
+#: C/favorite-rooms.page:10(desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Nastavite, pridružite se in upravljajte priljubljene sobe."
+
+#: C/favorite-rooms.page:29(title)
+msgid "Favorite rooms"
+msgstr "Priljubljene sobe"
+
+#: C/favorite-rooms.page:32(title)
+msgid "Set a room as a favorite"
+msgstr "Nastavi sobo kot priljubljeno"
+
+#: C/favorite-rooms.page:35(p)
+msgid "Join a room."
+msgstr "Pridruži se sobi."
+
+#: C/favorite-rooms.page:40(p)
+msgid "See <link xref=\"irc-join-room\"/> for more information on how to join an IRC room."
+msgstr "Za več podrobnosti kako se pridružiti sobi IRC si oglejte <link xref=\"irc-join-room\"/>. "
+
+#: C/favorite-rooms.page:46(p)
+msgid "See <link xref=\"group-conversations\"/> for more information on how to start or join a group conversation."
+msgstr "Za več podrobnosti kako začeti ali se pridružiti skupinskemu pogovoru si oglejte <link xref=\"group-conversations\"/>."
+
+#: C/favorite-rooms.page:54(p)
+msgid "From the conversation window, choose <guiseq><gui>Conversation</gui><gui>Favorite Chat Room</gui></guiseq>."
+msgstr "V oknu pogovora izberite <guiseq><gui>Pogovor</gui><gui>Priljubljena klepetalnica</gui></guiseq>."
+
+#: C/favorite-rooms.page:63(title)
+msgid "Join favorite rooms"
+msgstr "Pridruži se priljubljenim sobam"
+
+#: C/favorite-rooms.page:71(p)
+msgid "Press <key>F5</key>."
+msgstr "Pritisnite <key>F5</key>."
+
+#: C/favorite-rooms.page:76(p)
+msgid "Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join all your favorite rooms."
+msgstr "Izberite <guiseq><gui>Soba</gui><gui>Pridruži se priljubljenim</gui></guiseq>, za pridružitev vsem vašim priljubljenim sobam."
+
+#: C/favorite-rooms.page:82(p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+msgstr "Izberite <gui>Soba</gui> in izberite sobo, ki se ji želite pridružiti."
+
+#: C/favorite-rooms.page:90(p)
+msgid "To join a favorite room, you need to be connected to the Internet and to your account."
+msgstr "Za pridružitev priljubljeni sobi morate biti povezani z medmrežjem in z vašim računom."
+
+#: C/favorite-rooms.page:98(title)
+msgid "Manage favorite rooms"
+msgstr "Upravljaj s priljubljenimi sobami"
+
+#: C/favorite-rooms.page:101(p)
+msgid "From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</gui><gui>Manage Favorites</gui></guiseq>."
+msgstr "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Soba</gui><gui>Upravljaj priljubljene</gui></guiseq>."
+
+#: C/favorite-rooms.page:107(p)
+msgid "From the <gui>Account</gui> drop-down list, select the account you want to manage the favorite rooms of."
+msgstr "V spustnemu seznamu <gui>Račun</gui> izberite račun, katerega priljubljene sobe želite upravljati."
+
+#: C/favorite-rooms.page:111(p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "Izberite <gui>Vse</gui> za ogled vseh svojih priljubljenih sob."
+
+#: C/favorite-rooms.page:116(p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Izberite priljubljeno sobo, ki jo želite upravljati:"
+
+#: C/favorite-rooms.page:121(p)
+msgid "Select the <gui>Auto-Connect</gui> check-box in order to automatically join that room when you connect to your account."
+msgstr "Izberite izbirno polje <gui>Samodejna povezava</gui> za samodejno povezovanje s to sobo, ko se povežete s svojim računom."
+
+#: C/favorite-rooms.page:127(p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr "Za odstranitev sobe iz svojih priljubljenih kliknite na <gui>Odstrani</gui>."
+
+#: C/favorite-rooms.page:134(p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Ko ste končali, kliknite <gui>Zapri</gui>."
+
+#: C/disable-account.page:9(desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr "Preprečitev samodejnega prijavljanja <app>Empathy</app> v račun."
+
+#: C/disable-account.page:39(title)
+msgid "Disable an account"
+msgstr "Onemogoči račun"
+
+#: C/disable-account.page:41(p)
+msgid "You can disable an account to prevent <app>Empathy</app> from logging in to it without removing the account entirely. You may wish to disable and re-enable an account if you only want to be logged in to the account at certain times, but you still want to use <app>Empathy</app> for other accounts."
+msgstr "Za preprečitev prijave v <app>Empaty</app> brez odstranitve računa lahko račun onemogočite. Morda želite račun onemogočiti in ponovno omogočiti v primeru da želite biti v račun prijavljeni le ob določenih časih, toda želite <app>Empathy</app> še vedno uporabiti za druge račune. "
+
+#: C/disable-account.page:52(p)
+msgid "Select the account you wish to disable from the accounts list on the left side of the window."
+msgstr "Izberite račun, ki ga želite onemogočiti, s seznama računov na levi strani okna."
+
+#: C/disable-account.page:56(p)
+msgid "Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the window."
+msgstr "Odstranite izbiro <gui style=\"checkbox\">Omogočeno</gui> na desni strani okna."
+
+#: C/disable-account.page:62(p)
+msgid "To re-enable the account, simply select <gui style=\"checkbox\">Enabled</gui>."
+msgstr "Za ponovno omogočitev računa enostavno izberite <gui style=\"checkbox\">Omogočeno</gui>."
+
+#: C/create-account.page:9(desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Vpis za račun z eno od podprtih storitev sporočanja."
+
+#: C/create-account.page:34(title)
+msgid "Register for a new account"
+msgstr "Vpiši za nov račun"
+
+#: C/create-account.page:36(p)
+msgid "Most account types require you to create an account with a account provider before you can connect using instant messaging applications like <app>Empathy</app>. With some account providers, you can use <app>Empathy</app> to register for a new account, using the same steps as you would to <link xref=\"add-account\">add an account</link>."
+msgstr "Večina vrst računov pred povezovanjem s programom hipnega sporočanja kot je <app>Empathy</app> zahteva ustvarjanje računa s ponudnikom računa. Za nekatere ponudnike računov je mogoče za vpis novega računa uporabiti <app>Empathy</app> z uporabo enakih korakov kot za <link xref=\"add-account\">dodajanje računa</link>."
+
+#: C/create-account.page:42(p)
+msgid "This page provides information on creating a new account for various types of accounts. Your account provider should give you a login ID and a password, as well as any additional information you need to connect using <app>Empathy</app>."
+msgstr "Ta stran zagotavlja podatke o ustvarjanju novih računov za različne vrste računov. Vaš ponudnik računa vam bi moral dati ID prijave in geslo ter morebitne dodatne podatke, ki jih potrebujete za povezavo z <app>Empathy</app>."
+
+#: C/create-account.page:47(title)
+msgid "Facebook"
+msgstr "Facebook"
+
+#: C/create-account.page:48(p)
+msgid "Facebook is one of the most-used social networks. It allows users to create their own profile and to communicate with their friends."
+msgstr "Facebook je eno od najbolj uporabljanih družabnih omrežij. Uporabnikom dovoljuje ustvarjanje njihovega lastnega profila in komunikacijo s prijatelji."
+
+#: C/create-account.page:52(p)
+msgid "To use Facebook to communicate with your friends, you will need to create a new account from the website: <link href=\"http://www.facebook.com\">www.facebook.com</link>."
+msgstr "Za uporabo Facebooka za komunikacijo s prijatelji boste morali ustvariti nov račun na spletni strani: <link href=\"http://www.facebook.com\">www.facebook.com</link>."
+
+#: C/create-account.page:60(title)
+#: C/audio-video.page:170(p)
+msgid "Jabber"
+msgstr "Jabber"
+
+#: C/create-account.page:62(p)
+msgid "Jabber is an open instant messaging system. Like email, Jabber allows you to choose your account provider and communicate with all other Jabber users, regardless of their account provider."
+msgstr "Jabber je odprt sistem takojšnjega sporočanja. Tako kot elektronska pošta, vam Jabber omogoča izbiro vašega ponudnika računa in sporočanje z vsemi drugimi uporabniki Jabber ne glede na njihovega ponudnika računa. "
+
+#: C/create-account.page:66(p)
+msgid "You will need to create a new account with a Jabber provider. There are many free providers; one popular provider is <link href=\"http://register.jabber.org/\">Jabber.org</link>."
+msgstr "S ponudnikom Jabber boste morali ustvariti nov račun. Obstaja veliko brezplačnih podudnikov; en priljubljen ponudnik je <link href=\"http://register.jabber.org/\">Jabber.org</link>."
+
+#: C/create-account.page:71(p)
+msgid "If you use Google Mail or Google Talk, you already have a Jabber account. Google Talk is a Jabber service. Simply use your Google Mail address and password in <app>Empathy</app> to connect."
+msgstr "V primeru da uporabljate GMail ali Google Talk že imate račun Jabber. Google Talk je storitev Jabber. Za povezavo v <app>Empathy</app> enostavno uporabite svoj GMail naslov in geslo. "
+
+#: C/create-account.page:78(title)
+#: C/audio-video.page:190(p)
+msgid "People Nearby"
+msgstr "Ljudje v bližini"
+
+#: C/create-account.page:80(p)
+msgid "You do not need to create an account with a service provider to use this feature. This service works whenever you are connected to a local network, such as a wireless hotspot. It automatically finds all other users on the network who are also using this service."
+msgstr "Za uporabo te zmožnosti vam ni treba ustvariti računa s ponudnikom storitve. Ta storitev deluje kadarkoli ste povezani na krajevno omrežje kot je brezžična vroča točka. Samodejno najde ostale uporabnike na omrežju, ki tudi uporabljajo to storitev."
+
+#: C/create-account.page:85(p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "Za več podrobnosti si oglejte <link xref=\"salut-protocol\"/>."
+
+#: C/create-account.page:89(title)
+#: C/audio-video.page:205(p)
+msgid "SIP"
+msgstr "SIP"
+
+#: C/create-account.page:91(p)
+msgid "SIP is an open system which allows users to have audio and video conversations over the Internet. You need to create an account with a SIP provider. You can communicate with all other SIP users, regardless of which SIP provider they use."
+msgstr "SIP je odprt sistem, ki uporabnikom omogoča zvočne in video pogovore preko medmrežja. S ponudnikom SIP morate ustvariti račun. Sporazumevate se lahko z vsemi drugimi uporabniki SIP, ne glede na to katerega ponudnika SIP uporabljajo."
+
+#: C/create-account.page:97(p)
+msgid "Due to technical differences, the free <link href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> service does not currently work with <app>Empathy</app>."
+msgstr "Zaradi tehničnih razlik brezplačna storitev <link href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> ne deluje z <app>Empathy</app>."
+
+#: C/create-account.page:102(p)
+msgid "Some SIP providers allow you to call normal phones from your computer. Generally, you will need to subscribe to a paid service for this feature."
+msgstr "Nekateri podnudniki SIP vam z vašega računalnika omogočajo klic na običajne telefone. V splošnem se morate za uporabo te zmožnosti naroči na plačljivo storitev. "
+
+#: C/create-account.page:107(title)
+#: C/audio-video.page:165(p)
+msgid "IRC"
+msgstr "IRC"
+
+#: C/create-account.page:109(p)
+msgid "You do not need to register for an account to use IRC. Although you specify a nickname when you add an IRC account to <app>Empathy</app>, this nickname is only established each time you connect. If another user is using the nickname, you will need to choose a new nickname."
+msgstr "Za uporabo IRC-a se ne potrebujete vpisati za račun. Čeprav ob dodajanju računa IRC v <app>Empathy</app> navedete vzdevek, je vzdevek vzpostavljen ob vsaki povezavi. V primeru da vzdevek uporablja drug uporabnik, boste morali izbrati nov vzdevek. "
+
+#: C/create-account.page:114(p)
+msgid "Some IRC networks use a service called NickServ to allow users to protect their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
+msgstr "Nekatera omrežja IRC uporabljajo storitev z imenom NickServ, ki uporabnikom omogoča zaščito njihovih vzdevkov. Za več podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
+
+#: C/create-account.page:117(p)
+msgid "Some IRC servers are password protected. You will need to know the password to connect to these servers. Generally, these are private IRC networks."
+msgstr "Nekateri strežniki IRC so zaščiteni z geslom. Za povezavo s temi strežniki boste morali poznati geslo. V splošnem so to zasebna omrežja IRC."
+
+#: C/create-account.page:122(title)
+msgid "Proprietary Services"
+msgstr "Lastniške storitve"
+
+#: C/create-account.page:124(p)
+msgid "There are many proprietary instant messaging services that have been developed by different companies or organizations. <app>Empathy</app> allows you to connect to an existing account for most popular services. To create a new account with one of these services, you will need to visit the service’s web site and agree to its terms of use."
+msgstr "Različna podjetja in organizacije so razvile veliko lastniških storitev hipnega sporočanja. <app>Empathy</app> vam omogoča povezavo z obstoječim računom za večino priljubljenih storitev. Za ustvarjanje novega računa z eno od teh storitev boste morali obiskati spletišče storitve in se strinjati s pogoji uporabe."
+
+#: C/create-account.page:133(link)
+#: C/audio-video.page:135(p)
+msgid "AIM"
+msgstr "AIM"
+
+#: C/create-account.page:138(link)
+#: C/audio-video.page:160(p)
+msgid "ICQ"
+msgstr "ICQ"
+
+#: C/create-account.page:143(link)
+#: C/audio-video.page:175(p)
+msgid "MSN"
+msgstr "MSN"
+
+#: C/create-account.page:148(link)
+#: C/audio-video.page:210(p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: C/change-status.page:9(desc)
+msgid "Change your status to advertise your availability to your contacts."
+msgstr "Spremenite svoje stanje za oglaševanje vaše razpoložljivosti vašim stikom."
+
+#: C/change-status.page:34(title)
+msgid "Change your status"
+msgstr "Spremenite vaše stanje"
+
+#: C/change-status.page:36(p)
+msgid "You can set your status to indicate your availability to your contacts. <app>Empathy</app> allows you to select from a list of defined statuses."
+msgstr "Nastavite lahko svoje stanje za nakaz vaše razpoložljivosti vašim stikov. <app>Empathy</app> vam omogoča izbiro s seznama določenih stanj."
+
+#: C/change-status.page:41(p)
+msgid "Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+msgstr "Kliknite na spustni seznam na vrhu okna <gui>Seznam stikov</gui>."
+
+#: C/change-status.page:46(p)
+msgid "Select a status from the list."
+msgstr "Izberite stanje s seznama"
+
+#: C/change-status.page:52(p)
+msgid "See <link xref=\"status-icons\"/> for a list of the built-in statuses and what they mean. You can also <link xref=\"set-custom-message\">add custom status messages</link> to provide more information about your availability to your contacts."
+msgstr "Oglejte si <link xref=\"status-icons\"/> za seznam vgrajenih stanj in kaj pomenijo. Lahko tudi <link xref=\"set-custom-message\">dodate sporočila stanja po meri</link> za več podrobnosti o vaših razpoložljivosti vašim stikom."
+
+#: C/change-status.page:58(p)
+msgid "If you do not use your computer for a while, or if the screensaver is on, the status will be automatically set to Away."
+msgstr "V primeru da svojega računalnika nekaj časa ne uporabljate, ali če je ohranjevalnik zaslona vklopljen bo stanje samodejno nastavljeno na Odsoten."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/audio-video.page:58(None)
+msgid "@@image: 'figures/audio-input-microphone.png'; md5=8d89026b66a263a3bc5b1f0665948567"
+msgstr "@@image: 'figures/audio-input-microphone.png'; md5=8d89026b66a263a3bc5b1f0665948567"
+
+#: C/audio-video.page:8(desc)
+msgid "Information on when it is possible to have an audio or video conversation."
+msgstr "Podatki kdaj je mogoče imeti zvočni ali video pogovor."
+
+#: C/audio-video.page:32(title)
+msgid "Audio and video support"
+msgstr "Podpora za zvok in video"
+
+#: C/audio-video.page:34(p)
+msgid "You can only have audio and video conversation with contacts who are using an application which also supports this feature. When your contacts support audio or video conversations, you will see the following icons next to their names in the contact list:"
+msgstr "Zvočne in video pogovor imate lahko le s stiki, ki uporabljajo program s podporo te zmožnosti. V primeru da vaši stiki podpirajo zvočne ali video pogovore lahko vidite naslednje ikone poleg njihovih imen na seznamu stikov:"
+
+#: C/audio-video.page:43(p)
+msgid "Icon"
+msgstr "Ikona"
+
+#: C/audio-video.page:48(p)
+msgid "Description"
+msgstr "Opis"
+
+#: C/audio-video.page:58(media)
+msgid "Icon for audio conversation"
+msgstr "Ikona za zvočni pogovor"
+
+#: C/audio-video.page:64(p)
+msgid "The contact is able to have an audio conversation."
+msgstr "Stik lahko ima zvočni pogovor."
+
+#: C/audio-video.page:70(media)
+msgid "Icon for video conversation"
+msgstr "Ikona za video pogovor"
+
+#: C/audio-video.page:76(p)
+msgid "The contact is able to have a video conversation."
+msgstr "Stik lahko ima video pogovor."
+
+#: C/audio-video.page:83(p)
+msgid "In order to have an audio conversation, you need to have a sound card that is supported by your operating system, and a working microphone."
+msgstr "Za zvočni pogovor morate imeti zvočno kartico, ki jo vaš operacijski sistem podpira, in delujoči mikrofon. "
+
+#: C/audio-video.page:87(p)
+msgid "In order to have a video conversation, you need to have a webcam that is supported by your operating system, and a working microphone."
+msgstr "Za video pogovor morate imeti spletno kamero, ki jo vaš operacijski sistem podpira, in delujoči mikrofon."
+
+#: C/audio-video.page:95(title)
+msgid "Supported Account Types"
+msgstr "Podprte vrste računov"
+
+#: C/audio-video.page:97(p)
+msgid "You can only have audio and video conversations using accounts on certain supported services. The following table lists whether audio and video is supported for each type of account."
+msgstr "Video in zvočne pogovore imate lahko le z uporabo računov na določenih podprtih storitvah. Naslednja razpredelnica našteva ali sta zvok in video podprta za vsako vrsto računa."
+
+#: C/audio-video.page:102(p)
+msgid "Account types are provided by plugins. Your system may not have all of the following types available, or it may have types not listed here. Updated plugins may make audio or video conversations possible on account types that are listed as unsupported here."
+msgstr "Vrste računov zagotavljajo vstavki. Vaš sistem morda nima na voljo vseh sledečih vrst, ali morda vsebuje vrste, ki tukaj niso naštete. Posodobljeni vstavki lahko omogočijo zvočni ali video klepet na vrstah računov, ki so tukaj naštete kot nepodprte."
+
+#: C/audio-video.page:110(p)
+msgid "I'd like to do tables like this using nothing for No and ✔ for Yes, but we need to look at the accessibility impact. I've <link href=\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the accessibility team</link> for input."
+msgstr "Želim narediti razporeditve kot je ta z uporabo Ne in ✔ za Ja, toda potrebno je pogledati vpliv na dostopnost. Za mnenje sem <link href=\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">vprašal ekipo dostopnosti</link> ."
+
+#: C/audio-video.page:118(p)
+msgid "There's recent work on telepathy-butterfly and papyon to support audio and video for MSN. It might be released in time for 2.28, but since it doesn't follow the Gnome release schedule, I can't be sure. If it looks like it's going to ship, let's mark it Yes."
+msgstr "Nedavno delo na telepathy-butterfly in papayon podpira zvok in video za MSN. Morda bo podpora izšla v 2.28, toda ker ne sledi razporeditvi izdaje Gnome, ni mogoče biti prepričan. V primeru da je videti, kot da bo podpora izšla, jo bom označil z Da."
+
+#: C/audio-video.page:128(p)
+msgid "Service"
+msgstr "Storitev"
+
+#: C/audio-video.page:129(p)
+msgid "Audio"
+msgstr "Zvok"
+
+#: C/audio-video.page:130(p)
+msgid "Video"
+msgstr "Video"
+
+#: C/audio-video.page:136(p)
+#: C/audio-video.page:137(p)
+#: C/audio-video.page:141(p)
+#: C/audio-video.page:142(p)
+#: C/audio-video.page:146(p)
+#: C/audio-video.page:147(p)
+#: C/audio-video.page:156(p)
+#: C/audio-video.page:157(p)
+#: C/audio-video.page:161(p)
+#: C/audio-video.page:162(p)
+#: C/audio-video.page:166(p)
+#: C/audio-video.page:167(p)
+#: C/audio-video.page:181(p)
+#: C/audio-video.page:182(p)
+#: C/audio-video.page:186(p)
+#: C/audio-video.page:187(p)
+#: C/audio-video.page:191(p)
+#: C/audio-video.page:192(p)
+#: C/audio-video.page:196(p)
+#: C/audio-video.page:197(p)
+#: C/audio-video.page:201(p)
+#: C/audio-video.page:202(p)
+#: C/audio-video.page:211(p)
+#: C/audio-video.page:212(p)
+#: C/audio-video.page:216(p)
+#: C/audio-video.page:217(p)
+msgid "No"
+msgstr "Ne"
+
+#: C/audio-video.page:140(p)
+msgid "Facebook Chat"
+msgstr "Facebook klepet"
+
+#: C/audio-video.page:145(p)
+msgid "gadugadu"
+msgstr "gadugadu"
+
+#: C/audio-video.page:150(p)
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: C/audio-video.page:151(p)
+#: C/audio-video.page:152(p)
+#: C/audio-video.page:171(p)
+#: C/audio-video.page:172(p)
+#: C/audio-video.page:176(p)
+#: C/audio-video.page:177(p)
+#: C/audio-video.page:206(p)
+#: C/audio-video.page:207(p)
+msgid "Yes"
+msgstr "Da"
+
+#: C/audio-video.page:155(p)
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: C/audio-video.page:180(p)
+msgid "myspace"
+msgstr "myspace"
+
+#: C/audio-video.page:185(p)
+msgid "qq"
+msgstr "qq"
+
+#: C/audio-video.page:195(p)
+msgid "sametime"
+msgstr "sametime"
+
+#: C/audio-video.page:200(p)
+msgid "silc"
+msgstr "silc"
+
+#: C/audio-video.page:215(p)
+msgid "zephyr"
+msgstr "zephyr"
+
+#: C/audio-call.page:9(desc)
+msgid "Call your contacts over the Internet."
+msgstr "Klic vaših stikov preko medmrežja."
+
+#: C/audio-call.page:27(title)
+msgid "Start an audio conversation"
+msgstr "Začenjanje zvočnega pogovora"
+
+#: C/audio-call.page:29(p)
+msgid "You can call your contacts and have an audio conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports audio calls."
+msgstr "Svoje stike lahko pokličete in imate z njimi zvočni pogovor. Ta zmožnost deluje le z določenimi vrstami računov in pod pogojem da ima druga oseba program, ki podpira zvočne klice."
+
+#: C/audio-call.page:34(p)
+msgid "From the <gui>Contact List</gui> window, click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to the name of the contact you wish to call and choose <gui style=\"menuitem\">Audio Call</gui>."
+msgstr "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video klic</media> poleg imena stika, ki ga želite poklicati in izberite <gui style=\"menuitem\">Zvočni klic</gui>."
+
+#: C/audio-call.page:55(p)
+msgid "To turn an audio conversation into a video conversation, choose <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
+msgstr "Za pretvorbo zvočnega pogovora v video pogovor izberite <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Vklopi</gui></guiseq>."
+
+#: C/audio-call.page:63(title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Začetek zvočnega pogovora z meta-stikom"
+
+#: C/audio-call.page:71(p)
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr "Desno kliknite na ime stika s katerim želite imeti pogovor in izberite <gui>Zvočni klic</gui>."
+
+#: C/add-contact.page:9(desc)
+msgid "Add someone to the contact list."
+msgstr "Dodajanje nekoga na seznam stikov."
+
+#: C/add-contact.page:33(title)
+msgid "Add someone to your list of contacts"
+msgstr "Dodajanje nekoga na vaš seznam stikov"
+
+#: C/add-contact.page:37(p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr "Izberite <guiseq><gui>Klepet</gui><gui>Dodaj stik</gui></guiseq>."
+
+#: C/add-contact.page:40(p)
+msgid "From the <gui>Account</gui> drop-down list, select the account you wish to use to connect to your contact. Your contact will need to be using the same service as the account you select."
+msgstr "Na spustnemu seznamu <gui>Račun</gui> izberite račun, ki ga želite uporabiti za povezovanje z vašim stikom. Vaš stik bo moral uporabiti isto storitev kot račun, ki ste ga izbrali."
+
+#: C/add-contact.page:45(p)
+msgid "In the <gui>Identifier</gui> field, enter your contact’s login ID, username, screen name, or other appropriate identifier for the service type."
+msgstr "V polju <gui>Določilo</gui> vnesite ID vašega stika, uporabniško ime, prikazano ime ali drugo primerno določilo za vrsto storitve."
+
+#: C/add-contact.page:49(p)
+msgid "In the <gui>Alias</gui> field, type your contact’s name as you would like it to appear in your contact list."
+msgstr "V polje <gui>Vzdevek</gui> vtipkajte ime vašega stika, kot naj se pojavi v vašemu seznamu stikov."
+
+#: C/add-contact.page:53(p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+msgstr "Za dodajanje osebe na vaš seznam stikov kliknite <gui>Dodaj</gui>."
+
+#: C/add-contact.page:61(p)
+msgid "To add a new person to your list of contacts, you need to be connected to the Internet and to your account."
+msgstr "Za dodajanje nove osebe na vaš seznam stikov morate biti povezani na medmrežje in na vaš račun."
+
+#: C/add-account.page:9(desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Dodajanje novega računa v <app>Empathy</app>."
+
+#: C/add-account.page:39(title)
+msgid "Add a new account"
+msgstr "Dodajanje novega računa"
+
+#: C/add-account.page:41(p)
+msgid "You can add instant messaging accounts from any supported service to communicate with all of your contacts in <app>Empathy</app>. For some account providers, these steps will also allow you to register for a new account. For more details, see <link xref=\"create-account\"/>."
+msgstr "Račune hipnega sporočanja za sporazumevanje z vsemi vašimi stiki v <app>Empath</app> lahko dodate s katerekoli podprte naprave. Za nekatere ponudnike računov vam bodo ti koraki omogočili tudi vpis za nov račun. Za več podrobnosti si oglejte <link xref=\"create-account\"/>."
+
+#: C/add-account.page:52(p)
+msgid "Click <gui style=\"button\">Add</gui>."
+msgstr "Kliknite <gui style=\"button\">Dodaj</gui>."
+
+#: C/add-account.page:57(p)
+msgid "From the <gui>Protocol</gui> drop-down list, select the type of account you wish to add."
+msgstr "Na spustnemu seznamu <gui>Protokol</gui> izberite vrsto računa, ki jo želite dodati."
+
+#: C/add-account.page:61(p)
+msgid "If you do not already have a registered account, select <gui>Create a new account on the server</gui>. This feature is not available for all account types, and may not work with some account providers. See <link xref=\"create-account\"/> for more information."
+msgstr "V primeru da še niste vpisali računa, izberite <gui>Ustvari nov račun na strežniku</gui>. Ta zmožnost ni na voljo za vse vrste računov in morda ne bo delovala z nekaterimi ponudniki računov. Za več podrobnosti si oglejte <link xref=\"create-account\"/>. "
+
+#: C/add-account.page:66(p)
+msgid "Enter the required information. For most accounts, you will only need a login ID and a password. Some accounts may require additional information. See <link xref=\"accounts-window#details\"/> for more information."
+msgstr "Vnesite zahtevane podatke. Za večino računov boste potrebovali le ID prijave in geslo. Nekateri računi morda zahtevajo dodatne podrobnosti. Za več podrobnosti si oglejte <link xref=\"accounts-window#details\"/>."
+
+#: C/add-account.page:71(p)
+msgid "Click <gui style=\"button\">Log in</gui>."
+msgstr "Kliknite <gui style=\"button\">Prijava</gui>."
+
+#: C/add-account.page:78(p)
+msgid "To change the name that identifies the account in the <gui>Accounts</gui> window, select the account from the list on the left and either click on the name or press the space bar. Edit the account name and press <key>Enter</key> when you’re finished."
+msgstr "Za spremembo imena, ki identificira račun v oknu <gui>Računi</gui> izberite račun s seznama na levi in ali kliknite na ime ali pritisnite preslednico. Uredi ime računa in pritisnite <key>Vnosno tipko</key> ko ste končali."
+
+#: C/accounts-window.page:11(desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Dodajanje, spreminjanje in brisanje računov."
+
+#: C/accounts-window.page:33(title)
+msgid "Accounts Window"
+msgstr "Okno računov"
+
+#: C/accounts-window.page:35(p)
+msgid "The <gui>Accounts</gui> window allows you to add, modify, and delete accounts."
+msgstr "Okno <gui>Računi</gui> vam omogoča dodajanje, spreminjanje in brisanje računov."
+
+#: C/accounts-window.page:43(title)
+msgid "Account Details"
+msgstr "Podrobnosti računa"
+
+#: C/accounts-window.page:44(p)
+msgid "For most types of accounts, you can simply enter a login ID and a password. Certain accounts or account types, however, may require additional information."
+msgstr "Za večino vrst računov lahko enostavno vnesete ID prijave in geslo. Nekateri računi ali vrste računov morda zahtevajo dodatne podatke."
+
+#: C/account-jabber.page:7(desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Napredne možnosti za račune Jabber in Google Talk. "
+
+#: C/account-jabber.page:29(title)
+msgid "Jabber account details"
+msgstr "Podrobnosti računa Jabber"
+
+#: C/account-jabber.page:31(p)
+msgid "Most Jabber accounts will require only a login ID and a password to connect. For some accounts or on certain types of networks, you may need to enter additional information in the <gui>Advanced</gui> section. Normally, you will not need to use the advanced options below. For general instructions on adding an account, see <link xref=\"add-account\"/>."
+msgstr "Večina računov Jabber bo za povezavo zahtevala le ID prijave in geslo. Za nekatere računa na nekaterih vrstah omrežij boste morda morali vnesti dodatne podatke v odsek <gui>Napredno</gui>. Običajno vam naprednih možnosti spodaj ne bo treba uporabljati. Za splošna navodila o dodajanju računa si oglejte <link xref=\"add-account\" />."
+
+#: C/account-jabber.page:39(p)
+msgid "Google Talk is a type of Jabber account. These instructions hold for Google Talk accounts as well."
+msgstr "Google Talk je vrsta računa Jabber. Ta navodila veljajo tudi za računa Google Talk."
+
+#: C/account-jabber.page:45(gui)
+msgid "Encryption required (TLS/SSL)"
+msgstr "Zahtevano šifriranje (TLS/SSL)"
+
+#: C/account-jabber.page:46(gui)
+msgid "Ignore SSL certificate errors"
+msgstr "Prezri napake potrdila SSL"
+
+#: C/account-jabber.page:47(p)
+msgid "Whenever possible, communication between <app>Empathy</app> and the Jabber server is encrypted. If encrypted communication is not possible, messages may be sent unencrypted. Select <gui>Encryption required</gui> to prevent <app>Empathy</app> from communicating with the Jabber server when encryption is not possible."
+msgstr "Kadar je mogoče je sporazumevanje med <app>Empathy<//app> in strežnikom Jabber šifrirana. V primeru da šifrirana komunikacija ni mogoča, morda morda sporočila poslana nešifrirano. Izberite <gui>Zahtevano šifriranj</gui> za preprečitev komunikacije <app>Empathy</app> s strežniki Jabber, ko šifriranje ni mogoče. "
+
+#: C/account-jabber.page:52(p)
+msgid "Some Jabber servers may encrypt data using invalid certificates, or using certificates from unknown authorities. If you trust the server you are connecting to, you can select <gui>Ignore SSL certificate errors</gui> to allow encrypted communication with invalid certificates."
+msgstr "Nekateri strežniki Jabber lahko šifrirajo podatke z neveljavnimi potrdili ali s potrdili neznanih overiteljev potrdil. V primeru da strežniku na katerega se povezujete zaupate, izberite <gui>Prezri napake potrdil SSL</gui> za omogočitev šifriranja sporazumevanja z neveljavnimi potrdili."
+
+#: C/account-jabber.page:59(gui)
+msgid "Resource"
+msgstr "Vir"
+
+#: C/account-jabber.page:60(gui)
+msgid "Priority"
+msgstr "Prednost"
+
+#: C/account-jabber.page:61(p)
+msgid "If you have multiple applications (for instance, on separate computers) connected to your account at the same time, you can set a resource to uniquely identify each one. By default, <app>Empathy</app> will use <input>Telepathy</input> as the resource."
+msgstr "V primeru da je z vašim računi hkrati povezanih več programov (na primer na ločenih računalnikih) lahko nastavite vir za edinstveno identifikacijo vsakega. Privzeto bo <app>Empathy</app> kot vir uporabil <input>Telepathy</input>."
+
+#: C/account-jabber.page:65(p)
+msgid "You can set the priority to specify which application should receive incoming messages from your contacts. New messages will be sent to the application with the highest priority."
+msgstr "Nastavite lahko prednost za navedbo kateri programi naj prejmejo dohodna sporočila od vaših stikov. Nova sporočila bodo poslana programu z najvišjo prednostjo."
+
+#: C/account-jabber.page:70(gui)
+msgid "Override server settings"
+msgstr "Prepiši nastavitve strežnika"
+
+#: C/account-jabber.page:71(p)
+msgid "<app>Empathy</app> will use default settings to connect to the Jabber server based on your login ID. For some Jabber servers, you will need to enter custom server settings manually. These settings should be provided for you by your Jabber provider."
+msgstr "<app>Empathy</app> bo uporabljal privzete nastavitve za povezovanje s strežnikom Jabber na osnovi vašega ID-ja prijave. Za nekatere strežnike Jabber boste morali ročno vnesti nastavitve strežnika po meri. Te nastavitve bi vam moral dati vaš ponudnik Jabber."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/account-irc.page:106(None)
+msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/account-irc.page:112(None)
+msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+msgstr "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+
+#: C/account-irc.page:8(desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "Dodatni podatki potrebni za povezovanje z omrežji IRC."
+
+#: C/account-irc.page:31(title)
+msgid "IRC account details"
+msgstr "Podrobnosti računa IRC"
+
+#: C/account-irc.page:33(p)
+msgid "IRC accounts require different information than many other types of accounts. To create an IRC account, you must specify at least an IRC network and a nickname. This page details the information you can provide for an IRC account."
+msgstr "Računi IRC zahtevajo drugačne podatke kot veliko drugih vrst računov. Za ustvarjanje računa IRC morate navesti vsaj omrežje IRC in vzdevek. Ta stran vsebuje podrobnosti, ki jih lahko navedete za vaš račun IRC."
+
+#: C/account-irc.page:45(gui)
+#: C/account-irc.page:120(gui)
+msgid "Network"
+msgstr "Omrežje"
+
+#: C/account-irc.page:46(p)
+msgid "IRC is an open system that allows people to run separate IRC networks. Each network is distinct and has its own users and chat rooms. <app>Empathy</app> lists the most popular networks in the <gui>Network</gui> drop-down list. You can add additional networks. See <link xref=\"#networks\"/> below."
+msgstr "IRC je odprt sistem, ki ljudem omogoča poganjanje ločenih omrežij IRC. Vsako omrežje je ločeno in ima svoje uporabnike in klepetalnice. <app>Empathy</app> v spustnemu seznamu <gui>Omrežje</gui> vsebuje najbolj priljubljena omrežja. Dodate lahko dodatna omrežja. Oglejte si <link xref=\"#networks\"/> spodaj."
+
+#: C/account-irc.page:53(gui)
+msgid "Nickname"
+msgstr "Vzdevek"
+
+#: C/account-irc.page:54(p)
+msgid "Your nickname is your unique name on the IRC network. Only one person on a network may use a given nickname. If you get an error message that says <link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change your nickname."
+msgstr "Vaš vzdevek je vaše edinstveno ime na omrežju IRC. Le ena oseba na omrežju lahko uporablja dani vzdevek. V primeru da dobite sporočilo napake <link xref=\"prob-conn-name\" role=\"error-msg\"/> boste morali spremeniti svoj vzdevek."
+
+#: C/account-irc.page:60(gui)
+msgid "Password"
+msgstr "Geslo"
+
+#: C/account-irc.page:61(p)
+msgid "Some servers, particularly those on private networks, require a password to connect. If you are authorized to use the network, the network administrators should provide you with a password."
+msgstr "Nekateri strežniki, še posebno tisti na zasebnih omrežjih zahtevajo geslo za povezavo. V primeru da ste overjeni za uporabo omrežja, vam bodo skrbniki omrežja priskrbeli geslo. "
+
+#: C/account-irc.page:65(title)
+msgid "NickServ Passwords"
+msgstr "Gelsa NickServ"
+
+#: C/account-irc.page:66(p)
+msgid "On some networks, nicknames can be registered using a service known as NickServ. <app>Empathy</app> does not directly support nickname passwords. On some networks, including the popular freenode network, server passwords are automatically forwarded to NickServ, allowing you to set this field to identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for more details."
+msgstr "Na nekaterih omrežjih je vzdevke mogoče vpisati z uporabo storitve NickServ. <app>Empathy</app> gesel vzdevkov ne podpira neposredno. Na nekaterih omrežjih, vključno s priljubljenim omrežjem FreeNode, so strežniška gesla samodejno posredovana NickServ, kar vam omogoča nastavitev tega polja za identifikacijo z NickServ. Za več podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
+
+#: C/account-irc.page:76(gui)
+msgid "Real name"
+msgstr "Resnično ime"
+
+#: C/account-irc.page:77(p)
+msgid "You can provide your real name in addition to your nickname. Other users will be able to see this when they view your information."
+msgstr "Poleg vašega vzdevka lahko navedete tudi svoje pravo ime. Ostali uporabniki ga bodo lahko videli, ko si ogledajo vaše podrobnosti."
+
+#: C/account-irc.page:81(gui)
+msgid "Quit message"
+msgstr "Končaj sporočilo"
+
+#: C/account-irc.page:82(p)
+msgid "When you go offline, a quit message is sent to all the chat rooms you’re in and to all the users you’re having a private conversation with. Use this field to provide a custom quit message."
+msgstr "Ko prekinete povezavo, je sporočilo končanja poslano vsem klepetalnicam, v katerih ste in vsem uporabnikom s katerimi imate zasebni pogovor. Uporabite to polje za sporočilo končanja po meri."
+
+#: C/account-irc.page:94(title)
+msgid "IRC Networks"
+msgstr "Omrežja IRC"
+
+#: C/account-irc.page:97(title)
+msgid "Networks"
+msgstr "Omrežja"
+
+#: C/account-irc.page:99(p)
+msgid "<app>Empathy</app> includes a list of popular IRC networks. If you wish to another IRC network, you can add it to the list. You can also modify networks and remove them from the list."
+msgstr "<app>Empathy</app> vključuje seznam priljubljenih omrežij IRC. V primeru da želite uporabljati drugo omrežje IRC ga lahko dodate na seznam. Omrežja lahko tudi spreminjate in jih odstranjujete s seznama. You can also modify networks and remove them from the list."
+
+#: C/account-irc.page:104(p)
+msgid "To add a network to the list, click <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
+msgstr "Za dodajanje omrežja na seznamu kliknite <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Dodaj</media>."
+
+#: C/account-irc.page:107(p)
+msgid "To modify a network in the list, select the network and click <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">Edit</media>."
+msgstr "Za spremembo omrežja v seznamu izberite omrežje in kliknite <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">Uredi</media>."
+
+#: C/account-irc.page:110(p)
+msgid "To remove a network from the list, select the network and click <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">Remove</media>."
+msgstr "Za odstranitev omrežja s seznama izberite omrežje in kliknite <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">Odstrani</media>."
+
+#: C/account-irc.page:115(p)
+msgid "When adding or modifying a network, you can enter the following information:"
+msgstr "Ob dodajanju ali spreminjanju omrežja lahko vnesete naslednje podatke:"
+
+#: C/account-irc.page:121(p)
+msgid "This is the name of the network as you want it to appear in the list of networks."
+msgstr "To je ime omrežja, ki se bo pojavilo v seznamu omrežij."
+
+#: C/account-irc.page:125(gui)
+msgid "Charset"
+msgstr "Nabor znakov"
+
+#: C/account-irc.page:126(p)
+msgid "This specifies the character encoding that is typically used on this network. A character encoding is a specific way of recording characters internally in a computer. There are many character encodings, and you need to use the same character encoding as other users to see their messages correctly."
+msgstr "To navede znakovno kodiranje, ki je običajno uporabljano na temu omrežju. Znakovno kodiranje je določen način notranjega zapisovanja znakov v računalniku. Obstaja več znakovnih kodiranj. Za pravilen ogled sporočil drugih uporabnikov morate uporabljati isto znakovno kodiranje kot oni."
+
+#. Translators: Recommend character encodings that are common
+#. for your language.
+#: C/account-irc.page:135(p)
+msgid "By default, <app>Empathy</app> uses UTF-8, a modern character encoding that can handle text from most of the world's languages. Another common encoding for English and some other Western languages is ISO-8859-1."
+msgstr "Privzeto <app>Empathy</app> uporablja UTF-8, priljubljeno znakovno kodiranje, ki lahko upravlja z večino svetovnih jezikov. Drugo pogosto kodiranje za slovenščino in nekatere druge srednjeevropske jezike je ISO-8859-2."
+
+#: C/account-irc.page:141(gui)
+msgid "Servers"
+msgstr "Strežniki"
+
+#: C/account-irc.page:142(p)
+msgid "An IRC network may have many servers you can connect to. When you are connected to a server on a particular network, you can communicate with all users on all other servers on that network. You can add and remove servers for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
+msgstr "Omrežje IRC ima lahko veliko strežnikov na katere se lahko povežete. Ko ste povezani na strežnik na določenemu omrežju se lahko sporazumevate z vsemi uporabniki na vseh ostalih strežnikih na temu omrežju. Omrežju lahko dodate ali odstranite strežnike z uporabo gumbov <gui>Dodaj</gui> in <gui>Odstrani</gui>."
+
+#: C/account-irc.page:147(p)
+msgid "When a server is selected, click the field under <gui>Server</gui> or <gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys to focus the field, and press the space bar to begin editing."
+msgstr "Ko je strežnik izbran za urejanje kliknite na <gui>Strežnik</gui> ali <gui>Vrata</gui>. Dodatno lahko uporabite puščici levo in desno za žariščenje na polje in pritisnite preslednico za začetek urejanja."
+
+#: C/account-irc.page:151(p)
+msgid "Select the check box in the <gui>SSL</gui> column to encrypt all communication with a server. Note that this does not prevent other users on the network from seeing what you write on public chat rooms."
+msgstr "Izberite izbirno polje v stolpcu <gui>SSL</gui> za šifriranje vse komunikacije s strežnikom. Vedite da to ostalim uporabnikom na omrežju ne preprečuje ogleda vnosov, ki ste jih napisali v javne klepetalnice."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/index.page:0(None)
+msgid "translator-credits"
+msgstr "Andrej Žnidaršič <andrej.znidarsic@gmail.com>, 2010"
+
+#~ msgid ""
+#~ "To turn a video conversation into an audio conversation, choose "
+#~ "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</"
+#~ "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
+#~ "\"figures/camera-web.png\">video call</media> toolbar button to deselect "
+#~ "it."
+#~ msgstr ""
+#~ "Za spremembo video pogovora v zvočni pogovor izberite<guiseq><gui style="
+#~ "\"menu\">Video</gui><gui style=\"menuitem\">Izklopi video</gui></guiseq> "
+#~ "ali v orodni vrstici kliknite gumb <media type=\"image\" mime=\"image/png"
+#~ "\" src=\"figures/camera-web.png\">video klic</media> za odstranitev "
+#~ "njegove izbire."
+#~ msgid ""
+#~ "Click on the trash icon next to the account name to remove the account."
+#~ msgstr "Kliknite na ikono smeti poleg imena računa za njegovo odstranitev."
+#~ msgid "To join such a room, if you know the password:"
+#~ msgstr "Za pridružitev takšni sobi, v primeru da veste geslo:"
+#~ msgid ""
+#~ "There are a number of popular free SIP account providers; one popular "
+#~ "provider is <link href=\"https://signup.sipphone.com/new-users/app?"
+#~ "class=NewUser;proc=start\">Sipphone</link>."
+#~ msgstr ""
+#~ "Obstaja veliko brezplačnih ponudnikov SIP; eden od priljubljenih "
+#~ "ponudnikov je <link href=\"https://signup.sipphone.com/new-users/app?"
+#~ "class=NewUser;proc=start\">Sipphone</link>."
+#~ msgid ""
+#~ "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#~ "mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</"
+#~ "media> icon next to the name of the contact you wish to call and choose "
+#~ "<gui style=\"menuitem\">Audio Call</gui>. Alternatively, right click the "
+#~ "contact and choose <gui style=\"menuitem\">Audio Call</gui>."
+#~ msgstr ""
+#~ "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime="
+#~ "\"image/png\" src=\"figures/audio-input-microphone.png\">zvočni klic</"
+#~ "media> poleg imena stika, ki ga želite klicati in izberite <gui style="
+#~ "\"menuitem\">Zvočni klic</gui>. Dodatno lahko desno kliknete na stik in "
+#~ "izberete <gui style=\"menuitem\">Zvočni klic</gui>."
+#~ msgid ""
+#~ "To turn an audio conversation into a video conversation, choose "
+#~ "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</"
+#~ "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
+#~ "\"figures/camera-web.png\">video call</media> toolbar button to select it."
+#~ msgstr ""
+#~ "Za spremembo zvočnega pogovora v video pogovor izberite <guiseq><gui "
+#~ "style=\"menu\">Video</gui><gui style=\"menuitem\">Video vklopljen</gui></"
+#~ "guiseq> ali za izbiro kliknite na gumb <media type=\"image\" mime=\"image/"
+#~ "png\" src=\"figures/camera-web.png\">video klic</media> v orodni vrstici."
+
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index d32a16563..0bb918e1a 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -121,6 +121,49 @@ static guint signals[LAST_SIGNAL] = { 0 };
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountWidget)
#define CHANGED_TIMEOUT 300
+#define DIGIT "0-9"
+#define DIGITS "(["DIGIT"]+)"
+#define ALPHA "a-zA-Z"
+#define ALPHAS "(["ALPHA"]+)"
+#define ALPHADIGIT ALPHA DIGIT
+#define ALPHADIGITS "(["ALPHADIGIT"]+)"
+#define ALPHADIGITDASH ALPHA DIGIT "-"
+#define ALPHADIGITDASHS "(["ALPHADIGITDASH"]*)"
+
+#define HOSTNUMBER "("DIGITS"\\."DIGITS"\\."DIGITS"\\."DIGITS")"
+#define TOPLABEL ALPHAS"|(["ALPHA"]" ALPHADIGITDASHS "["ALPHADIGIT"])"
+#define DOMAINLABEL ALPHADIGITS"|(["ALPHADIGIT"]" ALPHADIGITDASHS \
+ "["ALPHADIGIT"])"
+#define HOSTNAME "((" DOMAINLABEL "\\.)+" TOPLABEL ")"
+/* Based on http://www.ietf.org/rfc/rfc1738.txt (section 5) */
+#define HOST "("HOSTNAME "|" HOSTNUMBER")"
+/* Based on http://www.ietf.org/rfc/rfc0822.txt (appendix D) */
+#define EMAIL_LOCALPART "([^\\(\\)<>@,;:\\\\\"\\[\\]\\s]+)"
+
+/* UIN is digital according to the unofficial specification:
+ * http://iserverd.khstu.ru/docum_ext/icqv5.html#CTS
+ * 5 digits minimun according to http://en.wikipedia.org/wiki/ICQ#UIN */
+#define ICQ_USER_NAME "(["DIGIT"]{5,})"
+/* Based on http://www.ietf.org/rfc/rfc2812.txt (section 2.3.1) */
+#define IRC_SPECIAL "_\\[\\]{}\\\\|`^"
+#define IRC_USER_NAME "(["ALPHA IRC_SPECIAL"]["ALPHADIGITDASH IRC_SPECIAL"]*)"
+/* Based on http://www.ietf.org/rfc/rfc4622.txt (section 2.2)
+ * We just exclude invalid characters to avoid ucschars and other redundant
+ * complexity */
+#define JABBER_USER_NAME "([^@:'\"<>&\\s]+)"
+/* ID is an email according to the unofficial specification:
+ * http://www.hypothetic.org/docs/msn/general/names.php */
+#define MSN_USER_NAME EMAIL_LOCALPART
+/* Based on the official help:
+ * http://help.yahoo.com/l/us/yahoo/edit/registration/edit-01.html */
+#define YAHOO_USER_NAME "(["ALPHA"]["ALPHADIGIT"_\\.]{3,31})"
+
+#define ACCOUNT_REGEX_ICQ "^"ICQ_USER_NAME"$"
+#define ACCOUNT_REGEX_IRC "^"IRC_USER_NAME"$"
+#define ACCOUNT_REGEX_JABBER "^"JABBER_USER_NAME"@"HOST"$"
+#define ACCOUNT_REGEX_MSN "^"MSN_USER_NAME"@"HOST"$"
+#define ACCOUNT_REGEX_YAHOO "^"YAHOO_USER_NAME"$"
+
static void
account_widget_set_control_buttons_sensitivity (EmpathyAccountWidget *self,
gboolean sensitive)
@@ -141,6 +184,35 @@ account_widget_set_control_buttons_sensitivity (EmpathyAccountWidget *self,
}
static void
+account_widget_set_entry_highlighting (GtkEntry *entry, gboolean highlight)
+{
+ GdkColor color;
+ GtkStyle *style;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+
+ style = gtk_widget_get_style (GTK_WIDGET (entry));
+
+ if (highlight)
+ {
+ color = style->bg[GTK_STATE_SELECTED];
+
+ /* Here we take the current theme colour and add it to
+ * the colour for white and average the two. This
+ * gives a colour which is inline with the theme but
+ * slightly whiter.
+ */
+ color.red = (color.red + (style->white).red) / 2;
+ color.green = (color.green + (style->white).green) / 2;
+ color.blue = (color.blue + (style->white).blue) / 2;
+
+ gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, &color);
+ }
+ else
+ gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+}
+
+static void
account_widget_handle_control_buttons_sensitivity (EmpathyAccountWidget *self)
{
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
@@ -161,9 +233,13 @@ account_widget_entry_changed_common (EmpathyAccountWidget *self,
const gchar *str;
const gchar *param_name;
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+ gboolean prev_status;
+ gboolean curr_status;
str = gtk_entry_get_text (entry);
param_name = g_object_get_data (G_OBJECT (entry), "param_name");
+ prev_status = empathy_account_settings_parameter_is_valid (priv->settings,
+ param_name);
if (EMP_STR_EMPTY (str))
{
@@ -185,6 +261,11 @@ account_widget_entry_changed_common (EmpathyAccountWidget *self,
tp_strdiff (param_name, "password") ? str : "***");
empathy_account_settings_set_string (priv->settings, param_name, str);
}
+
+ curr_status = empathy_account_settings_parameter_is_valid (priv->settings,
+ param_name);
+ if (curr_status != prev_status)
+ account_widget_set_entry_highlighting (entry, !curr_status);
}
static void
@@ -196,6 +277,21 @@ account_widget_entry_changed_cb (GtkEditable *entry,
}
static void
+account_widget_entry_map_cb (GtkEntry *entry,
+ EmpathyAccountWidget *self)
+{
+ EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+ const gchar *param_name;
+ gboolean is_valid;
+
+ /* need to initialize input highlighting */
+ param_name = g_object_get_data (G_OBJECT (entry), "param_name");
+ is_valid = empathy_account_settings_parameter_is_valid (priv->settings,
+ param_name);
+ account_widget_set_entry_highlighting (entry, !is_valid);
+}
+
+static void
account_widget_int_changed_cb (GtkWidget *widget,
EmpathyAccountWidget *self)
{
@@ -456,6 +552,8 @@ empathy_account_widget_setup_widget (EmpathyAccountWidget *self,
g_signal_connect (widget, "changed",
G_CALLBACK (account_widget_entry_changed_cb), self);
+ g_signal_connect (widget, "map",
+ G_CALLBACK (account_widget_entry_map_cb), self);
}
else if (GTK_IS_TOGGLE_BUTTON (widget))
{
@@ -1047,6 +1145,9 @@ account_widget_build_irc (EmpathyAccountWidget *self,
{
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+ empathy_account_settings_set_regex (priv->settings, "account",
+ ACCOUNT_REGEX_IRC);
+
if (priv->simple)
{
priv->irc_network_chooser = empathy_account_widget_irc_build_simple (self,
@@ -1074,6 +1175,9 @@ account_widget_build_msn (EmpathyAccountWidget *self,
{
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+ empathy_account_settings_set_regex (priv->settings, "account",
+ ACCOUNT_REGEX_MSN);
+
if (priv->simple)
{
self->ui_details->gui = empathy_builder_get_file (filename,
@@ -1203,6 +1307,9 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
is_gtalk = account_widget_is_gtalk (self);
is_facebook = account_widget_is_facebook (self);
+ empathy_account_settings_set_regex (priv->settings, "account",
+ ACCOUNT_REGEX_JABBER);
+
if (priv->simple && !is_gtalk && !is_facebook)
{
/* Simple widget for XMPP */
@@ -1327,6 +1434,9 @@ account_widget_build_icq (EmpathyAccountWidget *self,
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
GtkWidget *spinbutton_port;
+ empathy_account_settings_set_regex (priv->settings, "account",
+ ACCOUNT_REGEX_ICQ);
+
if (priv->simple)
{
self->ui_details->gui = empathy_builder_get_file (filename,
@@ -1405,6 +1515,9 @@ account_widget_build_yahoo (EmpathyAccountWidget *self,
{
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+ empathy_account_settings_set_regex (priv->settings, "account",
+ ACCOUNT_REGEX_YAHOO);
+
if (priv->simple)
{
self->ui_details->gui = empathy_builder_get_file (filename,
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 295ee6af1..fb8d538ef 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1763,33 +1763,79 @@ chat_spelling_menu_activate_cb (GtkMenuItem *menu_item,
gtk_menu_item_get_label (menu_item));
}
+
+static GtkWidget *
+chat_spelling_build_suggestions_menu (const gchar *code,
+ EmpathyChatSpell *chat_spell)
+{
+ GList *suggestions, *l;
+ GtkWidget *menu, *menu_item;
+
+ suggestions = empathy_spell_get_suggestions (code, chat_spell->word);
+ if (suggestions == NULL)
+ return NULL;
+
+ menu = gtk_menu_new ();
+ for (l = suggestions; l; l = l->next) {
+ menu_item = gtk_menu_item_new_with_label (l->data);
+ g_signal_connect (G_OBJECT (menu_item), "activate",
+ G_CALLBACK (chat_spelling_menu_activate_cb),
+ chat_spell);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+ }
+ empathy_spell_free_suggestions (suggestions);
+
+ gtk_widget_show_all (menu);
+
+ return menu;
+}
+
static GtkWidget *
chat_spelling_build_menu (EmpathyChatSpell *chat_spell)
{
- GtkWidget *menu, *menu_item;
- GList *suggestions, *l;
-
- menu = gtk_menu_new ();
- suggestions = empathy_spell_get_suggestions (chat_spell->word);
- if (suggestions == NULL) {
- menu_item = gtk_menu_item_new_with_label (_("(No Suggestions)"));
- gtk_widget_set_sensitive (menu_item, FALSE);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
- } else {
- for (l = suggestions; l; l = l->next) {
- menu_item = gtk_menu_item_new_with_label (l->data);
- g_signal_connect (G_OBJECT (menu_item),
- "activate",
- G_CALLBACK (chat_spelling_menu_activate_cb),
- chat_spell);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
- }
- }
- empathy_spell_free_suggestions (suggestions);
+ GtkWidget *menu, *submenu, *item;
+ GList *codes, *l;
- gtk_widget_show_all (menu);
+ codes = empathy_spell_get_enabled_language_codes ();
+ g_assert (codes != NULL);
- return menu;
+ if (g_list_length (codes) > 1) {
+ menu = gtk_menu_new ();
+
+ for (l = codes; l; l = l->next) {
+ const gchar *code, *name;
+
+ code = l->data;
+ name = empathy_spell_get_language_name (code);
+ if (!name)
+ continue;
+
+ item = gtk_image_menu_item_new_with_label (name);
+
+ submenu = chat_spelling_build_suggestions_menu (
+ code, chat_spell);
+ if (submenu == NULL)
+ gtk_widget_set_sensitive (item, FALSE);
+ else
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item),
+ submenu);
+ gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+ }
+ } else {
+ menu = chat_spelling_build_suggestions_menu (codes->data,
+ chat_spell);
+ if (menu == NULL) {
+ menu = gtk_menu_new ();
+ item = gtk_menu_item_new_with_label (_("(No Suggestions)"));
+ gtk_widget_set_sensitive (item, FALSE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ }
+ }
+ g_list_free (codes);
+
+ gtk_widget_show_all (menu);
+
+ return menu;
}
static void
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index edfb3fd48..85ed7d1d4 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -56,8 +56,7 @@ can_add_contact_to_account (TpAccount *account,
return FALSE;
individual_manager = empathy_individual_manager_dup_singleton ();
- result = empathy_individual_manager_get_flags_for_connection (
- individual_manager, connection) & EMPATHY_INDIVIDUAL_MANAGER_CAN_ADD;
+ result = empathy_connection_can_add_personas (connection);
g_object_unref (individual_manager);
return result;
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index b1237cf8b..e3159b401 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -822,15 +822,12 @@ empathy_individual_edit_menu_item_new (FolksIndividual *individual)
if (empathy_individual_manager_initialized ())
{
TpConnection *connection;
- EmpathyIndividualManagerFlags flags;
manager = empathy_individual_manager_dup_singleton ();
connection = empathy_contact_get_connection (contact);
- flags = empathy_individual_manager_get_flags_for_connection (
- manager, connection);
- enable = (flags & EMPATHY_INDIVIDUAL_MANAGER_CAN_ALIAS ||
- flags & EMPATHY_INDIVIDUAL_MANAGER_CAN_GROUP);
+ enable = (empathy_connection_can_alias_personas (connection) &&
+ empathy_connection_can_group_personas (connection));
g_object_unref (manager);
}
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 77f3016ec..c9159463c 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -158,8 +158,7 @@ static void
add_individual_to_store (GtkTreeStore *self,
GtkTreeIter *iter,
GtkTreeIter *parent,
- FolksIndividual *individual,
- EmpathyIndividualManagerFlags flags)
+ FolksIndividual *individual)
{
gboolean can_audio_call, can_video_call;
@@ -172,7 +171,6 @@ add_individual_to_store (GtkTreeStore *self,
EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, individual,
EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE,
EMPATHY_INDIVIDUAL_STORE_COL_IS_SEPARATOR, FALSE,
- EMPATHY_INDIVIDUAL_STORE_COL_FLAGS, flags,
EMPATHY_INDIVIDUAL_STORE_COL_CAN_AUDIO_CALL, can_audio_call,
EMPATHY_INDIVIDUAL_STORE_COL_CAN_VIDEO_CALL, can_video_call,
-1);
@@ -376,7 +374,6 @@ individual_store_add_individual (EmpathyIndividualStore *self,
GList *groups = NULL, *l;
EmpathyContact *contact;
TpConnection *connection;
- EmpathyIndividualManagerFlags flags = 0;
gchar *protocol_name;
priv = GET_PRIV (self);
@@ -392,8 +389,6 @@ individual_store_add_individual (EmpathyIndividualStore *self,
contact = empathy_contact_dup_from_folks_individual (individual);
connection = empathy_contact_get_connection (contact);
- flags = empathy_individual_manager_get_flags_for_connection (priv->manager,
- connection);
tp_connection_parse_object_path (connection, &protocol_name, NULL);
@@ -420,7 +415,7 @@ individual_store_add_individual (EmpathyIndividualStore *self,
}
add_individual_to_store (GTK_TREE_STORE (self), &iter, parent,
- individual, flags);
+ individual);
}
g_free (protocol_name);
@@ -434,7 +429,7 @@ individual_store_add_individual (EmpathyIndividualStore *self,
FALSE);
add_individual_to_store (GTK_TREE_STORE (self), &iter, &iter_group,
- individual, flags);
+ individual);
}
g_list_free (groups);
if (group_set != NULL)
@@ -450,7 +445,7 @@ individual_store_add_individual (EmpathyIndividualStore *self,
&iter_group, NULL, NULL, TRUE);
add_individual_to_store (GTK_TREE_STORE (self), &iter, &iter_group,
- individual, flags);
+ individual);
}
individual_store_contact_update (self, individual);
@@ -1493,7 +1488,6 @@ individual_store_setup (EmpathyIndividualStore *self)
G_TYPE_BOOLEAN, /* Is separator */
G_TYPE_BOOLEAN, /* Can make audio calls */
G_TYPE_BOOLEAN, /* Can make video calls */
- EMPATHY_TYPE_INDIVIDUAL_MANAGER_FLAGS, /* Flags */
G_TYPE_BOOLEAN, /* Is a fake group */
};
diff --git a/libempathy-gtk/empathy-individual-store.h b/libempathy-gtk/empathy-individual-store.h
index 4c99610d6..debb218ad 100644
--- a/libempathy-gtk/empathy-individual-store.h
+++ b/libempathy-gtk/empathy-individual-store.h
@@ -63,7 +63,6 @@ typedef enum
EMPATHY_INDIVIDUAL_STORE_COL_IS_SEPARATOR,
EMPATHY_INDIVIDUAL_STORE_COL_CAN_AUDIO_CALL,
EMPATHY_INDIVIDUAL_STORE_COL_CAN_VIDEO_CALL,
- EMPATHY_INDIVIDUAL_STORE_COL_FLAGS,
EMPATHY_INDIVIDUAL_STORE_COL_IS_FAKE_GROUP,
EMPATHY_INDIVIDUAL_STORE_COL_COUNT,
} EmpathyIndividualStoreCol;
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index ebc71a10a..2f2aae90a 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -2132,29 +2132,6 @@ empathy_individual_view_dup_selected (EmpathyIndividualView *view)
return individual;
}
-EmpathyIndividualManagerFlags
-empathy_individual_view_get_flags (EmpathyIndividualView *view)
-{
- EmpathyIndividualViewPriv *priv;
- GtkTreeSelection *selection;
- GtkTreeIter iter;
- GtkTreeModel *model;
- EmpathyIndividualFeatureFlags flags;
-
- g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), 0);
-
- priv = GET_PRIV (view);
-
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- return 0;
-
- gtk_tree_model_get (model, &iter,
- EMPATHY_INDIVIDUAL_STORE_COL_FLAGS, &flags, -1);
-
- return flags;
-}
-
gchar *
empathy_individual_view_get_selected_group (EmpathyIndividualView *view,
gboolean *is_fake_group)
@@ -2355,7 +2332,8 @@ empathy_individual_view_get_individual_menu (EmpathyIndividualView *view)
GtkWidget *menu = NULL;
GtkWidget *item;
GtkWidget *image;
- EmpathyIndividualManagerFlags flags;
+ gboolean can_remove = FALSE;
+ GList *l;
g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), NULL);
@@ -2363,16 +2341,31 @@ empathy_individual_view_get_individual_menu (EmpathyIndividualView *view)
if (individual == NULL)
return NULL;
- flags = empathy_individual_view_get_flags (view);
+ /* If any of the Individual's personas can be removed, add an option to
+ * remove. This will act as a best-effort option. If any Personas cannot be
+ * removed from the server, then this option will just be inactive upon
+ * subsequent menu openings */
+ for (l = folks_individual_get_personas (individual); l != NULL; l = l->next)
+ {
+ FolksPersona *persona = FOLKS_PERSONA (l->data);
+ FolksPersonaStore *store = folks_persona_get_store (persona);
+ FolksMaybeBool maybe_can_remove =
+ folks_persona_store_get_can_remove_personas (store);
+
+ if (maybe_can_remove == FOLKS_MAYBE_BOOL_TRUE)
+ {
+ can_remove = TRUE;
+ break;
+ }
+ }
menu = empathy_individual_menu_new (individual, priv->individual_features);
/* Remove contact */
- if (priv->view_features &
- EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_REMOVE &&
- flags & EMPATHY_INDIVIDUAL_MANAGER_CAN_REMOVE)
+ if ((priv->view_features &
+ EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_REMOVE) &&
+ can_remove)
{
-
/* create the menu if required, or just add a separator */
if (menu == NULL)
menu = gtk_menu_new ();
diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h
index 51a487d94..94ec8ccfd 100644
--- a/libempathy-gtk/empathy-individual-view.h
+++ b/libempathy-gtk/empathy-individual-view.h
@@ -98,9 +98,6 @@ EmpathyIndividualView *empathy_individual_view_new (
FolksIndividual *empathy_individual_view_dup_selected (
EmpathyIndividualView *view);
-EmpathyIndividualManagerFlags empathy_individual_view_get_flags (
- EmpathyIndividualView *view);
-
gchar *empathy_individual_view_get_selected_group (EmpathyIndividualView *view,
gboolean * is_fake_group);
diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
index ff94bb053..b9abcd5f7 100644
--- a/libempathy-gtk/empathy-spell.c
+++ b/libempathy-gtk/empathy-spell.c
@@ -48,8 +48,11 @@ typedef struct {
#define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
#define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
+/* Language code (gchar *) -> language name (gchar *) */
static GHashTable *iso_code_names = NULL;
-static GList *languages = NULL;
+/* Contains only _enabled_ languages
+ * Language code (gchar *) -> language (SpellLanguage *) */
+static GHashTable *languages = NULL;
static void
spell_iso_codes_parse_start_tag (GMarkupParseContext *ctx,
@@ -162,24 +165,22 @@ spell_notify_languages_cb (GSettings *gsettings,
const gchar *key,
gpointer user_data)
{
- GList *l;
-
DEBUG ("Resetting languages due to config change");
/* We just reset the languages list. */
- for (l = languages; l; l = l->next) {
- SpellLanguage *lang;
-
- lang = l->data;
-
- enchant_broker_free_dict (lang->config, lang->speller);
- enchant_broker_free (lang->config);
-
- g_slice_free (SpellLanguage, lang);
+ if (languages != NULL) {
+ g_hash_table_destroy (languages);
+ languages = NULL;
}
+}
+
+static void
+empathy_spell_free_language (SpellLanguage *lang)
+{
+ enchant_broker_free_dict (lang->config, lang->speller);
+ enchant_broker_free (lang->config);
- g_list_free (languages);
- languages = NULL;
+ g_slice_free (SpellLanguage, lang);
}
static void
@@ -201,6 +202,9 @@ spell_setup_languages (void)
return;
}
+ languages = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, (GDestroyNotify) empathy_spell_free_language);
+
str = g_settings_get_string (gsettings,
EMPATHY_PREFS_CHAT_SPELL_CHECKER_LANGUAGES);
@@ -224,7 +228,9 @@ spell_setup_languages (void)
if (lang->speller == NULL) {
DEBUG ("language '%s' has no valid dict", strv[i]);
} else {
- languages = g_list_append (languages, lang);
+ g_hash_table_insert (languages,
+ g_strdup (strv[i]),
+ lang);
}
i++;
@@ -294,6 +300,13 @@ empathy_spell_get_language_codes (void)
return list_langs;
}
+GList *
+empathy_spell_get_enabled_language_codes (void)
+{
+ spell_setup_languages ();
+ return g_hash_table_get_keys (languages);
+}
+
void
empathy_spell_free_language_codes (GList *codes)
{
@@ -309,7 +322,8 @@ empathy_spell_check (const gchar *word)
gboolean digit;
gunichar c;
gint len;
- GList *l;
+ GHashTableIter iter;
+ SpellLanguage *lang;
g_return_val_if_fail (word != NULL, FALSE);
@@ -332,11 +346,8 @@ empathy_spell_check (const gchar *word)
}
len = strlen (word);
- for (l = languages; l; l = l->next) {
- SpellLanguage *lang;
-
- lang = l->data;
-
+ g_hash_table_iter_init (&iter, languages);
+ while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &lang)) {
enchant_result = enchant_dict_check (lang->speller, word, len);
if (enchant_result == 0) {
@@ -348,36 +359,40 @@ empathy_spell_check (const gchar *word)
}
GList *
-empathy_spell_get_suggestions (const gchar *word)
+empathy_spell_get_suggestions (const gchar *code, const gchar *word)
{
gint len;
- GList *l1;
GList *suggestion_list = NULL;
+ SpellLanguage *lang;
+ gchar **suggestions;
+ gsize i, number_of_suggestions;
+ g_return_val_if_fail (code != NULL, NULL);
g_return_val_if_fail (word != NULL, NULL);
spell_setup_languages ();
- len = strlen (word);
+ if (!languages) {
+ return NULL;
+ }
- for (l1 = languages; l1; l1 = l1->next) {
- SpellLanguage *lang;
- gchar **suggestions;
- gsize i, number_of_suggestions;
+ len = strlen (word);
- lang = l1->data;
+ lang = g_hash_table_lookup (languages, code);
+ if (!lang) {
+ return NULL;
+ }
- suggestions = enchant_dict_suggest (lang->speller, word, len,
- &number_of_suggestions);
+ suggestions = enchant_dict_suggest (lang->speller, word, len,
+ &number_of_suggestions);
- for (i = 0; i < number_of_suggestions; i++) {
- suggestion_list = g_list_append (suggestion_list,
- g_strdup (suggestions[i]));
- }
+ for (i = 0; i < number_of_suggestions; i++) {
+ suggestion_list = g_list_append (suggestion_list,
+ g_strdup (suggestions[i]));
+ }
- if (suggestions) {
- enchant_dict_free_string_list (lang->speller, suggestions);
- }
+ if (suggestions) {
+ enchant_dict_free_string_list (lang->speller, suggestions);
}
return suggestion_list;
diff --git a/libempathy-gtk/empathy-spell.h b/libempathy-gtk/empathy-spell.h
index 65dbb131d..aa2a3e51e 100644
--- a/libempathy-gtk/empathy-spell.h
+++ b/libempathy-gtk/empathy-spell.h
@@ -31,9 +31,11 @@ G_BEGIN_DECLS
gboolean empathy_spell_supported (void);
const gchar *empathy_spell_get_language_name (const gchar *code);
GList *empathy_spell_get_language_codes (void);
+GList *empathy_spell_get_enabled_language_codes (void);
void empathy_spell_free_language_codes (GList *codes);
gboolean empathy_spell_check (const gchar *word);
-GList * empathy_spell_get_suggestions (const gchar *word);
+GList * empathy_spell_get_suggestions (const gchar *code,
+ const gchar *word);
void empathy_spell_free_suggestions (GList *suggestions);
G_END_DECLS
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index 39d02ff65..9213ac458 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -148,47 +148,48 @@ reason_to_string (EmpathyTLSDialog *self)
details = priv->details;
g_string_append (str, _("The identity provided by the chat server cannot be "
- "verified.\n"));
+ "verified."));
+ g_string_append (str, "\n\n");
switch (reason)
{
case EMP_TLS_CERTIFICATE_REJECT_REASON_UNTRUSTED:
reason_str = _("The certificate is not signed by a Certification "
- "Authority");
+ "Authority.");
break;
case EMP_TLS_CERTIFICATE_REJECT_REASON_EXPIRED:
- reason_str = _("The certificate has expired");
+ reason_str = _("The certificate has expired.");
break;
case EMP_TLS_CERTIFICATE_REJECT_REASON_NOT_ACTIVATED:
- reason_str = _("The certificate hasn't yet been activated");
+ reason_str = _("The certificate hasn't yet been activated.");
break;
case EMP_TLS_CERTIFICATE_REJECT_REASON_FINGERPRINT_MISMATCH:
- reason_str = _("The certificate does not have the expected fingerprint");
+ reason_str = _("The certificate does not have the expected fingerprint.");
break;
case EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH:
reason_str = _("The hostname verified by the certificate doesn't match "
- "the server name");
+ "the server name.");
break;
case EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED:
- reason_str = _("The certificate is self-signed");
+ reason_str = _("The certificate is self-signed.");
break;
case EMP_TLS_CERTIFICATE_REJECT_REASON_REVOKED:
reason_str = _("The certificate has been revoked by the issuing "
- "Certification Authority");
+ "Certification Authority.");
break;
case EMP_TLS_CERTIFICATE_REJECT_REASON_INSECURE:
- reason_str = _("The certificate is cryptographically weak");
+ reason_str = _("The certificate is cryptographically weak.");
break;
case EMP_TLS_CERTIFICATE_REJECT_REASON_LIMIT_EXCEEDED:
- reason_str = _("The certificate length exceeds verifiable limits");
+ reason_str = _("The certificate length exceeds verifiable limits.");
break;
case EMP_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN:
default:
- reason_str = _("The certificate is malformed");
+ reason_str = _("The certificate is malformed.");
break;
}
- g_string_append_printf (str, "%s.", reason_str);
+ g_string_append (str, reason_str);
/* add more information in case of HOSTNAME_MISMATCH */
if (reason == EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH)
@@ -201,7 +202,7 @@ reason_to_string (EmpathyTLSDialog *self)
if (expected_hostname != NULL && certificate_hostname != NULL)
{
- g_string_append (str, "\n");
+ g_string_append (str, "\n\n");
g_string_append_printf (str, _("Expected hostname: %s"),
expected_hostname);
g_string_append (str, "\n");
@@ -216,10 +217,11 @@ reason_to_string (EmpathyTLSDialog *self)
static GtkWidget *
build_gcr_widget (EmpathyTLSDialog *self)
{
- GcrCertificateBasicsWidget *widget;
+ GcrCertificateWidget *widget;
GcrCertificate *certificate;
GPtrArray *cert_chain = NULL;
GArray *first_cert;
+ int height;
EmpathyTLSDialogPriv *priv = GET_PRIV (self);
g_object_get (priv->certificate,
@@ -229,7 +231,13 @@ build_gcr_widget (EmpathyTLSDialog *self)
certificate = gcr_simple_certificate_new ((const guchar *) first_cert->data,
first_cert->len);
- widget = gcr_certificate_basics_widget_new (certificate);
+ widget = gcr_certificate_widget_new (certificate);
+
+ /* FIXME: make this widget bigger by default -- GTK+ should really handle
+ * this sort of thing for us */
+ gtk_widget_get_preferred_height (GTK_WIDGET (widget), NULL, &height);
+ /* force the widget to at least 150 pixels high */
+ gtk_widget_set_size_request (GTK_WIDGET (widget), -1, MAX (height, 150));
g_object_unref (certificate);
g_ptr_array_unref (cert_chain);
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 06e6ccd19..e5191a96c 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -69,9 +69,15 @@ struct _EmpathyAccountSettingsPriv
gboolean display_name_overridden;
gboolean ready;
+ /* Parameter name (gchar *) -> parameter value (GValue) */
GHashTable *parameters;
+ /* Keys are parameter names from the hash above (gchar *).
+ * Values are regular expresions that should match corresponding parameter
+ * values (GRegex *). Possible regexp patterns are defined in
+ * empathy-account-widget.c */
+ GHashTable *param_regexps;
GArray *unset_parameters;
- GArray *required_params;
+ GList *required_params;
gulong managers_ready_id;
@@ -93,7 +99,12 @@ empathy_account_settings_init (EmpathyAccountSettings *obj)
priv->parameters = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, (GDestroyNotify) tp_g_value_slice_free);
+ priv->param_regexps = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, (GDestroyNotify) g_regex_unref);
+
priv->unset_parameters = g_array_new (TRUE, FALSE, sizeof (gchar *));
+
+ priv->required_params = NULL;
}
static void empathy_account_settings_dispose (GObject *object);
@@ -348,6 +359,7 @@ empathy_account_settings_finalize (GObject *object)
{
EmpathyAccountSettings *self = EMPATHY_ACCOUNT_SETTINGS (object);
EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
+ GList *l;
/* free any data held directly by the object here */
g_free (priv->cm_name);
@@ -357,9 +369,14 @@ empathy_account_settings_finalize (GObject *object)
g_free (priv->icon_name);
if (priv->required_params != NULL)
- g_array_free (priv->required_params, TRUE);
+ {
+ for (l = priv->required_params; l; l = l->next)
+ g_free (l->data);
+ g_list_free (priv->required_params);
+ }
g_hash_table_destroy (priv->parameters);
+ g_hash_table_destroy (priv->param_regexps);
empathy_account_settings_free_unset_parameters (self);
g_array_free (priv->unset_parameters, TRUE);
@@ -412,16 +429,13 @@ empathy_account_settings_check_readyness (EmpathyAccountSettings *self)
if (priv->required_params == NULL)
{
TpConnectionManagerParam *cur;
- char *val;
-
- priv->required_params = g_array_new (TRUE, FALSE, sizeof (gchar *));
for (cur = tp_protocol->params; cur->name != NULL; cur++)
{
if (tp_connection_manager_param_is_required (cur))
{
- val = g_strdup (cur->name);
- g_array_append_val (priv->required_params, val);
+ priv->required_params = g_list_append (priv->required_params,
+ g_strdup (cur->name));
}
}
}
@@ -1344,42 +1358,90 @@ empathy_account_settings_has_account (EmpathyAccountSettings *settings,
return (!tp_strdiff (account_path, priv_account_path));
}
+void
+empathy_account_settings_set_regex (EmpathyAccountSettings *settings,
+ const gchar *param,
+ const gchar *pattern)
+{
+ EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
+ GRegex *regex;
+
+ regex = g_regex_new (pattern, 0, 0, NULL);
+ g_hash_table_insert (priv->param_regexps, g_strdup (param), regex);
+}
+
gboolean
-empathy_account_settings_is_valid (EmpathyAccountSettings *settings)
+empathy_account_settings_parameter_is_valid (
+ EmpathyAccountSettings *settings,
+ const gchar *param)
{
EmpathyAccountSettingsPriv *priv;
- guint idx;
- gchar *current;
- gboolean missed = FALSE;
+ const GRegex *regex;
+ const gchar *value;
g_return_val_if_fail (EMPATHY_IS_ACCOUNT_SETTINGS (settings), FALSE);
priv = GET_PRIV (settings);
- for (idx = 0; idx < priv->required_params->len; idx++)
+ if (g_list_find_custom (priv->required_params, param, (GCompareFunc) strcmp))
{
- current = g_array_index (priv->required_params, gchar *, idx);
-
/* first, look if it's set in our own parameters */
- if (tp_asv_lookup (priv->parameters, current))
- continue;
+ if (tp_asv_lookup (priv->parameters, param))
+ goto test_regex;
/* if we did not unset the parameter, look if it's in the account */
if (priv->account != NULL &&
- !empathy_account_settings_is_unset (settings, current))
+ !empathy_account_settings_is_unset (settings, param))
{
const GHashTable *account_params;
account_params = tp_account_get_parameters (priv->account);
- if (tp_asv_lookup (account_params, current))
- continue;
+ if (tp_asv_lookup (account_params, param))
+ goto test_regex;
}
- missed = TRUE;
- break;
+ return FALSE;
+ }
+
+test_regex:
+ /* test whether parameter value matches its regex */
+ regex = g_hash_table_lookup (priv->param_regexps, param);
+ if (regex)
+ {
+ value = empathy_account_settings_get_string (settings, param);
+ if (value != NULL && !g_regex_match (regex, value, 0, NULL))
+ return FALSE;
}
- return !missed;
+ return TRUE;
+}
+
+gboolean
+empathy_account_settings_is_valid (EmpathyAccountSettings *settings)
+{
+ EmpathyAccountSettingsPriv *priv;
+ const gchar *param;
+ GHashTableIter iter;
+ GList *l;
+
+ g_return_val_if_fail (EMPATHY_IS_ACCOUNT_SETTINGS (settings), FALSE);
+
+ priv = GET_PRIV (settings);
+
+ for (l = priv->required_params; l; l = l->next)
+ {
+ if (!empathy_account_settings_parameter_is_valid (settings, l->data))
+ return FALSE;
+ }
+
+ g_hash_table_iter_init (&iter, priv->param_regexps);
+ while (g_hash_table_iter_next (&iter, (gpointer *) &param, NULL))
+ {
+ if (!empathy_account_settings_parameter_is_valid (settings, param))
+ return FALSE;
+ }
+
+ return TRUE;
}
const TpConnectionManagerProtocol *
diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index d3276e1a5..8f3634a19 100644
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -176,6 +176,14 @@ gboolean empathy_account_settings_apply_finish (
GAsyncResult *result,
GError **error);
+void empathy_account_settings_set_regex (EmpathyAccountSettings *settings,
+ const gchar *param,
+ const gchar *regex);
+
+gboolean empathy_account_settings_parameter_is_valid (
+ EmpathyAccountSettings *settings,
+ const gchar *param);
+
gboolean empathy_account_settings_is_valid (EmpathyAccountSettings *settings);
const TpConnectionManagerProtocol * empathy_account_settings_get_tp_protocol (
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index a7aa0e704..4db37f693 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -39,6 +39,7 @@
#endif
#include "empathy-contact.h"
+#include "empathy-individual-manager.h"
#include "empathy-utils.h"
#include "empathy-enum-types.h"
#include "empathy-marshal.h"
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index d707e17bf..07295c8bd 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -34,8 +34,6 @@
#include <extensions/extensions.h>
#include "empathy-individual-manager.h"
-#include "empathy-contact-manager.h"
-#include "empathy-contact-list.h"
#include "empathy-marshal.h"
#include "empathy-utils.h"
@@ -51,7 +49,6 @@
typedef struct
{
FolksIndividualAggregator *aggregator;
- EmpathyContactManager *contact_manager;
GHashTable *individuals; /* Individual.id -> Individual */
} EmpathyIndividualManagerPriv;
@@ -222,7 +219,6 @@ individual_manager_dispose (GObject *object)
EmpathyIndividualManagerPriv *priv = GET_PRIV (object);
g_hash_table_destroy (priv->individuals);
- tp_clear_object (&priv->contact_manager);
tp_clear_object (&priv->aggregator);
G_OBJECT_CLASS (empathy_individual_manager_parent_class)->dispose (object);
@@ -316,7 +312,6 @@ empathy_individual_manager_init (EmpathyIndividualManager *self)
EMPATHY_TYPE_INDIVIDUAL_MANAGER, EmpathyIndividualManagerPriv);
self->priv = priv;
- priv->contact_manager = empathy_contact_manager_dup_singleton ();
priv->individuals = g_hash_table_new_full (g_str_hash, g_str_equal,
NULL, g_object_unref);
@@ -502,36 +497,6 @@ empathy_individual_manager_remove_group (EmpathyIndividualManager *manager,
(gpointer) group);
}
-EmpathyIndividualManagerFlags
-empathy_individual_manager_get_flags_for_connection (
- EmpathyIndividualManager *self,
- TpConnection *connection)
-{
- EmpathyIndividualManagerPriv *priv;
- EmpathyContactListFlags list_flags;
- EmpathyIndividualManagerFlags flags;
-
- g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_MANAGER (self),
- EMPATHY_INDIVIDUAL_MANAGER_NO_FLAGS);
-
- priv = GET_PRIV (self);
-
- list_flags = empathy_contact_manager_get_flags_for_connection (
- priv->contact_manager, connection);
-
- flags = EMPATHY_INDIVIDUAL_MANAGER_NO_FLAGS;
- if (list_flags & EMPATHY_CONTACT_LIST_CAN_ADD)
- flags |= EMPATHY_INDIVIDUAL_MANAGER_CAN_ADD;
- if (list_flags & EMPATHY_CONTACT_LIST_CAN_REMOVE)
- flags |= EMPATHY_INDIVIDUAL_MANAGER_CAN_REMOVE;
- if (list_flags & EMPATHY_CONTACT_LIST_CAN_ALIAS)
- flags |= EMPATHY_INDIVIDUAL_MANAGER_CAN_ALIAS;
- if (list_flags & EMPATHY_CONTACT_LIST_CAN_GROUP)
- flags |= EMPATHY_INDIVIDUAL_MANAGER_CAN_GROUP;
-
- return flags;
-}
-
static void
link_personas_cb (FolksIndividualAggregator *aggregator,
GAsyncResult *async_result,
diff --git a/libempathy/empathy-individual-manager.h b/libempathy/empathy-individual-manager.h
index 72104fc40..f2f5f5b56 100644
--- a/libempathy/empathy-individual-manager.h
+++ b/libempathy/empathy-individual-manager.h
@@ -35,14 +35,6 @@ G_BEGIN_DECLS
#define EMPATHY_IS_INDIVIDUAL_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_INDIVIDUAL_MANAGER))
#define EMPATHY_IS_INDIVIDUAL_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_INDIVIDUAL_MANAGER))
#define EMPATHY_INDIVIDUAL_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDIVIDUAL_MANAGER, EmpathyIndividualManagerClass))
- typedef enum
-{
- EMPATHY_INDIVIDUAL_MANAGER_NO_FLAGS = 0,
- EMPATHY_INDIVIDUAL_MANAGER_CAN_ADD = 1 << 0,
- EMPATHY_INDIVIDUAL_MANAGER_CAN_REMOVE = 1 << 1,
- EMPATHY_INDIVIDUAL_MANAGER_CAN_ALIAS = 1 << 2,
- EMPATHY_INDIVIDUAL_MANAGER_CAN_GROUP = 1 << 3,
-} EmpathyIndividualManagerFlags;
typedef struct _EmpathyIndividualManager EmpathyIndividualManager;
typedef struct _EmpathyIndividualManagerClass EmpathyIndividualManagerClass;
@@ -82,11 +74,6 @@ void empathy_individual_manager_remove (EmpathyIndividualManager *manager,
void empathy_individual_manager_remove_group (EmpathyIndividualManager *manager,
const gchar *group);
-EmpathyIndividualManagerFlags
-empathy_individual_manager_get_flags_for_connection (
- EmpathyIndividualManager *manager,
- TpConnection *connection);
-
void empathy_individual_manager_link_personas (EmpathyIndividualManager *self,
GList *personas);
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index c479f99f3..6bbd53f86 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -770,6 +770,86 @@ tp_channel_group_change_reason_from_folks_groups_change_reason (
return (TpChannelGroupChangeReason) reason;
}
+TpfPersonaStore *
+empathy_get_persona_store_for_connection (TpConnection *connection)
+{
+ FolksBackendStore *backend_store;
+ FolksBackend *backend;
+ TpfPersonaStore *result = NULL;
+
+ backend_store = folks_backend_store_dup ();
+ backend = folks_backend_store_get_backend_by_name (backend_store,
+ "telepathy");
+ if (backend != NULL)
+ {
+ GHashTable *stores_hash;
+ GList *stores, *l;
+
+ stores_hash = folks_backend_get_persona_stores (backend);
+ stores = g_hash_table_get_values (stores_hash);
+ for (l = stores; l != NULL && result == NULL; l = l->next)
+ {
+ TpfPersonaStore *persona_store = TPF_PERSONA_STORE (l->data);
+ TpAccount *account;
+ TpConnection *conn_cur;
+
+ account = tpf_persona_store_get_account (persona_store);
+ conn_cur = tp_account_get_connection (account);
+ if (conn_cur == connection)
+ result = persona_store;
+ }
+
+ g_list_free (stores);
+ }
+
+ g_object_unref (backend);
+ g_object_unref (backend_store);
+
+ return result;
+}
+
+gboolean
+empathy_connection_can_add_personas (TpConnection *connection)
+{
+ FolksPersonaStore *persona_store;
+
+ g_return_val_if_fail (TP_IS_CONNECTION (connection), FALSE);
+
+ persona_store = FOLKS_PERSONA_STORE (
+ empathy_get_persona_store_for_connection (connection));
+
+ return (folks_persona_store_get_can_add_personas (persona_store) ==
+ FOLKS_MAYBE_BOOL_TRUE);
+}
+
+gboolean
+empathy_connection_can_alias_personas (TpConnection *connection)
+{
+ FolksPersonaStore *persona_store;
+
+ g_return_val_if_fail (TP_IS_CONNECTION (connection), FALSE);
+
+ persona_store = FOLKS_PERSONA_STORE (
+ empathy_get_persona_store_for_connection (connection));
+
+ return (folks_persona_store_get_can_alias_personas (persona_store) ==
+ FOLKS_MAYBE_BOOL_TRUE);
+}
+
+gboolean
+empathy_connection_can_group_personas (TpConnection *connection)
+{
+ FolksPersonaStore *persona_store;
+
+ g_return_val_if_fail (TP_IS_CONNECTION (connection), FALSE);
+
+ persona_store = FOLKS_PERSONA_STORE (
+ empathy_get_persona_store_for_connection (connection));
+
+ return (folks_persona_store_get_can_group_personas (persona_store) ==
+ FOLKS_MAYBE_BOOL_TRUE);
+}
+
gchar *
empathy_get_x509_certificate_hostname (gnutls_x509_crt_t cert)
{
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index ca184f589..3c89962c1 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -34,6 +34,7 @@
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <folks/folks.h>
+#include <folks/folks-telepathy.h>
#include <telepathy-glib/account-manager.h>
#include "empathy-contact.h"
@@ -99,6 +100,10 @@ TpConnectionPresenceType empathy_folks_presence_type_to_tp (FolksPresenceType ty
gboolean empathy_folks_individual_contains_contact (FolksIndividual *individual);
EmpathyContact * empathy_contact_dup_from_folks_individual (FolksIndividual *individual);
TpChannelGroupChangeReason tp_channel_group_change_reason_from_folks_groups_change_reason (FolksGroupableChangeReason reason);
+TpfPersonaStore * empathy_get_persona_store_for_connection (TpConnection *connection);
+gboolean empathy_connection_can_add_personas (TpConnection *connection);
+gboolean empathy_connection_can_alias_personas (TpConnection *connection);
+gboolean empathy_connection_can_group_personas (TpConnection *connection);
gchar * empathy_get_x509_certificate_hostname (gnutls_x509_crt_t cert);
diff --git a/po/ca.po b/po/ca.po
index 6c297c877..87893c285 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-01 21:44+0200\n"
-"PO-Revision-Date: 2010-04-01 21:44+0200\n"
+"POT-Creation-Date: 2010-10-10 23:12+0200\n"
+"PO-Revision-Date: 2010-10-04 23:11+0200\n"
"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
"Language-Team: Catalan <tradgnome@softcatala.org>\n"
"MIME-Version: 1.0\n"
@@ -18,26 +18,28 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n!=1;\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy"
-msgstr "Empathy"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Conversa a través del Google Talk, el Facebook, el MSN i molts altres "
+"serveis de xat"
#: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "Client de missatgeria instantània Empathy"
+msgid "Empathy"
+msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:3
-msgid "IM Client"
-msgstr "Client de missatgeria instantània"
+msgid "Empathy Internet Messaging"
+msgstr "Missatgeria d'Internet Empathy"
#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "Envieu i rebeu missatges"
+msgid "IM Client"
+msgstr "Client de missatgeria instantània"
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
msgstr "Obre sempre una finestra de xat separada per a xats nous."
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -45,284 +47,297 @@ msgstr ""
"Caràcter que s'afegirà després del sobrenom quan s'utilitzi la compleció de "
"sobrenom (tabulació) en els xats de grup."
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr "Tema de la finestra de xat"
-#: ../data/empathy.schemas.in.h:4
+#: ../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 ""
"Llista separada per comes de les llengües del verificador ortogràfic a "
"utilitzar (p. ex. «ca, en, es, fr»)."
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
msgstr "Llista de contactes compacta"
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Connection managers should be used"
msgstr "S'haurien d'utilitzar gestors de connexions"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Contact list sort criterion"
msgstr "Criteri d'ordenació de la llista de contactes"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "El directori predeterminat des d'on seleccionar una imatge d'avatar"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Disable popup notifications when away"
msgstr "Inhabilita les notificacions quan s'estigui absent"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable sounds when away"
msgstr "Inhabilita els sons quan s'estigui absent"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "Mostra els esdeveniments d'entrada en l'àrea d'estat"
+
+#: ../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 ""
+"Mostra els esdeveniments d'entrada en l'àrea d'estat. Si és «false» (fals) "
+"mostra'ls immediatament a l'usuari."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
msgstr "L'Empathy pot publicar la ubicació de l'usuari"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
msgstr "L'Empathy pot utilitzar el GPS per a determinar la ubicació"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
msgstr ""
"L'Empathy pot utilitzar la xarxa de telefonia mòbil per a determinar la "
"ubicació"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
msgstr "L'Empathy pot utilitzar la xarxa per a determinar la ubicació"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
msgstr "Carpeta predeterminada de les baixades de l'Empathy"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has asked about importing accounts"
msgstr "Si l'Empathy ha preguntat sobre la importació de comptes"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "L'Empathy ha migrat dels registres de la Butterfly"
-#: ../data/empathy.schemas.in.h:18
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-away when idle"
-msgstr "Fes que l'Empathy es connecti automàticament en iniciar-se"
+msgstr "Fes que l'Empathy canviï automàticament a absent quan estigui inactiu"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "Fes que l'Empathy es connecti automàticament en iniciar-se"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "L'Empathy hauria de reduir la precisió de la ubicació"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"Fes que l'Empathy utilitzi l'avatar del contacte com a icona de la finestra "
"de xat"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "Habilita les eines de desenvolupador del WebKit"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "Habilita les notificacions per als missatges nous"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "Habilita el verificador ortogràfic"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "Oculta la finestra principal"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "Oculta la finestra principal."
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported"
-msgstr "S'han importat els comptes del MC 4"
-
-#: ../data/empathy.schemas.in.h:28
-msgid "MC 4 accounts have been imported."
-msgstr "S'han importat els comptes del MC 4."
-
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "Caràcter de compleció de sobrenom"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
msgstr "Obre les finestres de xat noves en finestres separades"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Camí al tema Adium a utilitzar"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
"Camí al tema Adium a utilitzar si el tema utilitzat per al xat és l'Adium."
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "Reprodueix un so quan arribin missatges"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "Reprodueix un so per a les converses noves"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "Reprodueix un so per als missatges de sortida"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "Reprodueix un so quan entri algun contacte"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "Reprodueix un so quan surti algun contacte"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
msgstr "Reprodueix un so en entrar"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
msgstr "Reprodueix un so en sortir"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "Mostra notificacions si el xat no és la finestra activa"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "Mostra notificacions si entra un contacte"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "Mostra notificacions si surt un contacte"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
msgstr "Mostra els avatars"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show contact list in rooms"
msgstr "Mostra la llista de contactes a les sales"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show hint about closing the main window"
msgstr "Mostra un consell sobre el tancament de la finestra principal"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show offline contacts"
msgstr "Mostra els contactes fora de línia"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show protocols"
msgstr "Mostra els protocols"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Spell checking languages"
msgstr "Llengües per a la verificació ortogràfica"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The default folder to save file transfers in."
msgstr "La carpeta predeterminada on es desaran els fitxers transferits."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "L'últim directori des d'on es va seleccionar una imatge d'avatar."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "La posició per la subfinestra lateral de la finestra de xat"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"La posició emmagatzemada (en píxels) de la subfinestra lateral de la "
+"finestra de xat."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
"El tema que s'utilitza per a mostrar la conversa a les finestres de xat."
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use graphical smileys"
msgstr "Utilitza emoticones gràfiques"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use notification sounds"
msgstr "Utilitza sons de notificació"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use theme for chat rooms"
msgstr "Utilitza el tema per a les sales de xat"
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
"Si l'Empathy ha de publicar la ubicació de l'usuari als seus contactes."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Si l'Empathy ha d'utilitzar el GPS per a determinar la ubicació."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Si l'Empathy ha d'utilitzar la xarxa de mòbils per a determinar la ubicació."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
msgstr "Si l'Empathy ha d'utilitzar la xarxa per a determinar la ubicació."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr ""
"Si l'Empathy ha preguntat si es volen importar els comptes d'altres "
"programes."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Si l'Empathy ha migrat els registres de la Butterfly."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Si l'Empathy ha d'entrar en els comptes automàticament en iniciar-se."
-#: ../data/empathy.schemas.in.h:62
-#, fuzzy
-msgid "Whether Empathy should go into away mode automatically if user is idle."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
-"Si s'ha de canviar al mode «absent» automàticament quan ha passat una certa "
-"quantitat de temps."
+"Si l'Empathy ha de canviar automàticament al mode absent quan l'usuari està "
+"inactiu."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Si l'Empathy ha de reduir la precisió de la ubicació per motius de privadesa."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
"de xat."
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Si s'han d'habilitar les eines de desenvolupament del WebKit, com ara "
"l'inspector web."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -330,70 +345,70 @@ msgstr ""
"Si s'ha d'utilitzar el gestor de connexions per desconnectar/tornar a "
"connectar automàticament."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Si s'han de verificar les paraules introduïdes comparant-les amb les "
"llengües escollides per a la verificació ortogràfica."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Si s'han de convertir les emoticones a imatges gràfiques a les converses."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Si s'ha de reproduir un so per notificar que els contactes entren a la xarxa."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Si s'ha de reproduir un so per notificar que els contactes surten de la "
"xarxa."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of events."
msgstr "Si s'ha de reproduir un so per notificar esdeveniments."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Si s'ha de reproduir un so quan arribin missatges."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of new conversations."
msgstr "Si s'ha de reproduir un so quan s'iniciïn converses noves."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Si s'ha de reproduir un so quan s'enviïn missatges."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound when logging into a network."
msgstr "Si s'ha de reproduir un so quan s'entri a una xarxa."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging out of a network."
msgstr "Si s'ha de reproduir un so quan se surti d'una xarxa."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play sound notifications when away or busy."
msgstr ""
"Si s'han de reproduir notificacions de so quan s'estigui absent o ocupat."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Si s'ha de mostrar una notificació emergent quan es desconnecti un contacte."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Si s'ha de mostrar una notificació emergent quan es connecti un contacte."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -401,43 +416,43 @@ msgstr ""
"Si s'han de mostrar notificacions emergents quan es rebi un esdeveniment de "
"missatge nou i el xat ja estigui obert però no tingui el focus."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Si s'ha de mostrar una notificació emergent quan es rebin missatges nous."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Si s'han de mostrar els avatars per als contactes a la llista de contactes i "
"les finestres de xat."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Si s'han de mostrar els contactes que estan fora de línia a la llista de "
"contactes."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Si s'han de mostrar notificacions emergents quan s'estigui absent o ocupat."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Si s'han de mostrar els protocols dels contactes a la llista de contactes."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
msgstr "Si s'ha de mostrar la llista de contactes a les sales de xat."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show the contact list in compact mode."
msgstr "Si s'ha de mostrar la llista de contactes en mode compacte."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -445,11 +460,11 @@ msgstr ""
"Si s'ha de mostrar el diàleg de missatge sobre el tancament de la finestra "
"principal amb el botó «x» de la barra de títol."
-#: ../data/empathy.schemas.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "Si s'ha d'utilitzar el tema per a les sales de xat."
-#: ../data/empathy.schemas.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
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 "
@@ -466,149 +481,208 @@ msgstr "Gestiona els comptes de missatgeria i VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
-#: ../src/cc-empathy-accounts-panel.c:91
+#: ../src/empathy-accounts-dialog.c:2156
msgid "Messaging and VoIP Accounts"
msgstr "Comptes de missatgeria i VoIP"
-#: ../libempathy/empathy-ft-handler.c:842
+#: ../libempathy/empathy-ft-handler.c:851
msgid "The hash of the received file and the sent one do not match"
msgstr "El resum del fitxer rebut i el de l'enviat no coincideixen"
-#: ../libempathy/empathy-ft-handler.c:1102
+#: ../libempathy/empathy-ft-handler.c:1111
msgid "File transfer not supported by remote contact"
msgstr "El contacte remot no admet la transferència de fitxers"
-#: ../libempathy/empathy-ft-handler.c:1160
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "El fitxer seleccionat no és un fitxer normal"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "El fitxer seleccionat és buit"
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:283
msgid "Socket type not supported"
msgstr "No està implementat aquest tipus de sòcol"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:402
msgid "No reason was specified"
msgstr "No s'ha especificat el motiu"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:405
msgid "The change in state was requested"
msgstr "S'ha demanat el canvi d'estat"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:408
msgid "You canceled the file transfer"
msgstr "Heu cancel·lat la transferència del fitxer"
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:411
msgid "The other participant canceled the file transfer"
msgstr "L'interlocutor ha cancel·lat la transferència del fitxer"
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:414
msgid "Error while trying to transfer the file"
msgstr "S'ha produït un error en enviar el fitxer"
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:417
msgid "The other participant is unable to transfer the file"
msgstr "L'interlocutor no pot enviar el fitxer"
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:315
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Motiu desconegut"
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Disponible"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Ocupat"
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Absent"
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Invisible"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Fora de línia"
-#: ../libempathy/empathy-utils.c:249
-#, fuzzy
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Desconegut"
-#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "No s'ha especificat el motiu"
-#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "S'ha establert l'estat a desconnectat"
-#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Error de la xarxa"
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Ha fallat l'autenticació"
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Error de xifratge"
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Nom ja utilitzat"
-#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "No s'ha proporcionat el certificat"
-#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "El certificat no és de confiança"
-#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "El certificat ha vençut"
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "El certificat no està activat"
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "No coincideix el nom de la màquina del certificat"
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "No coincideix l'empremta digital del certificat"
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Certificat signat per un mateix"
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Error en el certificat"
-#: ../libempathy/empathy-utils.c:430 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "L'encriptació no està disponible"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "El certificat no és vàlid"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr "S'ha rebutjat la connexió"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr "No es pot establir la connexió"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "S'ha perdut la connexió"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr "Aquest recurs ja està connectat al servidor"
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+"S'ha reemplaçat la connexió per una altra de nova fent servir el mateix "
+"recurs"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr "Ja existeix aquest compte al servidor"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr "El servidor està massa ocupat per gestionar la connexió"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr "S'ha revocat el certificat"
+
+#: ../libempathy/empathy-utils.c:377
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"El certificat utilitza un algorisme criptògraf no segur o la seva fortalesa "
+"criptogràfica és feble"
+
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"La llargada del certificat del servidor o la profunditat de la cadena de "
+"certificació excedeix els límits de la biblioteca criptogràfica"
+
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Gent propera"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! del Japó"
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Xat del Facebook"
@@ -658,62 +732,92 @@ msgstr[1] "fa %d mesos"
msgid "in the future"
msgstr "en el futur"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "Tots"
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:605
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "Compte"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "Contrasenya"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Servidor"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Port"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1136
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "Nom d'usuari:"
-#: ../libempathy-gtk/empathy-account-widget.c:1479
+#: ../libempathy-gtk/empathy-account-widget.c:1521
+msgid "A_pply"
+msgstr "_Aplica"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Entra"
-#: ../libempathy-gtk/empathy-account-widget.c:1547
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Compte:"
-#: ../libempathy-gtk/empathy-account-widget.c:1558
-msgid "Enabled"
-msgstr "Habilitat"
+#: ../libempathy-gtk/empathy-account-widget.c:1628
+msgid "_Enabled"
+msgstr "_Habilitat"
-#: ../libempathy-gtk/empathy-account-widget.c:1623
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Ja existeix aquest compte al servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1626
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Crea un compte nou al servidor"
+#: ../libempathy-gtk/empathy-account-widget.c:1789
+msgid "Ca_ncel"
+msgstr "Ca_ncel·la"
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1995
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s a %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:2021
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "Compte %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2025
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Compte nou"
@@ -735,11 +839,11 @@ msgstr "Avançat"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "Con_trasenya:"
@@ -760,7 +864,7 @@ msgstr "Quin és el vostre nom públic de l'AIM?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Port:"
@@ -769,7 +873,7 @@ msgstr "_Port:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Servidor:"
@@ -780,7 +884,7 @@ msgid "<b>Example:</b> username"
msgstr "<b>Exemple:</b> nomusuari"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "I_D d'entrada:"
@@ -798,26 +902,22 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>Exemple:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "_Joc de caràcters:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "_UIN de l'ICQ:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
msgstr "Quin és el vostre UIN de l'ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "Quina és la vostra contrasenya de l'ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "Joc de _caràcters:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
-msgid "New Network"
-msgstr "Xarxa nova"
-
#: ../libempathy-gtk/empathy-account-widget-sip.c:183
#: ../libempathy-gtk/empathy-account-widget-sip.c:216
msgid "Auto"
@@ -883,6 +983,14 @@ msgstr "Nom real:"
msgid "Servers"
msgstr "Servidors"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "Quin és el vostre sobrenom a l'IRC?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "Quina xarxa d'IRC?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>Exemple:</b> usuari@gmail.com"
@@ -891,20 +999,28 @@ msgstr "<b>Exemple:</b> usuari@gmail.com"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>Exemple:</b> usuari@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Es requereix encriptació (TLS/SSL)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ignora els errors del certificat SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Override server settings"
msgstr "Sobreescriu els paràmetres del servidor"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
msgstr "Pri_oritat:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "Rec_urs:"
#. 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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -916,50 +1032,42 @@ msgstr ""
"Utilitzeu <a href=\"http://www.facebook.com/username/\">aquesta pàgina</a> "
"per a seleccionar un nom d'usuari del Facebook si no en teniu."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "Utilitza l'SS_L antic"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
msgstr "Quina és la vostra contrasenya del Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
msgstr "Quin és el vostre nom d'usuari del Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
msgstr "Quin és el vostre identificador del Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "Quina és la vostra contrasenya del Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "Quin és el vostre identificador del Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "Quina és la vostra contrasenya del Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
msgstr "Quin identificador del Jabber voleu?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "Quina contrasenya preferiu per al Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "_Es requereix xifratge (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "_Ignora els errors del certificat SSL"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Exemple:</b> usuari@hotmail.com"
@@ -973,25 +1081,25 @@ msgid "What is your Windows Live password?"
msgstr "Quina és la vostra contrasenya del Windows Live?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "Adr_eça electrònica:"
+msgid "E-_mail address:"
+msgstr "_Adreça de correu electrònic:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "_Sobrenom:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "_Nom:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "Co_gnoms:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "Sobre_nom:"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "Nom _públic:"
@@ -1022,7 +1130,7 @@ msgstr "Opcions del manteniment de la connexió oberta"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Loose Routing"
-msgstr "Enrutament flexible"
+msgstr "Encaminament flexible"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Mechanism:"
@@ -1069,111 +1177,99 @@ msgid "_Username:"
msgstr "N_om d'usuari:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "Utilitza el _Yahoo! del Japó"
+msgid "I_gnore conference and chat room invitations"
+msgstr "_Ignora les invitacions de conferència i de sala de xat"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
msgstr "Quin és el vostre identificador del Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Quina és la vostra contrasenya del Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "I_D del Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "_Ignora les invitacions de conferència i sala de xat"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "_Localització de la llista de la sala:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
msgid "Couldn't convert image"
msgstr "No s'ha pogut convertir la imatge"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
msgid "None of the accepted image formats are supported on your system"
msgstr "El vostre sistema no sap gestionar cap dels formats d'imatge acceptats"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
msgid "Select Your Avatar Image"
msgstr "Seleccioneu la vostra imatge d'avatar"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "No Image"
msgstr "Cap imatge"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
msgid "Images"
msgstr "Imatges"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
msgid "All Files"
msgstr "Tots els fitxers"
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:323
msgid "Click to enlarge"
msgstr "Feu clic per a fer-la més gran"
-#: ../libempathy-gtk/empathy-chat.c:233
-msgid "Failed to reconnect this chat"
-msgstr "No s'ha pogut tornar a connectar a aquest xat"
-
-#: ../libempathy-gtk/empathy-chat.c:655
-msgid "Failed to join chat room"
-msgstr "No s'ha pogut entrar a la sala de xat"
-
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "No s'ha pogut obrir un xat privat"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "No es pot establir el tema en aquesta conversa"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "No podeu canviar el tema"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: neteja tots els missatges de la conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tema>: estableix el tema de la conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID sala de xat>: entra a una sala de xat nova"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID sala de xat>: entra a una sala de xat nova"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID d'un contacte> [missatge]: obre un xat privat"
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID d'un contacte> <missatge>: obre un xat privat"
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
-msgstr "/nick <alias>: canvieu el vostre sobrenom en el servidor actual"
+msgstr "/nick <sobrenom>: canvieu el vostre sobrenom en el servidor actual"
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <missatge>: envia un missatge d'ACCIÓ a la conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:849
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1183,7 +1279,7 @@ msgstr ""
"enviar un missatge que comenci per «/». Per exemple: «/say /join s'utilitza "
"per entrar a una sala de xat nova»"
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1191,80 +1287,84 @@ msgstr ""
"/help [<ordre>]: mostra totes les ordres possibles. Si s'indica una <ordre> "
"es mostra com s'ha d'utilitzar."
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "Forma d'ús: %s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "Ordre desconeguda"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr "Ordre desconeguda, vegeu /help per a la llista d'ordres disponibles"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "desconnectat"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "contacte no vàlid"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "s'ha denegat el permís"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "el missatge és massa llarg"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "no implementat"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "desconegut"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "S'ha produït un error en enviar el missatge «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "Tema:"
+
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "Tema establert a: %s"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "No s'ha definit cap tema"
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(Cap suggeriment)"
-#: ../libempathy-gtk/empathy-chat.c:1680
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "Insereix una emoticona"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1698
-#: ../libempathy-gtk/empathy-ui-utils.c:1682
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "_Envia"
-#: ../libempathy-gtk/empathy-chat.c:1732
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "_Suggeriments d'ortografia"
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "No s'han pogut recuperar els registres recents"
-#: ../libempathy-gtk/empathy-chat.c:1957
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "En/na %s s'ha desconnectat"
@@ -1272,12 +1372,12 @@ msgstr "En/na %s s'ha desconnectat"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "En/na %2$s ha expulsat en/na %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1967
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "S'ha expulsat en/na %s"
@@ -1285,17 +1385,17 @@ msgstr "S'ha expulsat en/na %s"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1975
+#: ../libempathy-gtk/empathy-chat.c:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "En/na %2$s ha bandejat en/na %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1978
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "s'ha bandejat en/na %s"
-#: ../libempathy-gtk/empathy-chat.c:1982
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "En/na %s ha sortit de la sala"
@@ -1305,81 +1405,79 @@ msgstr "En/na %s ha sortit de la sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1991
+#: ../libempathy-gtk/empathy-chat.c:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2016
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "En/na %s ha entrat a la sala"
-#: ../libempathy-gtk/empathy-chat.c:2041
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "En/na %s ara es diu %s"
-#: ../libempathy-gtk/empathy-chat.c:2180 ../src/empathy-call-window.c:1642
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
msgid "Disconnected"
msgstr "Fora de línia"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "Contrasenya errònia, torneu-ho a intentar:"
-#: ../libempathy-gtk/empathy-chat.c:2703
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "Torna-ho a intentar"
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "Aquesta sala és protegida per una contrasenya:"
-#: ../libempathy-gtk/empathy-chat.c:2709
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "Uneix-te"
-#: ../libempathy-gtk/empathy-chat.c:2849
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "Connectat"
-#: ../libempathy-gtk/empathy-chat.c:2902
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Conversa"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:682
-msgid "Topic:"
-msgstr "Tema:"
-
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:786
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
msgid "_Copy Link Address"
msgstr "_Copia l'adreça de l'enllaç"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:793
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
msgid "_Open Link"
msgstr "_Obre l'enllaç"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Edita la informació del contacte"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "Informació personal"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "Contacte nou"
@@ -1391,214 +1489,288 @@ msgstr "Ho _decidiré més tard"
msgid "Subscription Request"
msgstr "Sol·licitud de subscripció"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1632
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Sense grup"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Persones preferides"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Segur que voleu suprimir el grup «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1634
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "S'està suprimint el grup"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1683
-#: ../libempathy-gtk/empathy-contact-list-view.c:1760
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../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
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Suprimeix"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1713
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Segur que voleu suprimir el contacte «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1715
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "Suprimeix el contacte"
-#: ../libempathy-gtk/empathy-contact-menu.c:209
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "_Afegeix un contacte…"
-#: ../libempathy-gtk/empathy-contact-menu.c:236
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:516
+#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Xat"
-#: ../libempathy-gtk/empathy-contact-menu.c:267
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Trucada de _veu"
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Trucada de vídeo"
-#: ../libempathy-gtk/empathy-contact-menu.c:350
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:644
+#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "Converses _anteriors"
-#: ../libempathy-gtk/empathy-contact-menu.c:372
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:685
+msgid "Send File"
msgstr "Envia un fitxer"
-#: ../libempathy-gtk/empathy-contact-menu.c:395
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+msgid "Share My Desktop"
msgstr "Comparteix el meu escriptori"
-#: ../libempathy-gtk/empathy-contact-menu.c:435
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "Preferit"
-#: ../libempathy-gtk/empathy-contact-menu.c:465
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "Infor_mació"
-#: ../libempathy-gtk/empathy-contact-menu.c:511
+#: ../libempathy-gtk/empathy-contact-menu.c:489
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Edita"
-#: ../libempathy-gtk/empathy-contact-menu.c:565
-#: ../src/empathy-chat-window.c:867
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "Se us està convidant a aquesta sala"
-#: ../libempathy-gtk/empathy-contact-menu.c:596
-msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
+msgid "_Invite to Chat Room"
msgstr "_Convida a la sala de xat"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Seleccioneu un contacte"
-#: ../libempathy-gtk/empathy-contact-widget.c:238
-msgid "Select"
-msgstr "Selecciona"
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
+msgid "Full name:"
+msgstr "Nom complet:"
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1070
-msgid "Group"
-msgstr "Grup"
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "Phone number:"
+msgstr "Número de telèfon:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "E-mail address:"
+msgstr "Adreça de correu electrònic:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+msgid "Website:"
+msgstr "Lloc web:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:230
+#: ../libempathy-gtk/empathy-individual-widget.c:152
+msgid "Birthday:"
+msgstr "Aniversari:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Codi ISO del país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Estat:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Ciutat:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Àrea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Codi postal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Carrer:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Edifici:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Planta:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:627
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Habitació:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:631
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Descripció:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:633
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:635
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Nivell de precisió:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:637
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:639
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Error vertical (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:641
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Error horitzontal (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:643
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Velocitat:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:645
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Direcció:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:647
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Velocitat de pujada:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Última actualització a:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:651
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Longitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Latitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:655
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Altitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Ubicació"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "<b>Location</b>, "
-msgstr "<b>Ubicació</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:737
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s el %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e de %B de %Y a les %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:872
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Desa l'avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:928
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "No s'ha pogut desar l'avatar"
@@ -1606,52 +1778,50 @@ msgstr "No s'ha pogut desar l'avatar"
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Ubicació</b> a (data)\t"
+#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
-msgstr "Sobrenom:"
+msgstr "Àlies:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "Aniversari:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client Information"
msgstr "Informació del client"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client:"
msgstr "Client:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Contact Details"
msgstr "Detalls del contacte"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr "Adreça de correu electrònic:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "Nom complet:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Groups"
-msgstr "Grups"
-
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "Identificador:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
msgstr "S'ha demanat la informació…"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
msgstr "SO:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "Versió:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "Grups"
+
+#: ../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."
@@ -1659,56 +1829,159 @@ msgstr ""
"Seleccioneu els grups en els quals voleu que hi hagi aquest contacte. Podeu "
"seleccionar-ne més d'un o bé cap."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
-msgid "Version:"
-msgstr "Versió:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "Pàgina web:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-groups-widget.c:363
msgid "_Add Group"
msgstr "_Afegeix un grup"
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+msgid "Select"
+msgstr "Selecciona"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1250
+msgid "Group"
+msgstr "Grup"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+msgid "Linked Contacts"
+msgstr "Contactes enllaçats"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "Seleccioneu els contactes a enllaçar"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "Previsualització del contacte nou"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "S'enllaçaran els contactes seleccionats a la llista de l'esquerra."
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:839
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Edita"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:865
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "_Enllaça els contactes…"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "Meta-contacte que conté %u contacte"
+msgstr[1] "Meta-contacte que conté %u contactes"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Ubicació</b> a (data)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "Xarxa nova"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "Seleccioneu una xarxa d'IRC"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "servidor nou"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "Servidor"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "Port"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:310
-msgid "Account"
-msgstr "Compte"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
+msgid "Link Contacts"
+msgstr "Enllaceu contactes"
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "_Desenllaça…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr ""
+"Separa completament el meta-contacte que es mostra en els contactes que "
+"conté."
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
+msgid "_Link"
+msgstr "_Enllaça"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "Voleu desenllaçar el meta-contacte «%s»?"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+"Segur que voleu desenllaçar aquest meta-contacte? Si ho feu separareu "
+"completament el meta-contacte en els contactes que conté."
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_Desenllaça"
+
+#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "Data"
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Conversations"
msgstr "Converses"
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "Cerca el següent"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Cerca l'anterior"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Previous Conversations"
msgstr "Converses anteriors"
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
msgid "Search"
msgstr "Cerca"
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
msgstr "_Per a:"
@@ -1717,28 +1990,27 @@ msgid "Contact ID:"
msgstr "ID del contacte:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
msgid "C_hat"
msgstr "_Xat"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:154
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
msgid "New Conversation"
msgstr "Conversa nova"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
msgid "Send _Video"
msgstr "Envia _vídeo"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
-#: ../src/empathy-call-window.ui.h:17
-msgid "_Call"
-msgstr "Tru_ca"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
+msgstr "_Trucada"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
msgid "New Call"
msgstr "Trucada nova"
@@ -1775,59 +2047,59 @@ msgid "Set your presence and current status"
msgstr "Establiu la presència i l'estat actual"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
msgid "Custom messages…"
msgstr "Missatges personalitzats…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Cerca:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Coincidència de majúscules i minúscules:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "No s'ha trobat la frase"
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
msgid "Received an instant message"
msgstr "Heu rebut un missatge instantani"
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
msgid "Sent an instant message"
msgstr "Heu enviat un missatge instantani"
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
msgid "Incoming chat request"
msgstr "Sol·licitud de xat"
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
msgid "Contact connected"
msgstr "S'ha connectat un contacte"
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
msgid "Contact disconnected"
msgstr "S'ha desconnectat un contacte"
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
msgid "Connected to server"
msgstr "Connectat al servidor"
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
msgid "Disconnected from server"
msgstr "Desconnectat del servidor"
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
msgid "Incoming voice call"
msgstr "Trucada de veu entrant"
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
msgid "Outgoing voice call"
msgstr "Trucada de veu de sortida"
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
msgid "Voice call ended"
msgstr "La trucada de veu ha finalitzat"
@@ -1863,17 +2135,91 @@ msgstr "Net"
msgid "Blue"
msgstr "Blau"
-#: ../libempathy-gtk/empathy-ui-utils.c:1557
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "No es pot verificar la identitat proporcionada pel servidor de xat.\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "El certificat no està signat per una autoritat certificadora"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "El certificat ha vençut"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "Encara no s'ha activat el certificat"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "El certificat no conté l'empremta digital esperada"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr ""
+"El nom d'ordinador verificat pel certificat no correspon al nom del servidor"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "El certificat està signat pel propi servidor"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr ""
+"El certificat ha estat revocat per l'autoritat de certificació que el va "
+"emetre"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "La fortalesa criptogràfica del certificat és feble"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "La llargada del certificat sobrepassa els límits verificables"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "El certificat està mal format"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "S'esperava el nom d'ordinador: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Nom de l'ordinador del certificat: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "Continua"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "No es pot confiar en aquesta connexió. Tot i això, voleu continuar?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "Recorda aquesta decisió per a connexions futures"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "Dades del certificat"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "No s'ha pogut obrir l'URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1674
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "Seleccioneu un fitxer"
-#: ../libempathy-gtk/empathy-ui-utils.c:1738
-msgid "Select a destination"
-msgstr "Seleccioneu una destinació"
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#, c-format
+msgid "Incoming file from %s"
+msgstr "%s us envia un fitxer"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2058,15 +2404,15 @@ msgstr "No hi ha missatge d'error"
msgid "Instant Message (Empathy)"
msgstr "Missatgeria instantània (Empathy)"
-#: ../src/empathy.c:598
+#: ../src/empathy.c:414
msgid "Don't connect on startup"
msgstr "No connectis en iniciar"
-#: ../src/empathy.c:602
+#: ../src/empathy.c:418
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "No mostris la llista de contactes ni cap altre diàleg en iniciar"
-#: ../src/empathy.c:614
+#: ../src/empathy.c:435
msgid "- Empathy IM Client"
msgstr "- Client de missatgeria instantània Empathy"
@@ -2144,7 +2490,7 @@ msgstr ""
"cop o sortir de l'auxiliar i afegir els comptes més tard des del menú Edita."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1315
msgid "An error occurred"
msgstr "S'ha produït un error"
@@ -2153,36 +2499,36 @@ msgstr "S'ha produït un error"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
#, c-format
msgid "New %s account"
msgstr "Compte de %s nou"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:514
msgid "What kind of chat account do you have?"
msgstr "Quin tipus de compte de xat teniu?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:520
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Teniu altres comptes de xat que vulgueu configurar?"
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:526
msgid "Enter your account details"
msgstr "Introduïu les dades del compte"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:531
msgid "What kind of chat account do you want to create?"
msgstr "Quin tipus de compte de xat voleu crear?"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:537
msgid "Do you want to create other chat accounts?"
msgstr "Voleu crear altres comptes de xat?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:544
msgid "Enter the details for the new account"
msgstr "Introduïu les dades del compte nou"
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:659
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2194,44 +2540,44 @@ msgstr ""
"molts altres tipus de programes de xat. També podreu fer trucades de veu o "
"vídeo si teniu un micròfon o una càmera web."
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:676
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"Teniu algun compte que hàgiu utilitzat amb algun altre programa de xat?"
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:699
msgid "Yes, import my account details from "
msgstr "Sí, importa les dades dels comptes de "
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:720
msgid "Yes, I'll enter my account details now"
msgstr "Sí, ara introduiré les dades dels comptes"
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:742
msgid "No, I want a new account"
msgstr "No, vull crear un compte nou"
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:752
msgid "No, I just want to see people online nearby for now"
msgstr ""
"No, per ara només vull veure les persones que estan connectades per aquí a "
"prop"
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:773
msgid "Select the accounts you want to import:"
msgstr "Seleccioneu els comptes que voleu importar:"
-#: ../src/empathy-account-assistant.c:851
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:857
#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Sí"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:864
msgid "No, that's all for now"
msgstr "No, això és tot per ara"
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1129
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2244,16 +2590,16 @@ msgstr ""
"fàcilment més endavant o inhabilitar aquesta funció des del diàleg de "
"«Comptes»."
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
msgid "Edit->Accounts"
msgstr "Edita->Comptes"
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1151
msgid "I don't want to enable this feature for now"
msgstr "No vull habilitar aquesta funció per ara"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1187
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2261,70 +2607,70 @@ msgid ""
"the Accounts dialog"
msgstr ""
"No podreu xatejar amb les persones que estiguin connectades a la xarxa local "
-"en que estigueu ja que el telepathy-salut no és instal·lat.Si voleu "
+"en que estigueu ja que el telepathy-salut no és instal·lat. Si voleu "
"habilitar aquesta funció, instal·leu el paquet telepathy-salut i creeu un "
"compte de «Gent propera» en el diàleg de Comptes."
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1193
msgid "telepathy-salut not installed"
msgstr "La telepathy-salut no està instal·lada"
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1239
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Auxiliar per als comptes de missatgeria i VoIP"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1273
msgid "Welcome to Empathy"
msgstr "Us donem la benvinguda a l'Empathy"
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1282
msgid "Import your existing accounts"
msgstr "Importeu els vostres comptes existents"
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1300
msgid "Please enter personal details"
msgstr "Introduïu les dades personals"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:66
+#: ../src/empathy-accounts-dialog.c:65
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "Hi ha modificacions no desades en el compte %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:70
+#: ../src/empathy-accounts-dialog.c:69
msgid "Your new account has not been saved yet."
msgstr "Encara no heu desat el vostre compte nou."
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:788
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "S'està connectant…"
-#: ../src/empathy-accounts-dialog.c:290
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
-msgid "Disconnected — %s"
+msgid "Offline — %s"
msgstr "Fora de línia — %s"
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:334
#, c-format
-msgid "Offline — %s"
+msgid "Disconnected — %s"
msgstr "Fora de línia — %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline — No Network Connection"
msgstr "Fora de línia — No hi ha connexió de xarxa"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "Estat desconegut"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline — Account Disabled"
msgstr "Fora de línia — Compte inhabilitat"
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:810
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2332,16 +2678,16 @@ msgstr ""
"Esteu a punt de crear un compte nou i perdreu els canvis\n"
"fets fins ara. Segur que voleu continuar?"
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1157
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Voleu suprimir %s de l'ordinador?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1161
msgid "This will not remove your account on the server."
msgstr "Amb això no se suprimirà el vostre compte del servidor."
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1399
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2349,7 +2695,7 @@ msgstr ""
"Esteu a punt de seleccionar un altre compte i perdreu els\n"
"canvis fets fins ara. Segur que voleu continuar?"
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:2002
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2358,14 +2704,18 @@ msgstr ""
"fets fins ara. Segur que voleu continuar?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "S'està carregant la informació del contacte"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "No hi ha cap protocol instal·lat"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "Protocol:"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../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."
@@ -2373,74 +2723,114 @@ msgstr ""
"Per afegir un compte nou, primer heu d'instal·lar el rerefons de cada "
"protocol que vulgueu utilitzar."
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
msgstr "_Afegeix…"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
msgstr "_Importa…"
-#: ../src/empathy-auto-salut-account-helper.c:77
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr " - Client d'autenticació de l'Empathy"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Client d'autenticació de l'Empathy"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
msgid "People nearby"
msgstr "Gent propera"
-#: ../src/empathy-call-window.c:461
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr "- Client d'àudio/vídeo de l'Empathy"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Client d'àudio/vídeo de l'Empathy"
+
+#: ../src/empathy-call-window.c:479
msgid "Contrast"
msgstr "Contrast"
-#: ../src/empathy-call-window.c:464
+#: ../src/empathy-call-window.c:482
msgid "Brightness"
msgstr "Brillantor"
-#: ../src/empathy-call-window.c:467
+#: ../src/empathy-call-window.c:485
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:572
+#: ../src/empathy-call-window.c:590
msgid "Volume"
msgstr "Volum"
-#: ../src/empathy-call-window.c:1119
+#: ../src/empathy-call-window.c:1175
msgid "_Sidebar"
msgstr "Barra _lateral"
-#: ../src/empathy-call-window.c:1138
+#: ../src/empathy-call-window.c:1194
msgid "Audio input"
msgstr "Entrada d'àudio"
-#: ../src/empathy-call-window.c:1142
+#: ../src/empathy-call-window.c:1198
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-call-window.c:1146
+#: ../src/empathy-call-window.c:1202
msgid "Dialpad"
msgstr "Marcador"
+#: ../src/empathy-call-window.c:1207
+msgid "Details"
+msgstr "Dades"
+
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1217
+#: ../src/empathy-call-window.c:1275
#, c-format
msgid "Call with %s"
msgstr "Trucada amb %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1298
+#: ../src/empathy-call-window.c:1354
msgid "Call"
msgstr "Trucada"
+#: ../src/empathy-call-window.c:1508
+msgid "The IP address as seen by the machine"
+msgstr "L'adreça IP des del punt de vista de la màquina"
+
+#: ../src/empathy-call-window.c:1510
+msgid "The IP address as seen by a server on the Internet"
+msgstr "L'adreça IP des del punt de vista d'un servidor d'Internet"
+
+#: ../src/empathy-call-window.c:1512
+msgid "The IP address of the peer as seen by the other side"
+msgstr "L'adreça IP d'un igual vist per l'altre l'igual"
+
+#: ../src/empathy-call-window.c:1514
+msgid "The IP address of a relay server"
+msgstr "L'adreça IP d'un servidor de repetició"
+
+#: ../src/empathy-call-window.c:1516
+msgid "The IP address of the multicast group"
+msgstr "L'adreça IP del grup de multidestinació"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1955
+#: ../src/empathy-call-window.c:2263
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Connectat -- %d:%02dm"
-#: ../src/empathy-call-window.c:2016
+#: ../src/empathy-call-window.c:2324
msgid "Technical Details"
msgstr "Detalls tècnics"
-#: ../src/empathy-call-window.c:2054
+#: ../src/empathy-call-window.c:2362
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2449,7 +2839,7 @@ msgstr ""
"El programari d'en/na %s no té cap format d'àudio dels que teniu en el "
"vostre ordinador"
-#: ../src/empathy-call-window.c:2059
+#: ../src/empathy-call-window.c:2367
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2458,7 +2848,7 @@ msgstr ""
"El programari d'en/na %s no té cap format de vídeo dels que teniu en el "
"vostre ordinador"
-#: ../src/empathy-call-window.c:2065
+#: ../src/empathy-call-window.c:2373
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2467,25 +2857,25 @@ msgstr ""
"No s'ha pogut connectar amb en/na %s. Algú dels dos deu estar en una xarxa "
"que no permet connexions directes."
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-call-window.c:2379
msgid "There was a failure on the network"
msgstr "Hi ha hagut una fallada en la xarxa"
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-call-window.c:2383
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Els formats d'àudio necessaris per a aquesta trucada no estan instal·lats en "
"aquest ordinador"
-#: ../src/empathy-call-window.c:2078
+#: ../src/empathy-call-window.c:2386
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Els formats de vídeo necessaris per a aquesta trucada no estan instal·lats "
"en aquest ordinador"
-#: ../src/empathy-call-window.c:2088
+#: ../src/empathy-call-window.c:2396
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2496,115 +2886,147 @@ msgstr ""
"\">Informeu d'aquesta errada</a> i adjunteu-hi els registres recollits a la "
"finestra «Depuració» del menú Ajuda."
-#: ../src/empathy-call-window.c:2096
+#: ../src/empathy-call-window.c:2404
msgid "There was a failure in the call engine"
msgstr "Hi ha hagut una fallada en el motor de trucada"
-#: ../src/empathy-call-window.c:2135
+#: ../src/empathy-call-window.c:2407
+msgid "The end of the stream was reached"
+msgstr "S'ha arribat al final del flux"
+
+#: ../src/empathy-call-window.c:2447
msgid "Can't establish audio stream"
msgstr "No s'ha pogut establir el flux d'àudio"
-#: ../src/empathy-call-window.c:2145
+#: ../src/empathy-call-window.c:2457
msgid "Can't establish video stream"
msgstr "No s'ha pogut establir el flux de vídeo"
#: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "Àudio"
+
+#: ../src/empathy-call-window.ui.h:2
msgid "Call the contact again"
msgstr "Torna a trucar al contacte"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:3
msgid "Camera Off"
msgstr "Càmera apagada"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
msgid "Camera On"
msgstr "Càmera engegada"
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Còdec de descodificació:"
+
+#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
msgstr "Inhabilita la càmera i atura l'enviament de vídeo"
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:7
msgid "Enable camera and send video"
msgstr "Habilita la càmera i envia senyal de vídeo"
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:8
msgid "Enable camera but don't send video"
msgstr "Habilita la càmera però no enviïs senyal de vídeo"
-#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Còdec de codificació:"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
msgstr "Penja"
-#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-call-window.ui.h:11
msgid "Hang up current call"
msgstr "Penja la trucada actual"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Candidat local:"
+
+#: ../src/empathy-call-window.ui.h:13
msgid "Preview"
msgstr "Previsualització"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:14
msgid "Redial"
msgstr "Torna a trucar"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Candidat remot:"
+
+#: ../src/empathy-call-window.ui.h:16
msgid "Send Audio"
msgstr "Envia àudio"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Commuta la transmissió d'àudio"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:19
msgid "V_ideo"
msgstr "V_ídeo"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "Vídeo"
+
+#: ../src/empathy-call-window.ui.h:21
msgid "Video Off"
msgstr "El vídeo està apagat"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:22
msgid "Video On"
msgstr "El vídeo està engegat"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:23
msgid "Video Preview"
msgstr "Previsualització de vídeo"
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "Tru_ca"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "_Visualitza"
-#: ../src/empathy-chat-window.c:446 ../src/empathy-chat-window.c:466
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d sense llegir)"
msgstr[1] "%s (%d sense llegir)"
-#: ../src/empathy-chat-window.c:458
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (i %u altre)"
msgstr[1] "%s (i %u altres)"
-#: ../src/empathy-chat-window.c:474
+#: ../src/empathy-chat-window.c:480
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d sense llegir d'altres)"
msgstr[1] "%s (%d sense llegir d'altres)"
-#: ../src/empathy-chat-window.c:483
+#: ../src/empathy-chat-window.c:489
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d sense llegir de tots)"
msgstr[1] "%s (%d sense llegir de tots)"
-#: ../src/empathy-chat-window.c:686
+#: ../src/empathy-chat-window.c:695
msgid "Typing a message."
msgstr "S'està escrivint un missatge."
@@ -2636,59 +3058,63 @@ msgstr "Mou la pestanya a l'_esquerra"
msgid "Move Tab _Right"
msgstr "Mou la pestanya a la d_reta"
-#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "Notifica tots els missatges"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "_Continguts"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_Conversa"
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
msgid "_Detach Tab"
msgstr "D_esenganxa la pestanya"
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "_Edita"
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "Sala de xat _preferida"
-#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "A_juda"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "Pestanya següe_nt"
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
msgid "_Previous Tab"
msgstr "_Pestanya anterior"
-#: ../src/empathy-chat-window.ui.h:16 ../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 "_Mostra la llista de contactes"
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
msgstr "Pes_tanyes"
-#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:19
msgid "_Undo Close Tab"
-msgstr ""
+msgstr "_Desfés el tancament de la pestanya"
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chatrooms-window.c:241
msgid "Name"
msgstr "Nom"
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
msgid "Room"
msgstr "Sala"
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
msgid "Auto-Connect"
msgstr "Connecta automàticament"
@@ -2696,76 +3122,86 @@ msgstr "Connecta automàticament"
msgid "Manage Favorite Rooms"
msgstr "Gestiona les sales preferides"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming video call"
msgstr "Trucada de vídeo entrant"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming call"
msgstr "Trucada entrant"
-#: ../src/empathy-event-manager.c:343
+#: ../src/empathy-event-manager.c:472
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "En/na %s us està trucant per videoconferència, voleu contestar?"
-#: ../src/empathy-event-manager.c:344
+#: ../src/empathy-event-manager.c:473
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "En/na %s us està trucant, voleu contestar?"
-#: ../src/empathy-event-manager.c:366
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Trucada entrant d'en/na %s"
+
+#: ../src/empathy-event-manager.c:501
msgid "_Reject"
msgstr "_Refusa"
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:507
msgid "_Answer"
msgstr "_Contesta"
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming video call from %s"
msgstr "Trucada de videoconferència d'en/na %s"
-#: ../src/empathy-event-manager.c:489
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Trucada entrant d'en/na %s"
-
-#: ../src/empathy-event-manager.c:579
+#: ../src/empathy-event-manager.c:695
msgid "Room invitation"
msgstr "Invitació a la sala"
-#: ../src/empathy-event-manager.c:582
+#: ../src/empathy-event-manager.c:697
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Us han convidat a entrar a %s"
+
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "%s is inviting you to join %s"
msgstr "En/na %s us convida a entrar a %s"
-#: ../src/empathy-event-manager.c:590
+#: ../src/empathy-event-manager.c:712
msgid "_Decline"
msgstr "_Declina"
-#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-event-manager.c:717
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Uneix-m'hi"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:743
#, c-format
msgid "%s invited you to join %s"
msgstr "En/na %s us ha convidat a entrar a %s"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "Us han convidat a entrar a %s"
+
+#: ../src/empathy-event-manager.c:797
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Transferència de fitxers entrant d'en/na %s"
-#: ../src/empathy-event-manager.c:818
+#: ../src/empathy-event-manager.c:1005
#, c-format
msgid "Subscription requested by %s"
msgstr "Sol·licitud de subscripció d'en/na %s"
-#: ../src/empathy-event-manager.c:822
+#: ../src/empathy-event-manager.c:1009
#, c-format
msgid ""
"\n"
@@ -2774,118 +3210,116 @@ msgstr ""
"\n"
"Missatge: %s"
-#. someone is logging off
-#: ../src/empathy-event-manager.c:862
+#: ../src/empathy-event-manager.c:1052
#, c-format
msgid "%s is now offline."
msgstr "%s està fora de línia."
-#. someone is logging in
-#: ../src/empathy-event-manager.c:878
+#: ../src/empathy-event-manager.c:1072
#, c-format
msgid "%s is now online."
msgstr "%s està en línia."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Desconegut"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s de %s a %s/s"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s"
msgstr "%s de %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "S'està rebent «%s» d'en/na %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "S'està enviant «%s» a en/na %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "S'ha produït un error en rebre «%s» d'en/na %s"
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
msgid "Error receiving a file"
msgstr "S'ha produït un error en rebre el fitxer"
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "S'ha produït un error en enviar «%s» a en/na %s"
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
msgid "Error sending a file"
msgstr "S'ha produït un error en enviar el fitxer"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
#, c-format
msgid "\"%s\" received from %s"
msgstr "S'ha rebut «%s» d'en/na %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
#, c-format
msgid "\"%s\" sent to %s"
msgstr "S'ha enviat «%s» a en/na %s"
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
msgid "File transfer completed"
msgstr "S'ha completat la transferència"
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
msgid "Waiting for the other participant's response"
msgstr "S'està esperant que l'interlocutor respongui"
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "S'està comprovant la integritat de «%s»"
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "S'està fent el resum de «%s»"
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:996
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1008
msgid "File"
msgstr "Fitxer"
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1030
msgid "Remaining"
msgstr "Restant"
@@ -2912,160 +3346,159 @@ msgid "Import Accounts"
msgstr "Importa els comptes"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:292
msgid "Import"
msgstr "Importa"
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:301
msgid "Protocol"
msgstr "Protocol"
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:325
msgid "Source"
msgstr "Font"
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "Compte %s"
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "No s'ha trobat cap coincidència"
-#: ../src/empathy-main-window.c:440
+#: ../src/empathy-main-window.c:538
msgid "Reconnect"
msgstr "Torna a connectar"
-#: ../src/empathy-main-window.c:446
+#: ../src/empathy-main-window.c:544
msgid "Edit Account"
msgstr "Edita el compte"
-#: ../src/empathy-main-window.c:452
+#: ../src/empathy-main-window.c:550
msgid "Close"
msgstr "Tanca"
-#: ../src/empathy-main-window.c:1053
+#: ../src/empathy-main-window.c:1232
msgid "Contact"
msgstr "Contacte"
-#: ../src/empathy-main-window.c:1435
+#: ../src/empathy-main-window.c:1557
+msgid "Contact List"
+msgstr "Llista de contactes"
+
+#: ../src/empathy-main-window.c:1666
msgid "Show and edit accounts"
msgstr "Mostra i edita els comptes"
#: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "Llista de contactes"
-
-#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
msgstr "Contactes en el _mapa"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
msgid "Context"
msgstr "Context"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
msgid "Join _Favorites"
msgstr "Uneix-te als _preferits"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
msgid "Manage Favorites"
msgstr "Gestiona els preferits"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
msgid "N_ormal Size"
msgstr "Mida _normal"
-#: ../src/empathy-main-window.ui.h:7 ../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 "_Trucada nova…"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
msgstr "Mida normal amb els _avatars"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
msgid "P_references"
msgstr "P_referències"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
msgid "Show P_rotocols"
msgstr "Mostra els _protocols"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
msgid "Sort by _Name"
msgstr "Ordena per _nom"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Status"
msgstr "Ordena per es_tat"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
msgid "_Accounts"
msgstr "_Comptes"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
msgid "_Compact Size"
msgstr "Mida _compacta"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
msgid "_Debug"
msgstr "_Depura"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
msgid "_File Transfers"
msgstr "Transferències de _fitxers"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
msgid "_Join…"
msgstr "_Uneix-m'hi…"
-#: ../src/empathy-main-window.ui.h:23 ../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 "Conversa _nova…"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
msgid "_Offline Contacts"
msgstr "Contactes _desconnectats"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
msgid "_Personal Information"
msgstr "Informació _personal"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
msgid "_Room"
msgstr "_Sala"
-#: ../src/empathy-new-chatroom-dialog.c:382
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "Sala de xat"
-#: ../src/empathy-new-chatroom-dialog.c:398
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "Membres"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:606
+#: ../src/empathy-new-chatroom-dialog.c:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
+"%s\n"
"Cal invitació: %s\n"
"Cal contrasenya: %s\n"
"Membres: %s"
-#: ../src/empathy-new-chatroom-dialog.c:608
#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "No"
-#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "No s'ha pogut iniciar el llistat de sales"
-#: ../src/empathy-new-chatroom-dialog.c:646
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "No s'ha pogut aturar el llistat de sales"
@@ -3100,62 +3533,66 @@ msgstr "Llista de sales"
msgid "_Room:"
msgstr "Sa_la:"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:138
msgid "Message received"
msgstr "Missatge rebut"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:139
msgid "Message sent"
msgstr "Missatge enviat"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:140
msgid "New conversation"
msgstr "Conversa nova"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:141
msgid "Contact goes online"
msgstr "El contacte s'ha connectat"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:142
msgid "Contact goes offline"
msgstr "El contacte s'ha desconnectat"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:143
msgid "Account connected"
msgstr "Compte connectat"
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:144
msgid "Account disconnected"
msgstr "Compte desconnectat"
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:445
msgid "Language"
msgstr "Llengua"
+#: ../src/empathy-preferences.c:882
+msgid "Preferences"
+msgstr "Preferències"
+
#: ../src/empathy-preferences.ui.h:1
msgid "Appearance"
msgstr "Aparença"
#: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "_Connecta automàticament en iniciar "
-
-#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Comportament"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
msgid "Chat Th_eme:"
msgstr "T_ema de xat:"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
msgid "Disable notifications when _away or busy"
msgstr "Inhabilita les notificacions quan s'estigui _absent o ocupat"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable sounds when _away or busy"
msgstr "Inhabilita els sons quan s'estigui _absent o ocupat"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "Mostra els esdeveniments d'entrada a l'àrea de notificació"
+
#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "Habilita les notificacions quan es connecti un contacte"
@@ -3181,17 +3618,17 @@ msgid "Location sources:"
msgstr "Fonts d'ubicació:"
#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "Enregistra les converses"
+
+#: ../src/empathy-preferences.ui.h:15
msgid "Notifications"
msgstr "Notificacions"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
msgid "Play sound for events"
msgstr "Reprodueix un so per als esdeveniments"
-#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "Preferències"
-
#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Privadesa"
@@ -3235,41 +3672,62 @@ msgid "Themes"
msgstr "Temes"
#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr "_Connecta automàticament en iniciar"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Cellphone"
msgstr "_Telèfon mòbil"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable bubble notifications"
msgstr "_Habilita les notificacions"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable sound notifications"
msgstr "_Habilita les notificacions de so"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_Network (IP, Wi-Fi)"
msgstr "_Xarxa (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Open new chats in separate windows"
msgstr "_Obre xats nous en finestres separades"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Publish location to my contacts"
msgstr "_Publica la ubicació per als meus contactes"
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
msgid "_Reduce location accuracy"
msgstr "_Redueix la precisió de la ubicació"
-#: ../src/empathy-status-icon.c:202
+#: ../src/empathy-status-icon.c:141
msgid "Respond"
msgstr "Respon"
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "Rebutja"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "Contesta"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "Declina"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "Accepta"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Estat"
@@ -3278,67 +3736,67 @@ msgstr "Estat"
msgid "_Quit"
msgstr "_Surt"
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
msgid "Contact Map View"
msgstr "Visualització de contactes en el mapa"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1219
msgid "Save"
msgstr "Desa"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
msgstr "Finestra de depuració"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1475
msgid "Pause"
msgstr "Fes una pausa"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1487
msgid "Level "
msgstr "Nivell "
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1507
msgid "Debug"
msgstr "Depura"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1513
msgid "Info"
msgstr "Informació"
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "Missatge"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1525
msgid "Warning"
msgstr "Avís"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1531
msgid "Critical"
msgstr "Crític"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1537
msgid "Error"
msgstr "Error"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1556
msgid "Time"
msgstr "Hora"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1559
msgid "Domain"
msgstr "Domini"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1561
msgid "Category"
msgstr "Categoria"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1563
msgid "Level"
msgstr "Nivell"
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1600
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3355,28 +3813,32 @@ msgstr "Convida un participant"
msgid "Choose a contact to invite into the conversation:"
msgstr "Seleccioneu un contacte per convidar-lo a la conversa:"
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "Convida"
+
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "No mostris cap diàleg, realitza la tasca (p.ex. importar) i surt"
-#: ../src/empathy-accounts.c:217
-msgid "Don't display any dialogs if there are any non-salut accounts"
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-Salut accounts"
msgstr "No mostris cap diàleg si hi ha cap compte que no sigui del Salut"
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Selecciona inicialment el compte especificat (p.ex. gabble/jabber/exemple)"
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
msgid "<account-id>"
msgstr "<identificador-del-compte>"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
msgid "- Empathy Accounts"
msgstr "- Comptes de l'Empathy"
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
msgid "Empathy Accounts"
msgstr "Comptes de l'Empathy"
@@ -3384,6 +3846,48 @@ msgstr "Comptes de l'Empathy"
msgid "Empathy Debugger"
msgstr "Depurador de l'Empathy"
+#, fuzzy
+#~| msgid "Select"
+#~ msgctxt "verb displayed on a button to select an IRC network"
+#~ msgid "Select"
+#~ msgstr "Selecciona"
+
+#~ msgid "Send and receive messages"
+#~ msgstr "Envieu i rebeu missatges"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "S'han importat els comptes del MC 4"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "S'han importat els comptes del MC 4."
+
+#~ msgid "_Character set:"
+#~ msgstr "Joc de _caràcters:"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "Adr_eça electrònica:"
+
+#~ msgid "_Nickname:"
+#~ msgstr "Sobre_nom:"
+
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Utilitza el _Yahoo! del Japó"
+
+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "No s'ha pogut tornar a connectar a aquest xat"
+
+#~ msgid "Failed to join chat room"
+#~ msgstr "No s'ha pogut entrar a la sala de xat"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>Ubicació</b>, "
+
+#~ msgid "Select a destination"
+#~ msgstr "Seleccioneu una destinació"
+
+#~ msgid "%s account"
+#~ msgstr "Compte %s"
+
#~ msgid "Hostname of the proxy for outbound requests."
#~ msgstr "Nom del servidor intermediari per a les peticions de sortida."
@@ -3415,7 +3919,7 @@ msgstr "Depurador de l'Empathy"
#~ "Use the loose routing behavior and the Route header as recommended in RFC "
#~ "3261."
#~ msgstr ""
-#~ "Utilitza el comportament de l'enrutament flexible i la capçalera «Route» "
+#~ "Utilitza el comportament de l'encaminament flexible i la capçalera «Route» "
#~ "tal com recomana l'RFC 3261."
#~ msgid "_Add&#x2026;"
@@ -3465,9 +3969,6 @@ msgstr "Depurador de l'Empathy"
#~ msgid "Email:"
#~ msgstr "Correu electrònic:"
-#~ msgid "C_all"
-#~ msgstr "_Trucada"
-
#~ msgid "Edit Custom Messages..."
#~ msgstr "Edita els missatges personalitzats..."
@@ -3622,9 +4123,6 @@ msgstr "Depurador de l'Empathy"
#~ msgid "Type:"
#~ msgstr "Tipus:"
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Missatgeria instantània Empathy"
-
#~ msgid "Forget password and clear the entry."
#~ msgstr "Oblida la contrasenya i neteja el camp."
@@ -3661,9 +4159,6 @@ msgstr "Depurador de l'Empathy"
#~ msgid "<b>Groups</b>"
#~ msgstr "<b>Grups</b>"
-#~ msgid "Contact information"
-#~ msgstr "Informació del contacte"
-
#~ msgid "Word"
#~ msgstr "Paraula"
@@ -3691,9 +4186,6 @@ msgstr "Depurador de l'Empathy"
#~ msgid "Select who would you like to invite:"
#~ msgstr "Seleccioneu qui voleu convidar:"
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "Us han convidat a unir-vos a una conferència de xat."
-
#~ msgid "Edit Favorite Room"
#~ msgstr "Edita la sala preferida"
@@ -3970,9 +4462,6 @@ msgstr "Depurador de l'Empathy"
#~ msgid "Contact Infor_mation"
#~ msgstr "Infor_mació del contacte"
-#~ msgid "In_vite..."
-#~ msgstr "Con_vida..."
-
#~ msgid "_Add To Favorites"
#~ msgstr "_Afegeix als preferits"
@@ -4161,18 +4650,9 @@ msgstr "Depurador de l'Empathy"
#~ msgid "The remote service timed out"
#~ msgstr "S'ha esgotat el temps d'espera per al servei remot"
-#~ msgid "Connection could not be opened"
-#~ msgstr "No s'ha pogut obrir la connexió"
-
-#~ msgid "Connection refused."
-#~ msgstr "S'ha rebutjat la connexió."
-
#~ msgid "Server address could not be resolved."
#~ msgstr "No s'ha pogut resoldre l'adreça del servidor."
-#~ msgid "Connection timed out."
-#~ msgstr "S'ha exhaurit el temps d'espera de la connexió."
-
#~ msgid "Authentication failed."
#~ msgstr "Ha fallat l'autenticació."
@@ -4314,9 +4794,6 @@ msgstr "Depurador de l'Empathy"
#~ msgid "Your invitation has been declined"
#~ msgstr "S'ha declinat la vostra invitació"
-#~ msgid "Accept"
-#~ msgstr "Accepta"
-
#~ msgid "Emai_l..."
#~ msgstr "Correu e_lectrònic..."
@@ -4715,9 +5192,6 @@ msgstr "Depurador de l'Empathy"
#~ msgid "Bye bye"
#~ msgstr "Adéu siau"
-#~ msgid "Cancel"
-#~ msgstr "Cancel·la"
-
#~ msgid "OK"
#~ msgstr "D'acord"
@@ -5018,9 +5492,6 @@ msgstr "Depurador de l'Empathy"
#~ msgid "Height of main window"
#~ msgstr "Alçada de la finestra principal"
-#~ msgid "The X position of the main window."
-#~ msgstr "La posició X de la finestra principal."
-
#~ msgid "The Y position of the main window."
#~ msgstr "La posició Y de la finestra principal."
@@ -5369,9 +5840,6 @@ msgstr "Depurador de l'Empathy"
#~ msgid "Payment Required"
#~ msgstr "Es requereix pagament"
-#~ msgid "Not Found"
-#~ msgstr "No s'ha trobat"
-
#~ msgid "Not Allowed"
#~ msgstr "No permés"
@@ -5532,15 +6000,9 @@ msgstr "Depurador de l'Empathy"
#~ msgid "<b>Spell Checking</b>"
#~ msgstr "<b>Correció ortogràfica</b>"
-#~ msgid "<i>Information not available</i>"
-#~ msgstr "<i>Informació no disponible</i>"
-
#~ msgid "Add Another Account"
#~ msgstr "Afegeix un altre compte"
-#~ msgid "Choose a Server"
-#~ msgstr "Seleccioneu un servidor"
-
#~ msgid "Configure Transports"
#~ msgstr "Configura els transports"
@@ -5577,9 +6039,6 @@ msgstr "Depurador de l'Empathy"
#~ msgid "Remove Account"
#~ msgstr "Supimeix el compte"
-#~ msgid "Service Details"
-#~ msgstr "Detalls del servei"
-
#~ msgid "Status Message"
#~ msgstr "Missatge d'estat"
@@ -5655,9 +6114,6 @@ msgstr "Depurador de l'Empathy"
#~ "Assegureu-vos que la informació del vostre compte és correcta. El "
#~ "servidor també pot no estar disponible en aquest moment."
-#~ msgid "Details:"
-#~ msgstr "Detalls:"
-
#~ msgid "An error occurred when chatting with %s."
#~ msgstr "S'ha produït un error mentre es xatejava amb %s."
diff --git a/po/es.po b/po/es.po
index 2bca80a95..c0fab69bd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,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: 2010-10-01 10:11+0000\n"
-"PO-Revision-Date: 2010-10-01 12:22+0200\n"
+"POT-Creation-Date: 2010-10-15 03:04+0000\n"
+"PO-Revision-Date: 2010-10-15 11:41+0200\n"
"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -553,9 +553,9 @@ msgstr "Invisible"
msgid "Offline"
msgstr "Desconectado"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
-#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
-#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Desconocido"
@@ -741,67 +741,67 @@ msgstr "en el futuro"
msgid "All"
msgstr "Todo"
-#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-account-widget.c:612
#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Cuenta"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:613
msgid "Password"
msgstr "Contraseña"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:614
#: ../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:615
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Puerto"
-#: ../libempathy-gtk/empathy-account-widget.c:589
-#: ../libempathy-gtk/empathy-account-widget.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:687
+#: ../libempathy-gtk/empathy-account-widget.c:744
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1299
msgid "Username:"
msgstr "Nombre de usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1634
msgid "A_pply"
msgstr "_Aplicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1664
msgid "L_og in"
msgstr "Iniciar _sesión"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1730
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1399
#: ../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 "Cuenta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1741
msgid "_Enabled"
msgstr "_Activada"
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "This account already exists on the server"
msgstr "Esta cuenta ya existe en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1809
msgid "Create a new account on the server"
msgstr "Crear una cuenta nueva en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:1902
msgid "Ca_ncel"
msgstr "Ca_ncelar"
@@ -810,19 +810,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:2190
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s en %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2216
#, c-format
msgid "%s Account"
msgstr "Cuenta %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2220
msgid "New account"
msgstr "Cuenta nueva"
@@ -1281,8 +1281,8 @@ msgid ""
"join a new chat room\""
msgstr ""
"/say <mensaje>: enviar un <mensaje> a la conversación actual. Esto se usa "
-"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa "
-"para unirse a una sala de chat nueva»"
+"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se "
+"usa para unirse a una sala de chat nueva»"
#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
@@ -1425,31 +1425,31 @@ msgstr "%s ha entrado en la sala"
msgid "%s is now known as %s"
msgstr "Ahora %s se llama %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2910
msgid "Wrong password; please try again:"
msgstr "Contraseña incorrecta; inténtelo de nuevo:"
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:2911
msgid "Retry"
msgstr "Volver a intentarlo"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:2916
msgid "This room is protected by a password:"
msgstr "Esta sala está protegida por contraseña:"
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:2917
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3057
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-chat.c:3110
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Conversación"
@@ -1539,64 +1539,64 @@ msgid "_Add Contact…"
msgstr "_Añadir contacto…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../libempathy-gtk/empathy-individual-menu.c:516
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Chat"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Llamada de vo_z"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "Llamada de _vídeo"
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:644
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "Conversaciones an_teriores"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "Enviar archivo"
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "Compartir mi escritorio"
-#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1570
-#: ../libempathy-gtk/empathy-individual-menu.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-menu.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1290
msgid "Favorite"
msgstr "Favorita"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "Infor_mación"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:489
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
#: ../src/empathy-chat-window.c:917
msgid "Inviting you to this room"
msgstr "Invitándolo a esta sala"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
msgid "_Invite to Chat Room"
msgstr "_Invitar a sala de chat"
@@ -1604,178 +1604,178 @@ msgstr "_Invitar a sala de chat"
msgid "Select a contact"
msgstr "Seleccionar un contacto"
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-individual-widget.c:147
msgid "Full name:"
msgstr "Nombre completo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Phone number:"
msgstr "Número de teléfono:"
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "E-mail address:"
msgstr "Dirección de correo-e:"
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "Website:"
msgstr "Página web:"
-#: ../libempathy-gtk/empathy-contact-widget.c:230
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Birthday:"
msgstr "Cumpleaños:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Country ISO Code:"
msgstr "Código ISO de país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "State:"
msgstr "Estado:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "City:"
msgstr "Ciudad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Area:"
msgstr "Área:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Postal Code:"
msgstr "Código postal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Street:"
msgstr "Calle:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Building:"
msgstr "Edificio:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Floor:"
msgstr "Planta:"
-#: ../libempathy-gtk/empathy-contact-widget.c:627
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Room:"
msgstr "Habitación:"
-#: ../libempathy-gtk/empathy-contact-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:631
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Description:"
msgstr "Descripción:"
-#: ../libempathy-gtk/empathy-contact-widget.c:633
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:635
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Accuracy Level:"
msgstr "Nivel de precisión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:637
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:639
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Vertical Error (meters):"
msgstr "Error vertical (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:641
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:640
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Horizontal Error (meters):"
msgstr "Error horizontal (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:643
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:642
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Speed:"
msgstr "Velocidad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:645
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Bearing:"
msgstr "Retardo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:647
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Climb Speed:"
msgstr "Velocidad de ascenso:"
-#: ../libempathy-gtk/empathy-contact-widget.c:649
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Last Updated on:"
msgstr "Actualizado por última vez:"
-#: ../libempathy-gtk/empathy-contact-widget.c:651
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Longitude:"
msgstr "Longitud_"
-#: ../libempathy-gtk/empathy-contact-widget.c:653
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Latitude:"
msgstr "Latitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:655
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Altitude:"
msgstr "Altitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:718
-#: ../libempathy-gtk/empathy-contact-widget.c:735
-#: ../libempathy-gtk/empathy-individual-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:717
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Ubicación geográfica"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:737
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-individual-widget.c:600
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:789
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:649
msgid "%B %e, %Y at %R UTC"
msgstr "%e de %B de %Y a las %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:872
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-individual-widget.c:840
msgid "Save Avatar"
msgstr "Guardar avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:928
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Unable to save avatar"
msgstr "No se pudo guardar el avatar"
@@ -1785,7 +1785,7 @@ msgstr "<b>Ubicación</b> en (fecha)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
msgid "Alias:"
msgstr "Apodo:"
@@ -1805,7 +1805,7 @@ msgstr "Detalles del 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:1429
msgid "Identifier:"
msgstr "Identificador:"
@@ -1839,13 +1839,12 @@ msgid "_Add Group"
msgstr "_Añadir grupo"
#: ../libempathy-gtk/empathy-groups-widget.c:398
-#| msgid "Select"
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Seleccionar"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1247
+#: ../src/empathy-main-window.c:1250
msgid "Group"
msgstr "Grupo"
@@ -1876,19 +1875,19 @@ msgstr ""
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Enlazar contactos…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1908,7 +1907,6 @@ msgid "Choose an IRC network"
msgstr "Elegir una red IRC"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
-#| msgid "Select"
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "Seleccionar"
@@ -2159,75 +2157,76 @@ 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 ""
-"No se puede verificar la identidad proporcionada por el servidor de chat.\n"
+"No se puede verificar la identidad proporcionada por el servidor de chat."
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "El certificado no está firmado por una Autoridad de certificación"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "El certificado no está firmado por una Autoridad de certificación."
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "El certificado ha caducado"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "El certificado ha caducado."
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "El certificado aún no está activado"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "El certificado aún no está activado."
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "El certificado no tiene la huella esperada"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "El certificado no tiene la huella 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 ""
"El nombre del servidor verificado por el certificado no coincide con el "
-"nombre del servidor"
+"nombre del servidor."
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
-msgstr "El certificado está firmado consigo mismo"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "El certificado está firmado consigo mismo."
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr "La Autoridad de certificación emisora ha revocado el certificado"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "La Autoridad de certificación emisora ha revocado el certificado.."
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "El certificado es criptográficamente débil"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "El certificado es criptográficamente débil."
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "La longitud del certificado excede de los límites verificables"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "La longitud del certificado excede de los límites verificables."
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
-msgstr "El certificado está malformado"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "El 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 "Nombre del servidor esperado: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "Nombre del servidor de certificados: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "Continuar"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "Esta conexión no es de confianza. ¿Quiere continuar de todas formas?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "Recordar esta opción para futuras conexiones"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "Detalles del certificado"
@@ -2427,19 +2426,37 @@ msgstr "Sin mensaje de eeror"
msgid "Instant Message (Empathy)"
msgstr "Mensaje instantáneo (Empathy)"
-#: ../src/empathy.c:414
+#: ../src/empathy.c:268
+msgid "Error contacting the Account Manager"
+msgstr "Error al contactar con el Gestor de cuentas"
+
+#: ../src/empathy.c:270
+#, c-format
+#| msgid "There was an error while parsing the account details."
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"Hubo un error al intentar conectar con el Gestor de cuentas Telelepathy. El "
+"error fue:\n"
+"\n"
+"%s"
+
+#: ../src/empathy.c:428
msgid "Don't connect on startup"
msgstr "No conectarse automáticamente al inicio"
-#: ../src/empathy.c:418
+#: ../src/empathy.c:432
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "No mostrar la lista de contactos o cualquier otro diálogo al inicio"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:449
msgid "- Empathy IM Client"
msgstr "- Cliente de mensajería instantánea Empathy"
-#: ../src/empathy-about-dialog.c:85
+#: ../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 "
@@ -2451,7 +2468,7 @@ msgstr ""
"Foundation; ya sea en la versión 2 de la Licencia, o (a su elección) "
"cualquier versión posterior."
-#: ../src/empathy-about-dialog.c: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 "
@@ -2463,7 +2480,7 @@ msgstr ""
"PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública General de GNU para "
"más detalles."
-#: ../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 "
@@ -2473,11 +2490,11 @@ msgstr ""
"con Gossip ; si no, escriba a la Free Software Foundation, Inc., 51 Franklin "
"Street, Fifth Floor, Boston, MA 02110-130159 EE. UU."
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "Un cliente de mensajería instantánea para GNOME"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2007-2010"
@@ -2652,7 +2669,7 @@ msgstr "Existen modificaciones sin guardar en su cuenta %s."
msgid "Your new account has not been saved yet."
msgstr "Aún no se ha guardado su cuenta nueva."
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
msgid "Connecting…"
msgstr "Conectando…"
@@ -2775,70 +2792,70 @@ msgstr "Gamma"
msgid "Volume"
msgstr "Volumen"
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-call-window.c:1166
msgid "_Sidebar"
msgstr "Barra _lateral"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1186
msgid "Audio input"
msgstr "Entrada de voz"
-#: ../src/empathy-call-window.c:1198
+#: ../src/empathy-call-window.c:1190
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-call-window.c:1202
+#: ../src/empathy-call-window.c:1194
msgid "Dialpad"
msgstr "Teclado de llamada"
-#: ../src/empathy-call-window.c:1207
+#: ../src/empathy-call-window.c:1199
msgid "Details"
msgstr "Detalles"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1275
+#: ../src/empathy-call-window.c:1266
#, c-format
msgid "Call with %s"
msgstr "Llamada con %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1354
+#: ../src/empathy-call-window.c:1345
msgid "Call"
msgstr "Llamar"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1499
msgid "The IP address as seen by the machine"
msgstr "La dirección IP como la ve la máquina"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1501
msgid "The IP address as seen by a server on the Internet"
msgstr "La dirección IP como la ve el servidor de Internet"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1503
msgid "The IP address of the peer as seen by the other side"
msgstr "La dirección IP del par como la ve la otra parte"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1505
msgid "The IP address of a relay server"
msgstr "La dirección IP de un servidor de desvío"
-#: ../src/empathy-call-window.c:1516
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the multicast group"
msgstr "La dirección IP del grupo multicast"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2263
+#: ../src/empathy-call-window.c:2254
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
-#: ../src/empathy-call-window.c:2324
+#: ../src/empathy-call-window.c:2315
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:2362
+#: ../src/empathy-call-window.c:2353
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2847,7 +2864,7 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2358
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2856,7 +2873,7 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:2373
+#: ../src/empathy-call-window.c:2364
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2865,25 +2882,25 @@ msgstr ""
"No se puede establecer una conexión con %s. Uno de los dos puede estar en "
"una red que no acepta conexiones directas."
-#: ../src/empathy-call-window.c:2379
+#: ../src/empathy-call-window.c:2370
msgid "There was a failure on the network"
msgstr "Hubo un fallo en la red"
-#: ../src/empathy-call-window.c:2383
+#: ../src/empathy-call-window.c:2374
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"No están instalados en su equipo los formatos de sonido necesarios para esta "
"llamada"
-#: ../src/empathy-call-window.c:2386
+#: ../src/empathy-call-window.c:2377
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"No están instalados en su equipo los formatos de vídeo necesarios para esta "
"llamada"
-#: ../src/empathy-call-window.c:2396
+#: ../src/empathy-call-window.c:2387
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2894,19 +2911,19 @@ msgstr ""
"\">Informe de este error</a> y añada los registros obtenidos de la ventana "
"de «Depuración» en el menú de Ayuda."
-#: ../src/empathy-call-window.c:2404
+#: ../src/empathy-call-window.c:2395
msgid "There was a failure in the call engine"
msgstr "Hubo un fallo en el motor de llamadas"
-#: ../src/empathy-call-window.c:2407
+#: ../src/empathy-call-window.c:2398
msgid "The end of the stream was reached"
msgstr "Se llegó al final del flujo"
-#: ../src/empathy-call-window.c:2447
+#: ../src/empathy-call-window.c:2438
msgid "Can't establish audio stream"
msgstr "No se puede establecer el flujo de voz"
-#: ../src/empathy-call-window.c:2457
+#: ../src/empathy-call-window.c:2448
msgid "Can't establish video stream"
msgstr "No se puede establecer el flujo de vídeo"
@@ -3354,43 +3371,43 @@ msgid "Import Accounts"
msgstr "Importar cuentas"
#. 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 "Origen"
#: ../src/empathy-main-window.c:383
msgid "No match found"
-msgstr "No se encontraró ninguna coincidencia"
+msgstr "No se encontró ninguna coincidencia"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:538
msgid "Reconnect"
msgstr "Reconectar"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:544
msgid "Edit Account"
msgstr "Editar cuenta"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:550
msgid "Close"
msgstr "Cerrar"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1232
msgid "Contact"
msgstr "Contacto"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1557
msgid "Contact List"
msgstr "Lista de contactos"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1666
msgid "Show and edit accounts"
msgstr "Mostrar y editar cuentas"
diff --git a/po/et.po b/po/et.po
index 32ed27465..2632a6c29 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,8 +11,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: 2010-09-22 00:00+0000\n"
-"PO-Revision-Date: 2010-09-22 11:05+0300\n"
+"POT-Creation-Date: 2010-10-16 10:46+0000\n"
+"PO-Revision-Date: 2010-10-17 15:05+0300\n"
"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
"Language-Team: Estonian <et@li.org>\n"
"Language: et\n"
@@ -97,9 +97,6 @@ msgstr "Empathy tohib kasutada võrku asukoha arvamiseks"
msgid "Empathy default download folder"
msgstr "Empathy vaikimisi allalaadimiste kataloog"
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathylt küsiti kontode importimise kohta"
-
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy on üle kandnud butterfly logid"
@@ -226,10 +223,6 @@ msgstr "Kas Empathy võib kasutada mobiilivõrku asukoha arvamiseks."
msgid "Whether Empathy can use the network to guess the location."
msgstr "Kas Empathy võib kasutada võrku asukoha arvamiseks."
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr ""
-"Kas Empathy on küsinud kontode importimise kohta teistest rakendustest."
-
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Kas Empathy on üle kandnud butterfly logid."
@@ -502,6 +495,9 @@ msgstr "Lähedalasuvad inimesed"
msgid "Yahoo! Japan"
msgstr "Jaapani Yahoo!"
+msgid "Google Talk"
+msgstr "Google Talk"
+
msgid "Facebook Chat"
msgstr "Facebooki vestlus"
@@ -743,7 +739,7 @@ msgstr ""
"See on sinu kasutajanimi, mitte tavaline Facebooki sisselogimise nimi.\n"
"Kui sinu leht on facebook.com/<b>hüüdnimi</b>, sisesta <b>hüüdnimi</b>.\n"
"Kui sul veel ei ole Facebooki kasutajanime, saad selle luua <a href=\"http://"
-"www.facebook.com/username/\">siin lehel</a>."
+"www.facebook.com/username/\">siin</a>."
msgid "Use old SS_L"
msgstr "Kasutatakse _vana SSL-i"
@@ -1305,6 +1301,7 @@ msgstr ""
msgid "_Add Group"
msgstr "_Lisa grupp"
+msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Vali"
@@ -1356,6 +1353,10 @@ msgstr "Uus võrk"
msgid "Choose an IRC network"
msgstr "Vali IRC võrk"
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Vali"
+
msgid "new server"
msgstr "uus server"
@@ -1473,6 +1474,14 @@ msgstr "Kohalolu ja praeguse oleku määramine"
msgid "Custom messages…"
msgstr "Muud teated…"
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#, c-format
+msgid "New %s account"
+msgstr "Uus %s konto"
+
msgid "Find:"
msgstr "Otsi:"
@@ -1536,38 +1545,39 @@ msgstr "Puhas"
msgid "Blue"
msgstr "Sinine"
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "Selle vestlusserveri identiteeti pole võimalik tõendada.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "Selle vestlusserveri identiteeti pole võimalik tõendada."
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "Sertifikaat ei ole sertifitseerija poolt allkirjastatud"
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "Sertifikaat ei ole sertifitseerija poolt allkirjastatud."
-msgid "The certificate has expired"
-msgstr "Sertifikaat on aegunud"
+msgid "The certificate has expired."
+msgstr "Sertifikaat on aegunud."
-msgid "The certificate hasn't yet been activated"
-msgstr "Sertifikaat pole aktiveeritud"
+msgid "The certificate hasn't yet been activated."
+msgstr "Sertifikaat pole aktiveeritud."
-msgid "The certificate does not have the expected fingerprint"
-msgstr "Sertifikaadil ei ole ootuspärane sõrmejälg"
+msgid "The certificate does not have the expected fingerprint."
+msgstr "Sertifikaadil ei ole ootuspärane sõrmejälg."
-msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr "Sertifikaadi tõendatud hostinimi ei klapi serveri nimega"
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "Sertifikaadi tõendatud hostinimi ei klapi serveri nimega."
-msgid "The certificate is self-signed"
-msgstr "Isetunnustatud sertifikaat"
+msgid "The certificate is self-signed."
+msgstr "Isetunnustatud sertifikaat."
-msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr "Sertifikaat on sertifitseerija poolt tühistatud"
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "Sertifikaat on sertifitseerija poolt tühistatud."
-msgid "The certificate is cryptographically weak"
-msgstr "Sertifikaati krüpto on nõrk"
+msgid "The certificate is cryptographically weak."
+msgstr "Sertifikaadi krüpto on nõrk."
-msgid "The certificate length exceeds verifiable limits"
-msgstr "Sertifikaadi pikkus ületab tõendatavad piirid"
+msgid "The certificate length exceeds verifiable limits."
+msgstr "Sertifikaadi pikkus ületab tõendatavad piirid."
-msgid "The certificate is malformed"
-msgstr "Sertifikaati on vigastatud"
+msgid "The certificate is malformed."
+msgstr "Sertifikaati on vigastatud."
#, c-format
msgid "Expected hostname: %s"
@@ -1704,6 +1714,20 @@ msgstr "Veateade puudub"
msgid "Instant Message (Empathy)"
msgstr "Välksõnum (Empathy)"
+msgid "Error contacting the Account Manager"
+msgstr "Viga kontohalduriga ühendumisel"
+
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"Telepathy kontohalduriga ühendumisel esines järgnev viga:\n"
+"\n"
+"%s"
+
msgid "Don't connect on startup"
msgstr "Käivitumisel ei ühenduta"
@@ -1779,15 +1803,6 @@ msgstr ""
msgid "An error occurred"
msgstr "Tekkis viga"
-#. To translator: %s is the protocol name
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#, c-format
-msgid "New %s account"
-msgstr "Uus %s konto"
-
msgid "What kind of chat account do you have?"
msgstr "Mis sorti konto sul on?"
@@ -2825,6 +2840,3 @@ msgstr "Empathy kontod"
msgid "Empathy Debugger"
msgstr "Empathy siluja"
-
-#~ msgid "Use _Yahoo! Japan"
-#~ msgstr "Jaapani _Yahoo! kasutamine"
diff --git a/po/gl.po b/po/gl.po
index cb4f611bf..5a7445915 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-21 10:04+0200\n"
-"PO-Revision-Date: 2010-09-21 10:04+0200\n"
+"POT-Creation-Date: 2010-10-11 10:30+0200\n"
+"PO-Revision-Date: 2010-10-11 10:33+0200\n"
"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
"Language-Team: Galician <gnome-gl-list@gnome.org>\n"
"Language: gl\n"
@@ -131,246 +131,234 @@ msgstr "Empathy pode usar a rede para adiviñar a localización"
msgid "Empathy default download folder"
msgstr "Cartafol de descargas predefinido do Empathy"
-# rever
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "O Empathy preguntou sobre a importación de contas"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy migrou os seus rexistros de butterfly"
# rever
-#: ../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 "O Empathy debería pórse automaticamente en ausente ao estar inactivo"
# rever
-#: ../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 "O Empathy debería conectarse automaticamente ao inicio"
# rever
-#: ../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 "O Empathy debería reducir a precisión da localización"
# rever
-#: ../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 ""
"O Empathy debería usar o avatar do contacto como a icona da xanela de "
"conversa"
-#: ../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 desenvolvedor WebKit"
# rever
-#: ../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 as notificacións emerxentes para as mensaxes novas"
# rever
-#: ../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 verificación ortográfica"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "Ocultar a xanela principal"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "Ocultar a xanela principal."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "Carácter de completado de alcume"
# rever
-#: ../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 as novas conversas en xanelas separadas"
-#: ../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 "Camiño do tema de Adium para usar"
# rever
-#: ../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 ""
"Camiño do tema de Adium para usar se o tema usado para o chat é de Adium."
# rever
-#: ../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 "Reproducir un son para as mensaxes entrantes"
# rever
-#: ../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 "Reproducir un son para as conversas novas"
# rever
-#: ../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 "Reproducir un son para as mensaxes saíntes"
# rever
-#: ../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 "Reproducir un son cando un contacto inicia unha sesión"
# rever
-#: ../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 "Reproducir un son cando un contacto saia da sesión"
# rever
-#: ../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 "Reproducir un son cando iniciamos a sesión"
# rever
-#: ../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 "Reproducir un son cando saímos da sesión"
# rever
-#: ../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 "Facer emerxer unha notificación cando a conversa non está enfocada"
# rever
-#: ../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 "Facer emerxer unha notificación cando un contacto entra"
# rever
-#: ../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 "Facer emerxer unha notificación cando un contacto sae"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "Mostrar os avatares"
# rever
-#: ../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 "Mostrar a lista de contactos nas salas"
# rever
-#: ../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 "Mostrar unha indicación sobre pechar a xanela principal"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "Mostrar os contactos desconectados"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "Mostrar os protocolos"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "Idiomas para a corrección ortográfica"
# rever
-#: ../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 "O cartafol predefinido en que gardar as transferencias de ficheiros."
# rever
-#: ../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 cartafol desde onde foi escollida unha imaxe 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 posición do panel lateral da xanela de conversa"
-#: ../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 posición almacenada (en píxeles) do panel lateral da xanela de conversa."
# rever
-#: ../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 usado para mostrar as conversa nas xanelas de conversa."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "Usar emoticonas gráficas"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "Usar sons de notificación"
# rever
-#: ../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 "Usar un tema para as salas de conversa"
# rever
-#: ../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 ""
"Indica se o Empathy pode ou non publicar a localización do usuario aos seus "
"contactos."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
msgstr ""
"Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar "
"a localización."
# rever
-#: ../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 ""
"Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr ""
-"Indica se o Empathy preguntou sobre a importación de contas doutros "
-"programas ou non."
-
-# rever
-#: ../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 "Indica se Empathy migrou os seus rexistros de butterfly."
# rever
-#: ../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 ""
"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente "
"ao inicio ou non."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h: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 ""
@@ -378,7 +366,7 @@ msgstr ""
"inactivo."
# rever
-#: ../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 ""
@@ -386,14 +374,14 @@ msgstr ""
"motivos de privacidade."
# rever
-#: ../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 ""
"Indica se o Empathy debería usar o avatar dos contactos como a icona da "
"xanela da conversa ou non."
-#: ../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 ""
@@ -401,7 +389,7 @@ msgstr ""
"deberían ser activadas."
# rever
-#: ../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."
@@ -410,7 +398,7 @@ msgstr ""
"desconectarse automaticamente ou non."
# rever
-#: ../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 ""
@@ -418,80 +406,80 @@ msgstr ""
"as quere verificar."
# rever
-#: ../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 ""
"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
# rever
-#: ../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 ""
"Indica se reproducir ou non un son para notificar que os contactos inician "
"unha sesión na rede."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h: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 ""
"Indica se reproducir ou non un son para notificar que os contactos terminan "
"unha sesión 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 "Indica se reproducir ou non un son para notificar os eventos."
# rever
-#: ../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 ""
"Indica se reproducir ou non un son para notificar as mensaxes entrantes."
# rever
-#: ../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 "Indica se reproducir ou non un son para notificar as conversas novas."
# rever
-#: ../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 "Indica se reproducir ou non un son para notificar as mensaxes saíntes."
# rever
-#: ../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 ""
"Indica se reproducir ou non un son cando se inicia unha sesión na rede."
# rever
-#: ../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 "Indica se reproducir ou non un son cando se sae da sesión na rede."
# rever
-#: ../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 ""
"Indica se reproducir ou non un son para notificar cando se está ocupado ou "
"ausente."
# rever
-#: ../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 ""
"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
"desconectado."
# rever
-#: ../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 ""
"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
"conectado."
# rever
-#: ../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."
@@ -500,14 +488,14 @@ msgstr ""
"mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
# rever
-#: ../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 ""
"Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
"mensaxe nova."
# rever
-#: ../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 ""
@@ -515,38 +503,38 @@ msgstr ""
"das xanelas de conversa."
# rever
-#: ../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 ""
"Indica se mostrar ou non os contactos que están desconectados na lista de "
"contactos."
# rever
-#: ../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 ""
"Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
"ou ocupado."
# rever
-#: ../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 ""
"Indica se mostrar ou non os protocolos para os contacto na lista de "
"contactos."
# rever
-#: ../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 "Indica se mostrar ou non a lista de contactos nas salas de chat."
# rever
-#: ../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 "Indica se mostrar ou non a lista de contactos no modo compacto."
# rever
-#: ../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."
@@ -555,12 +543,12 @@ msgstr ""
"principal co botón 'x' da barra de título."
# rever
-#: ../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 "Indica se usar ou non o tema para as salas de conversa."
# rever
-#: ../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 "
@@ -576,7 +564,7 @@ msgstr "Xestionar as contas de mensaxaría e VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2105
msgid "Messaging and VoIP Accounts"
msgstr "Contas de mensaxaría e VoIP"
@@ -654,9 +642,9 @@ msgstr "Invisíbel"
msgid "Offline"
msgstr "Desconectado"
-#: ../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:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Descoñecido"
@@ -791,17 +779,21 @@ msgstr ""
"criptografía."
# rever
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Persoas próximas"
# rever
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:548
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgstr "Chat de Facebook"
@@ -896,7 +888,7 @@ msgstr "Iniciar sesi_ón"
#. Account and Identifier
#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1399
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1469,7 +1461,7 @@ msgstr "descoñecido"
msgid "Error sending message '%s': %s"
msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
msgid "Topic:"
msgstr "Asunto:"
@@ -1494,7 +1486,7 @@ msgstr "Inserir unha emoticona"
#. send button
#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "_Enviar"
@@ -1564,31 +1556,31 @@ msgstr "%s uniuse á sala"
msgid "%s is now known as %s"
msgstr "%s agora é coñecido como %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2910
msgid "Wrong password; please try again:"
msgstr "O contrasinal é incorrecto, ténteo de novo:"
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:2911
msgid "Retry"
msgstr "Reintentar"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:2916
msgid "This room is protected by a password:"
msgstr "Esta sala está protexida por un contrasinal:"
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:2917
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3057
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-chat.c:3110
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Conversa"
@@ -1611,17 +1603,17 @@ msgstr "_Abrir a ligazón"
msgid "%A %B %d %Y"
msgstr "%A, %d de %B de %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Editar a información de contacto"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "Información persoal"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "Contacto novo"
@@ -1685,68 +1677,68 @@ msgid "_Add Contact…"
msgstr "Eng_adir un contacto..."
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../libempathy-gtk/empathy-individual-menu.c:516
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Conversa"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audiochamada"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videochamada"
# rever
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:644
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "Conversas _previas"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-individual-menu.c:685
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:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "Compartir o meu escritorio"
# rever
-#: ../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:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1290
msgid "Favorite"
msgstr "Favorito"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "Infor_mación"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:489
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:917
msgid "Inviting you to this room"
msgstr "Invítao a vostede a esta sala"
# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
msgid "_Invite to Chat Room"
msgstr "Conv_idar a sala de conversa"
@@ -1755,181 +1747,181 @@ msgstr "Conv_idar a sala de conversa"
msgid "Select a contact"
msgstr "Seleccione un contacto"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-individual-widget.c:147
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:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Phone number:"
msgstr "Número de teléfono:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "E-mail address:"
msgstr "Enderezo de correo electrónico:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "Website:"
msgstr "Sitio web:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Birthday:"
msgstr "Aniversario:"
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Country ISO Code:"
msgstr "Código ISO de país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:455
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:612
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "State:"
msgstr "Rexión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "City:"
msgstr "Cidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Area:"
msgstr "Área:"
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:463
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:620
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Street:"
msgstr "Rúa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Building:"
msgstr "Edificio:"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Floor:"
msgstr "_Andar:"
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Room:"
msgstr "Sala:"
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Description:"
msgstr "Descrición:"
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Accuracy Level:"
msgstr "Nivel de precisión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Error:"
msgstr "Erro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-individual-widget.c:483
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:640
+#: ../libempathy-gtk/empathy-individual-widget.c:485
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:642
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Speed:"
msgstr "Velocidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Bearing:"
msgstr "Orientación:"
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Climb Speed:"
msgstr "Velocidade de incremento:"
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Last Updated on:"
msgstr "Última actualización:"
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Longitude:"
msgstr "Lonxitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-individual-widget.c:499
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:717
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Localización"
#. 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:736
+#: ../libempathy-gtk/empathy-individual-widget.c:600
#, 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:788
+#: ../libempathy-gtk/empathy-individual-widget.c:649
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y de %R UTC"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-individual-widget.c:840
msgid "Save Avatar"
msgstr "Gardar o avatar"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Unable to save avatar"
msgstr "Non foi posíbel gardar o avatar"
@@ -1939,7 +1931,7 @@ msgstr "<b>Localización</b> o (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
msgid "Alias:"
msgstr "Alias:"
@@ -1961,7 +1953,7 @@ msgstr "Detalles do contacto"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1429
msgid "Identifier:"
msgstr "Identificador:"
@@ -1995,19 +1987,19 @@ msgstr ""
msgid "_Add Group"
msgstr "Eng_adir 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:1250
msgid "Group"
msgstr "Grupo"
# rever
#. 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 ligados"
@@ -2032,7 +2024,7 @@ msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
@@ -2040,12 +2032,12 @@ msgstr "_Editar"
# rever
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Ligar contactos..."
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -2064,6 +2056,11 @@ msgstr "Rede nova"
msgid "Choose an IRC network"
msgstr "Seleccione unha rede IRC"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Seleccionar"
+
# rever
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
@@ -2077,16 +2074,16 @@ 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 "Ligar contactos"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "_Desligar..."
-#: ../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."
msgstr ""
@@ -2096,16 +2093,16 @@ msgstr ""
#. 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 "_Ligar"
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "Desligar o meta-contacto «%s»?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
@@ -2113,7 +2110,7 @@ msgstr ""
"Está seguro que quere desligar este meta-contacto? Isto separará por "
"completo o meta-contacto nos contactos que contén."
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Desligar"
@@ -2128,10 +2125,12 @@ msgid "Conversations"
msgstr "Conversas"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Buscar seguinte"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Buscar anterior"
@@ -2219,15 +2218,25 @@ msgstr "Estabeleza a súa presenza e estado actual"
msgid "Custom messages…"
msgstr "Mensaxes personalizadas..."
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+# rever
+#. 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 "Conta nova de %s"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Buscar:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Coincidir maiúsculas e minúsculas"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Frase non encontrada"
@@ -2313,93 +2322,94 @@ msgid "Blue"
msgstr "Azul"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "A identidade fornecida polo servidor de chat non pode verificarse.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "A identidade fornecida polo servidor de chat non pode verificarse."
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "O certificado non está asinado por unha Autoridade Certificadora"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "O certificado non está asinado por unha Autoridade Certificadora."
# rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "O certificado caducou"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "O certificado caducou."
# rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "O certificado non está activado aínda"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "O certificado non está activado aínda."
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "O certificado non ten a pegada dixital esperada"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "O certificado non ten a pegada dixital 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 servidor verificado polo certificado non coincide co nome do "
-"servidor"
+"servidor."
# rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
msgstr "O certificado está autoasinado."
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr "O certificado foi revocado pola Autoridade Certificadora"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "O certificado foi revocado pola Autoridade Certificadora."
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "O certificado é cripotograficamente débil."
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "O certificado é criptograficamente débil."
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "A lonxitude do certificado excede os límites verificábeis"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "A lonxitude do certificado excede os límites verificábeis."
# rever
-#: ../libempathy-gtk/empathy-tls-dialog.c: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."
# rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "Nome do servidor esperado: %s"
# rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "Nome do servidor do certificado: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "Continuar"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "A conexión non confiábel. Desexa continuar de todas formas?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "Lembrar esta elección para futuras conexións"
# rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "Detalles do certificado"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "Non foi posíbel abrir o URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "Seleccione un ficheiro"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
msgid "Incoming file from %s"
msgstr "Ficheiro entrante de %s"
@@ -2605,7 +2615,7 @@ msgid "- Empathy IM Client"
msgstr "- Cliente de mensaxaría instantánea Empathy"
# rever
-#: ../src/empathy-about-dialog.c:85
+#: ../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 "
@@ -2618,7 +2628,7 @@ msgstr ""
"versión posterior."
# rever
-#: ../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 "
@@ -2630,7 +2640,7 @@ msgstr ""
"PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza pública xeral GNU."
# rever
-#: ../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 "
@@ -2641,11 +2651,11 @@ msgstr ""
"Street, Fifth Floor, Boston, MA 02110-130159 USA"
# rever
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "Un cliente de mensaxaría instantánea para o GNOME"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"Francisco Diéguez <frandieguez@ubuntu.com>, 2009, 2010.\n"
@@ -2688,48 +2698,37 @@ msgstr ""
"deste asistente e engadir as contas máis tarde desde o menú Editar."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "Produciuse un erro"
-# rever
-#. 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 "Conta nova de %s"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "Que clase de conta de chat ten?"
-#: ../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 "Ten algunha outra conta de chat que queira estabelecer?"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "Introduza os seus detalles de conta"
# rever
-#: ../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 clase de conta de chat quere crear?"
# rever
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "Quere crear outras contas de chat?"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "Introduza os detalles para a 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 "
@@ -2740,41 +2739,41 @@ msgstr ""
"usen Google Talk, AIM, Windows Live e calquera outro programa de chat. Cun "
"micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo."
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:629
msgid "Do you have an account you've been using with another chat program?"
msgstr "Ten algunha outra conta que estea usando con outro programa de chat?"
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "Si, importar os detalles da miña conta desde "
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "Si, introducirei os meus detalles de conta agora"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "Non, quero crear unha 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 "Non, só quero ver á xente conectada que estea próxima por agora"
-#: ../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 quere importar:"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:810
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Si"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "Non, isto é todo 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 "
@@ -2787,16 +2786,16 @@ msgstr ""
"detalles máis tarde ou desactivar esta característica usando o diálogo "
"\"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
+#: ../src/empathy-account-assistant.c:1104
msgid "I don't want to enable this feature for now"
msgstr "Non quero activar esta característica agora"
-#: ../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 "
@@ -2808,68 +2807,68 @@ msgstr ""
"Se quere activar esta característica, instale o paquete telepathy-salut e "
"cree unha conta de Xente próxima desde o diálogo Contas"
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut non está instalado"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Asistente de contas de mensaxaría e VoIP"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "Benvido/a ao Empathy"
# rever
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "_Importar as súas contas existentes"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgstr "Insira os detalles persoais"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "Hai modificacións sen gardar respecto da súa conta %s."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
msgstr "A súa nova conta aínda non foi gardada."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
msgid "Connecting…"
msgstr "Conectando..."
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline — %s"
msgstr "Desconectado — %s"
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
msgstr "Desconectado — %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
msgstr "Desconectado — Sen conexión de rede"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "Estado descoñecido"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline — Account Disabled"
msgstr "Desconectado — Conta desactivada"
# rever
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:759
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2878,17 +2877,17 @@ msgstr ""
"Está seguro de que quere proceder?"
# rever
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?"
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr "Isto non eliminará a súa conta no servidor."
# rever
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1348
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2897,7 +2896,7 @@ msgstr ""
"Está seguro de que quere proceder?"
# rever
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:1951
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2975,75 +2974,75 @@ msgstr "Gamma"
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1166
msgid "_Sidebar"
msgstr "Barra _lateral"
# rever
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1186
msgid "Audio input"
msgstr "Entrada de audio"
# rever
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1190
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1194
msgid "Dialpad"
msgstr "Marcador"
# rever
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1199
msgid "Details"
msgstr "Detalles do contacto"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-call-window.c:1266
#, c-format
msgid "Call with %s"
msgstr "Chamar con %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1352
+#: ../src/empathy-call-window.c:1345
msgid "Call"
msgstr "Chamar"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1499
msgid "The IP address as seen by the machine"
msgstr "O enderezo IP como é visto polo computador"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1501
msgid "The IP address as seen by a server on the Internet"
msgstr "O enderezo IP como é visto por un servidor na Internet"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1503
msgid "The IP address of the peer as seen by the other side"
msgstr "O enderezo IP do par como é visto pola outra parte"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1505
msgid "The IP address of a relay server"
msgstr "O enderezo IP dun servidor de desvío"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the multicast group"
msgstr "O enderezo IP do grupo multicast"
# rever
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2254
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
# rever
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2315
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2353
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3052,7 +3051,7 @@ msgstr ""
"O software de %s non entende algúns dos formatos de video admitidos polo seu "
"computador"
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2358
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3061,7 +3060,7 @@ msgstr ""
"O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
"computador"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2364
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3070,21 +3069,21 @@ msgstr ""
"Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
"que non permite conexións directas."
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-call-window.c:2370
msgid "There was a failure on the network"
msgstr "Produciuse un fallo na rede"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2374
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "Non ten instalados os formatos de audio necesarios neste computador"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2387
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3095,19 +3094,19 @@ msgstr ""
"href=«%s»>Informe de este erro</a> e anexe os rexistros que pode ollar na "
"xanela «Depurar» no menú Axuda."
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2395
msgid "There was a failure in the call engine"
msgstr "Produciuse un fallo ao chamar ao motor"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2398
msgid "The end of the stream was reached"
msgstr "Chegouse ao final do fluxo"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2438
msgid "Can't establish audio stream"
msgstr "Non é posíbel estabelecer un fluxo de audio"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2448
msgid "Can't establish video stream"
msgstr "Non é posíbel estabelecer un fluxo de vídeo"
@@ -3211,28 +3210,28 @@ msgstr "_Chamar"
msgid "_View"
msgstr "_Ver"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d non lido)"
msgstr[1] "%s (%d non lidos)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:478
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (e outro %u)"
msgstr[1] "%s (e outros %u)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:494
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d non lido de outros)"
msgstr[1] "%s (%d non lidos de outros)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:503
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -3240,7 +3239,7 @@ msgstr[0] "%s (%d non lido de todos)"
msgstr[1] "%s (%d non lidos de todos)"
# rever
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:709
msgid "Typing a message."
msgstr "Escribindo unha mensaxe."
@@ -3608,28 +3607,28 @@ msgstr "Orixe"
msgid "No match found"
msgstr "Non se encontrou ningunha coincidencia."
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:538
msgid "Reconnect"
msgstr "Reconectar"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:544
msgid "Edit Account"
msgstr "Editar a conta"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:550
msgid "Close"
msgstr "Pechar"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1232
msgid "Contact"
msgstr "Contacto"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1557
msgid "Contact List"
msgstr "Lista de contactos"
# rever
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1666
msgid "Show and edit accounts"
msgstr "Mostrar e editar contas"
@@ -4126,6 +4125,17 @@ msgid "Empathy Debugger"
msgstr "Depurador de Empathy"
# rever
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "O Empathy preguntou sobre a importación de contas"
+
+# rever
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr ""
+#~ "Indica se o Empathy preguntou sobre a importación de contas doutros "
+#~ "programas ou non."
+
+# rever
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "Usar o _Yahoo Japan"
diff --git a/po/he.po b/po/he.po
index 0f0f17c84..f0a6ab752 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-06 01:48+0200\n"
-"PO-Revision-Date: 2010-10-06 01:49+0200\n"
+"POT-Creation-Date: 2010-10-14 11:13+0200\n"
+"PO-Revision-Date: 2010-10-14 11:14+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -700,7 +700,7 @@ msgstr "הכול"
#: ../libempathy-gtk/empathy-account-widget.c:514
#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "חשבון"
@@ -1800,7 +1800,7 @@ msgid "Select"
msgstr "בחירה"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1247
+#: ../src/empathy-main-window.c:1250
msgid "Group"
msgstr "קבוצה"
@@ -2109,72 +2109,73 @@ msgid "Blue"
msgstr "כחול"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "הזהות שסופקה על ידי שרת הצ׳אט אינה ניתנת לאימות.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "הזהות שסופקה על ידי שרת הצ׳אט אינה ניתנת לאימות."
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "אישור אבטחה זה אינו חתום על ידי רשות אישורי אבטחה"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "אישור אבטחה זה אינו חתום על ידי רשות אישורי אבטחה."
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "אישור האבטחה פג"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "אישור האבטחה פג."
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "אישור האבטחה לא הופעל"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "אישור האבטחה לא הופעל."
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "לאישור האבטחה אין את טביעת האצבע המצופה"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "לאישור האבטחה אין את טביעת האצבע המצופה."
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr "שם המארח שצוין באישור האבטחה אינו תואם לשם השרת"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "שם המארח שצוין באישור האבטחה אינו תואם לשם השרת."
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
-msgstr "אישור האבטחה נחתם עצמאית"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "אישור האבטחה נחתם עצמאית."
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr "אישור האבטחה נשלל על ידי רשות אישורי האבטחה המנפיקה"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "אישור האבטחה נשלל על ידי רשות אישורי האבטחה המנפיקה."
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "אישור אבטחה זה חלש מבחינת הצפנה"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "אישור אבטחה זה חלש מבחינת הצפנה."
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "אורך אישור האבטחה חורג מהגבולות הניתנים לאימות"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "אורך אישור האבטחה חורג מהגבולות הניתנים לאימות."
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
-msgstr "אישור האבטחה פגום"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "אישור האבטחה פגום."
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "המארח הצפוי: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "מארח אישור האבטחה: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "המשך"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "חיבור זה אינו מהימן. האם ברצונך להמשיך בכל מקרה?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "יש לזכור בחירה זו עבור חיבורים עתידיים"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "פרטי התעודה"
@@ -3289,15 +3290,15 @@ msgid "Import Accounts"
msgstr "יבוא חשבונות"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "יבוא"
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "פרוטוקול"
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "מקור"
@@ -3305,27 +3306,27 @@ msgstr "מקור"
msgid "No match found"
msgstr "לא נמצאה התאמה"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:538
msgid "Reconnect"
msgstr "התחברות מחדש"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:544
msgid "Edit Account"
msgstr "עריכת חשבון"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:550
msgid "Close"
msgstr "סגירה"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1232
msgid "Contact"
msgstr "איש קשר"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1557
msgid "Contact List"
msgstr "רשימת אנשי קשר"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1666
msgid "Show and edit accounts"
msgstr "הצגה ועריכה של חשבונות"
diff --git a/po/ko.po b/po/ko.po
index 930e0169f..498afb09c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -18,9 +18,10 @@
# - busy -> 다른 용무 중
# - offline -> 연결 중지, 연결 중지 상태, 연결 끊기다
# - 기타 고유 명사 음역
-# - Adium -> 아디움 (OS X용 메신저)
+# - Adium -> 에이디엄 (OS X용 메신저)
# - Facebook -> 페이스북
# - Google -> 구글
+# - Google Talk -> 구글 토크
# - Jabber -> 재버
# - Yahoo! -> 야후!
# - Webkit -> 웹키트
@@ -30,353 +31,372 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-03-13 20:57+0900\n"
-"PO-Revision-Date: 2010-03-20 15:39+0900\n"
+"POT-Creation-Date: 2010-10-09 03:21+0900\n"
+"PO-Revision-Date: 2010-10-09 09:14+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
+"Language: Korean\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "구글 토크, 페이스북, MSN 및 기타 대화 서비스에서 대화"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
msgstr "엠퍼시"
-# IM은 메신저라고 번역
-#: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "엠퍼시 메신저 클라이언트"
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
+msgstr "엠퍼시 인터넷 메신저"
# IM은 메신저라고 번역
-#: ../data/empathy.desktop.in.in.h:3
+#: ../data/empathy.desktop.in.in.h:4
msgid "IM Client"
msgstr "메신저 클라이언트"
-#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "메시지를 보내고 받습니다"
-
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
msgstr "새로운 대화는 항상 별도의 대화 표시창에 엽니다."
-#: ../data/empathy.schemas.in.h:2
+#: ../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 키) 사용할 경우 대화명 뒤에 붙일 문자."
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr "대화 표시창 테마"
-#: ../data/empathy.schemas.in.h:4
+#: ../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, nl\")."
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
msgstr "간략한 연락처 목록"
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Connection managers should be used"
msgstr "연결 관리자를 사용합니다"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Contact list sort criterion"
msgstr "연락처 목록 정렬 기준"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "아바타 그림을 선택할 기본 디렉터리"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Disable popup notifications when away"
msgstr "자리 비움일 때 팝업 알림 사용하지 않기"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable sounds when away"
msgstr "자리 비움일 때 소리 사용하지 않기"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "상태 영역에 새로 들어온 이벤트 표시"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "상태 영역에 새로 들어온 이벤트를 표시합니다. 거짓이면 사용자에게 즉시 이벤트를 알립니다."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
msgstr "사용자의 위치를 공개할 수 있습니다"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
msgstr "GPS를 이용해 위치를 파악할 수 있습니다"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
msgstr "휴대전화 네트워크를 사용해 위치를 파악할 수 있습니다"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
msgstr "네트워크를 사용해 위치를 파악할 수 있습니다"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
msgstr "엠퍼시 기본 다운로드 폴더"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has asked about importing accounts"
msgstr "엠퍼시에서 계정을 가져올지 질문"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "엠퍼시에서 버터플라이 기록을 가져옴"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-away when idle"
+msgstr "엠퍼시에서 입력이 없으면 자리 비움"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "엠퍼시 시작할 때 자동 연결"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "위치를 부정확하게 만듭니다"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "엠퍼시 대화 표시창의 아이콘으로 연락처의 아바타 사용"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "웹키트 개발 도구 사용"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "새 메시지에 팝업 알림 사용"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "맞춤법 검사 사용"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "메인 창 감추기"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "메인 창을 감춥니다."
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4 계정을 가져옴"
-
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4 계정을 가져왔습니다."
-
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "대화명 완성 문자"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
msgstr "새로운 대화는 별도 창에 열기"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
-msgstr "사용할 아디움 테마의 경로"
+msgstr "사용할 에이디엄 테마의 경로"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "사용할 아디움 테마의 경로, 대화에 사용할 테마가 아디움일 경우."
+msgstr "사용할 에이디엄 테마의 경로, 대화에 사용할 테마가 아디움일 경우."
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "메시지를 받으면 소리 내기"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "새 대화 내용이 있으면 소리 내기"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "메시지를 보내면 소리 내기"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "연락처의 누군가가 로그인하면 소리 내기"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "연락처의 누군가가 로그아웃하면 소리 내기"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
msgstr "로그인하면 소리 내기"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
msgstr "로그아웃하면 소리 내기"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "대화에 포커스가 없으면 팝업 알림"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "연락처에 있는 사람이 들어오면 팝업 알림"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "연락처에 있는 사람이 나가면 팝업 알림"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
msgstr "아바타 표시"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show contact list in rooms"
msgstr "방에 연락처 목록 표시"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show hint about closing the main window"
msgstr "메인 창을 닫을 때 안내를 표시합니다."
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show offline contacts"
msgstr "연결 중지 상태 연락처 표시"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show protocols"
msgstr "프로토콜 표시"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Spell checking languages"
msgstr "맞춤법 검사 언어"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The default folder to save file transfers in."
msgstr "전송 받은 파일을 저장할 기본 폴더."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "최근에 아바타 그림을 선택한 디렉터리."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "대화 가장자리 창의 위치"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "대화 가장자리 창의 저장한 위치 (픽셀 단위)."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
msgstr "대화 표시창에서 대화 내용을 표시하는데 사용하는 테마."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use graphical smileys"
msgstr "그래픽 이모티콘 사용"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use notification sounds"
msgstr "알리는 소리 사용"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use theme for chat rooms"
msgstr "대화방에 테마 사용"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "사용자의 위치를 연락처에 있는 사람들에게 공개할지 여부."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "GPS를 이용해 위치를 파악할지 여부."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "휴대전화 네트워크를 이용해 위치를 파악할지 여부."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
msgstr "네트워크를 이용해 위치를 파악할지 여부."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "다른 프로그램에서 계정을 가져올지 물어봤는지 여부."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy has migrated butterfly logs."
msgstr "엠퍼시에서 버터플라이 기록을 가져왔는지 여부."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "엠퍼시가 시작할 때 계정에 자동 로그인할지 여부."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "사용자 입력이 없을 때 엠퍼시가 자리 비움 모드로 전환할지 여부."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "개인 정보 보호를 위해 위치를 부정확하게 만들지 여부."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "엠퍼시의 대화 표시창 아이콘으로 연락처의 아바타를 사용할지 여부."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "웹키트 개발 툴을 (Web Inspector 따위) 사용할지 여부."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "연결 관리자를 이용해 연결을 자동으로 끊고 다시 연결할 지 여부."
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "설정한 언어에 따라 입력하는 중에 단어의 맞춤법을 검사할지 여부."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "대화 내용에 있는 이모티콘을 그림으로 바꿔 표시할지 여부."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "연락처의 누군가가 네트워크에 로그인할 때 알림 소리를 낼지 여부."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "연락처의 누군가가 네트워크에서 로그아웃할 때 알림 소리를 낼지 여부."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of events."
msgstr "이벤트를 알릴 때 소리를 낼지 여부."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of incoming messages."
msgstr "메시지를 받으면 소리를 낼지 여부."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of new conversations."
msgstr "새 대화 내용이 있으면 소리를 낼지 여부."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "메시지를 보내면 소리를 낼지 여부."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound when logging into a network."
msgstr "네트워크에 로그인할 때 소리를 낼지 여부."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging out of a network."
msgstr "네트워크에서 로그아웃할 때 소리를 낼지 여부."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play sound notifications when away or busy."
msgstr "자리 비움이거나 다른 용무 중일 때 알림 소리를 낼지 여부."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "연락처의 사람이 연결이 끊어지면 팝업 알림 창을 표시할지 여부."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes online."
msgstr "연락처의 사람이 연결하면 팝업 알림 창을 표시할지 여부."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -384,47 +404,47 @@ msgstr ""
"대화를 열었지만 포커스가 없을 경우에도 새 메시지를 받았을 때 팝업 알림 창을 "
"표시할지 여부."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
msgstr "새 메시지를 받았을 때 팝업 알림 창을 표시할지 여부."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "연락처 목록과 대화 표시창에 연락처의 아바타를 표시할지 여부."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
msgstr "연락처 목록에 연결 중지 상태의 연락처를 표시할지 여부."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
msgstr "자리 비움이거나 다른 용무 중일 때 팝업 알림 창을 표시할지 여부."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
msgstr "연락처 목록에 연락처의 프로토콜을 표시할지 여부."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
msgstr "대화방에 연락처 목록을 표시할지 여부."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show the contact list in compact mode."
msgstr "연락처 목록을 간략하게 표시할지 여부."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr ""
"제목 표시줄의 'x' 단추로 메인 창을 닫을 때 알림 대화 창을 표시할지 여부."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "대화방에 테마를 사용할지 여부."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
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 "
@@ -439,149 +459,202 @@ msgstr "메신저 및 VoIP 계정 관리"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
-#: ../src/cc-empathy-accounts-panel.c:91
+#: ../src/empathy-accounts-dialog.c:2156
msgid "Messaging and VoIP Accounts"
msgstr "메신저 및 VoIP 계정"
-#: ../libempathy/empathy-ft-handler.c:842
+#: ../libempathy/empathy-ft-handler.c:851
msgid "The hash of the received file and the sent one do not match"
msgstr "받은 파일과 보낸 파일의 해시가 일치하지 않습니다"
-#: ../libempathy/empathy-ft-handler.c:1102
+#: ../libempathy/empathy-ft-handler.c:1111
msgid "File transfer not supported by remote contact"
msgstr "원격 상대 측에서 파일 전송을 지원하지 않습니다"
-#: ../libempathy/empathy-ft-handler.c:1160
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "선택한 파일은 일반 파일이 아닙니다"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "선택한 파일이 빈 파일입니다"
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
-msgid "People nearby"
-msgstr "주변 사람"
-
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:283
msgid "Socket type not supported"
msgstr "이 소켓 종류를 지원하지 않습니다"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:402
msgid "No reason was specified"
msgstr "이유를 지정하지 않았습니다"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:405
msgid "The change in state was requested"
msgstr "상태 바꾸기를 요청했습니다"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:408
msgid "You canceled the file transfer"
msgstr "파일 전송을 취소했습니다"
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:411
msgid "The other participant canceled the file transfer"
msgstr "상대가 파일 전송을 취소했습니다"
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:414
msgid "Error while trying to transfer the file"
msgstr "파일을 전송하는 중에 오류가 발생했습니다"
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:417
msgid "The other participant is unable to transfer the file"
msgstr "상대가 파일을 전송할 수 없습니다"
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "알 수 없는 이유"
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "대화 가능"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "다른 용무 중"
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "자리 비움"
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "상태 감춤"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "연결 중지"
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "이유를 지정하지 않았습니다"
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "상태가 연결 중지로 설정되었습니다"
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "네트워크 오류"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "인증 실패"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "암호화 오류"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "이름이 사용 중입니다"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "인증서가 없습니다"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "인증서를 신뢰할 수 없습니다"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "인증서가 만료되었습니다"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "인증서를 활성화하지 않았습니다"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "인증서 호스트 이름이 맞지 않습니다"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "인증서 핑거프린트가 맞지 않습니다"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "자기만 서명한 인증서입니다"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "인증서 오류"
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "암호화를 사용할 수 없습니다"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "인증서가 올바르지 않습니다"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr "연결이 거부되었습니다"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr "연결이 완료되지 않았습니다"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "연결이 끊어졌습니다"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr "이 리소스는 이미 서버와 연결되어 있습니다"
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "기존 연결이 같은 리소스를 사용해 새롭게 연결되었습니다"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr "서버에 해당 계정이 이미 있습니다"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr "서버가 사용량이 너무 많아 연결을 받아들일 수 없습니다"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr "인증서가 철회되었습니다"
+
+#: ../libempathy/empathy-utils.c:377
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "인증서가 안전하지 않은 암호화 알고리즘을 사용하거나 암호화가 취약합니다"
+
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr "서버 인증서의 길이 혹은 서버 인증서 체인의 단계가 암호화 라이브러리가 지정한 한계를 넘아갔습니다"
+
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "주변 사람"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "야후! 일본"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "페이스북 대화"
@@ -625,62 +698,92 @@ msgstr[0] "%d달 전"
msgid "in the future"
msgstr "미래"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "모두"
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "계정"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "암호"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "서버"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "포트"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "사용자 이름:"
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1521
+msgid "A_pply"
+msgstr "적용(_P)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "로그인(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "계정:"
-#: ../libempathy-gtk/empathy-account-widget.c:1553
-msgid "Enabled"
-msgstr "사용"
+#: ../libempathy-gtk/empathy-account-widget.c:1628
+msgid "_Enabled"
+msgstr "사용(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "서버에 이 계정이 이미 있습니다"
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "서버에 새 계정 만들기"
+#: ../libempathy-gtk/empathy-account-widget.c:1789
+msgid "Ca_ncel"
+msgstr "취소(_N)"
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s (서버 %2$s)"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2039
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "%s 계정"
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "새 계정"
@@ -702,11 +805,11 @@ msgstr "고급"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "암호(_W):"
@@ -725,18 +828,18 @@ msgstr "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:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "포트(_P):"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "서버(_S):"
@@ -747,7 +850,7 @@ msgid "<b>Example:</b> username"
msgstr "<b>예:</b> 사용자이름"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "로그인 아이디(_D):"
@@ -765,58 +868,54 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>예:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "문자 인코딩(_A):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "ICQ 사용자 번호(_U):"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
msgstr "ICQ 사용자 번호가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "ICQ 암호가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "문자 인코딩(_C):"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
-msgid "New Network"
-msgstr "새 네트워크"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
msgid "Auto"
msgstr "자동"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
msgid "TLS"
msgstr "TLS"
# keep alive mechanism, "등록" 따위로 번역하기는 부적절함
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:221
msgid "Register"
msgstr "Register"
# keep alive mechanism, "옵션" 따위로 번역하기는 부적절함
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:226
msgid "Options"
msgstr "Options"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
msgid "None"
msgstr "없음"
@@ -852,6 +951,14 @@ msgstr "실제 이름:"
msgid "Servers"
msgstr "서버"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "IRC 대화명이 무엇입니까?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "어느 IRC 네트워크입니까?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>예:</b> user@gmail.com"
@@ -860,19 +967,28 @@ msgstr "<b>예:</b> user@gmail.com"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>예:</b> user@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "암호화 필요(_Y) (TLS/SSL)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL 인증서 오류 무시(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Override server settings"
msgstr "서버 설정 무시"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
-msgstr "우선 순위(_O):"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr "우선 순위(_T):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "자원(_U):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -885,50 +1001,42 @@ msgstr ""
"사용자 이름이 없다면 <a href=\"http://www.facebook.com/username/\">이 페이지"
"</a>에서 페이스북 사용자 이름을 설정하십시오."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "과거 SSL 사용(_L)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
msgstr "페이스북 암호가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
msgstr "페이스북 사용자 이름이 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
msgstr "구글 아이디가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "구글 암호가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "재버 아이디가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "재버 암호가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
msgstr "희망하는 재버 아이디가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "희망하는 재버 암호가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "_Encryption required (TLS/SSL)"
-msgstr "암호화 필요(_E) (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Ignore SSL certificate errors"
-msgstr "SSL 인증서 오류 무시(_I)"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>예:</b> user@hotmail.com"
@@ -942,25 +1050,25 @@ msgid "What is your Windows Live password?"
msgstr "윈도우 라이브 암호가 무엇입니까?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "전자메일 주소(_E):"
+msgid "E-_mail address:"
+msgstr "전자메일 주소(_M):"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "대화명(_K):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "이름(_F):"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "재버 아이디(_J):"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "성(_L):"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "대화명(_N):"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "공개 이름(_P):"
@@ -983,204 +1091,155 @@ msgid "Discover the STUN server automatically"
msgstr "자동으로 STUN 서버 검색"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Hostname of the proxy for outbound requests."
-msgstr "외부로 연결하는 요청에 사용할 프록시의 호스트 이름."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "간격 (초 단위)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Keep-Alive Options"
msgstr "연결 유지 옵션"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid ""
-"Look up the DNS SRV record at the service's domain for the host name of a "
-"STUN server."
-msgstr ""
-"STUN 서버의 호스트 이름을 알아내는데 해당 서비스 도메인의 DNS SRV 레코드를 이"
-"용합니다."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Loose Routing"
msgstr "느슨한 라우팅"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Mechanism:"
msgstr "방식:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Miscellaneous Options"
msgstr "기타 옵션"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "NAT Traversal Options"
msgstr "NAT 통과 옵션"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port of the proxy for outbound requests."
-msgstr "외부로 연결하는 요청에 사용할 프록시의 포트."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
msgid "Port:"
msgstr "포트:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Proxy Options"
msgstr "프록시 옵션"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "STUN Server:"
msgstr "STUN 서버:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Server:"
msgstr "서버:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid ""
-"The username for SIP authentication, if different from the SIP URI\n"
-"username."
-msgstr "SIP 인증에 사용할 사용자 이름. SIP URI에 있는 사용자 이름과 다를 경우."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Transport:"
msgstr "전송 방법:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid ""
-"Update the registration binding if the external address for the client is "
-"discovered to be different from the local binding."
-msgstr ""
-"클라이언트의 외부 주소가 로컬 바인딩과 다른 경우에 레지스트레이션 바인딩을 업"
-"데이트합니다."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid ""
-"Use the loose routing behavior and the Route header as recommended in RFC "
-"3261."
-msgstr ""
-"RFC 3261에 추천된 방법대로 느슨한 라우팅 방법 및 Route 헤더를 사용합니다."
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "What is your SIP account password?"
msgstr "SIP 계정 암호가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP login ID?"
msgstr "SIP 로그인 아이디가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "_Username:"
msgstr "사용자 이름(_U):"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "야후! 일본 사용(_Y)"
+msgid "I_gnore conference and chat room invitations"
+msgstr "회의 및 대화방 초대 무시(_G)"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
msgstr "야후! 아이디가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "야후! 암호가 무엇입니까?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "야후! 아이디(_D):"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "회의 및 대화방 초대 무시(_I)"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "방 목록 로캘(_R):"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
msgid "Couldn't convert image"
msgstr "그림을 변환할 수 없습니다"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
msgid "None of the accepted image formats are supported on your system"
msgstr "허용하는 그림 형식 중에서 이 시스템에서 지원하는 형식이 없습니다"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
msgid "Select Your Avatar Image"
msgstr "아바타 그림 선택"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "No Image"
msgstr "그림 없음"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
msgid "Images"
msgstr "그림"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
msgid "All Files"
msgstr "모든 파일"
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:323
msgid "Click to enlarge"
msgstr "누르면 크게 봅니다"
-#: ../libempathy-gtk/empathy-chat.c:233
-msgid "Failed to reconnect this chat"
-msgstr "이 대화에 다시 연결하는데 실패했습니다"
-
-#: ../libempathy-gtk/empathy-chat.c:655
-msgid "Failed to join chat room"
-msgstr "대화방에 입장하는데 실패했습니다"
-
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "개인 대화를 시작하는데 실패했습니다"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "이 대화에서는 주제 설정을 지원하지 않습니다"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "주제를 바꿀 권한이 없습니다"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: 현재 대화의 모든 메시지를 지웁니다"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <주제>: 현재 대화의 주제를 설정합니다"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <대화방아이디>: 새 대화방에 입장합니다"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <대화방아이디>: 새 대화방에 참여합니다"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <연락처아이디> [<메시지>]: 개인 대화를 시작합니다"
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <연락처아이디> [<메시지>]: 개인 대화를 시작합니다"
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <대화명>: 서버에서 대화명을 바꿉니다"
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <메시지>: 현재 대화에서 ACTION 메시지를 보냅니다"
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:849
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1190,7 +1249,7 @@ msgstr ""
"지를 보낼 때 사용합니다. 예를 들어: \"/say /join 명령으로 대화방에 입장합니다"
"\""
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1198,80 +1257,84 @@ msgstr ""
"/help [<명령어>]: 명령어 목록을 표시합니다. <명령어>가 있으면 해당 명령어 사"
"용법을 표시합니다."
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "사용법: %s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "알 수 없는 명령어"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr "알 수 없는 명령어. 명령어 목록은 /help 명령에서 보십시오"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "연결 중지"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "연락처가 잘못되었습니다"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "권한이 없습니다"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "메시지가 너무 깁니다"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "구현하지 않았습니다"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "알 수 없음"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "메시지를 보내는데 오류, '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "주제:"
+
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "주제를 설정했습니다: %s"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "주제를 정하지 않았습니다"
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(제안 없음)"
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "이모티콘 입력"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "보내기(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "맞춤법 제안(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "최근 기록을 가져오는데 실패했습니다"
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "%s 님의 연결이 끊겼습니다"
@@ -1279,12 +1342,12 @@ msgstr "%s 님의 연결이 끊겼습니다"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1967
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 님이 %2$s 님에 의해 퇴장당했습니다."
-#: ../libempathy-gtk/empathy-chat.c:1970
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "%1$s 님이 퇴장당했습니다."
@@ -1292,17 +1355,17 @@ msgstr "%1$s 님이 퇴장당했습니다."
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1978
+#: ../libempathy-gtk/empathy-chat.c:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 님이 %2$s 님에 의해 입장 금지됐습니다"
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "%s 님이 입장 금지됐습니다"
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "%s 님이 방을 떠났습니다"
@@ -1312,81 +1375,79 @@ msgstr "%s 님이 방을 떠났습니다"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1994
+#: ../libempathy-gtk/empathy-chat.c:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "%s 님이 방에 들어왔습니다"
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "%s 님의 대화명은 이제부터 %s 입니다"
-#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
msgid "Disconnected"
msgstr "연결 끊김"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "암호가 틀렸습니다. 다시 시도해 보십시오:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "다시 시도"
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "이 방은 암호가 설정되어 있습니다:"
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "입장"
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "연결함"
-#: ../libempathy-gtk/empathy-chat.c:2901
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "대화"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:684
-msgid "Topic:"
-msgstr "주제:"
-
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:786
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
msgid "_Copy Link Address"
msgstr "링크 주소 복사(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:793
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
msgid "_Open Link"
msgstr "링크 열기(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
msgid "%A %B %d %Y"
msgstr "%Y년 %B %d일 %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "연락처 정보 편집"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "개인 정보"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "새 연락처"
@@ -1398,214 +1459,288 @@ msgstr "나중에 결정(_L)"
msgid "Subscription Request"
msgstr "가입 요청"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "그룹 없음"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "자주 연락하는 사람"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "정말로 '%s' 그룹을 지우시겠습니까?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "그룹 지우기"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../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
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "제거(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "정말로 '%s' 연락처를 지우시겠습니까?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "연락처를 지웁니다"
-#: ../libempathy-gtk/empathy-contact-menu.c:206
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "연락처 추가(_A)…"
-#: ../libempathy-gtk/empathy-contact-menu.c:233
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:516
+#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "대화(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "음성 호출(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "영상 호출(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:347
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:644
+#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "예전 대화(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:685
+msgid "Send File"
msgstr "파일 보내기"
-#: ../libempathy-gtk/empathy-contact-menu.c:392
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+msgid "Share My Desktop"
msgstr "내 데스크톱 공유"
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "즐겨 찾기"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "정보(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:508
+#: ../libempathy-gtk/empathy-contact-menu.c:489
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "편집(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:869
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "이 방에 초대"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
+msgid "_Invite to Chat Room"
msgstr "대화방에 초대(_I)"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "연락처 선택"
-#: ../libempathy-gtk/empathy-contact-widget.c:238
-msgid "Select"
-msgstr "선택"
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
+msgid "Full name:"
+msgstr "전체 이름:"
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1050
-msgid "Group"
-msgstr "그룹"
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "Phone number:"
+msgstr "전화번호:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "E-mail address:"
+msgstr "전자메일 주소:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+msgid "Website:"
+msgstr "웹사이트:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:230
+#: ../libempathy-gtk/empathy-individual-widget.c:152
+msgid "Birthday:"
+msgstr "생일:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "ISO 국가 코드:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "국가:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "지역:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "도시:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "구역:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "우편번호:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "길:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "건물:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "층수:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:627
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "방:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "간판:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:631
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "설명:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:633
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:635
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "정확도:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:637
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "오류:"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:639
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "수직 오차 (미터):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:641
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "수평 오차 (미터):"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:643
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "속도:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:645
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "관계:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:647
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "상승 속도:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "최근 업데이트 시각:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:651
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "경도:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "위도:"
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:655
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "고도:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "위치"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "<b>Location</b>, "
-msgstr "<b>위치</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:737
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%Y년 %B %e일 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:872
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "아바타 저장"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:928
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "아바타를 저장할 수 없습니다"
@@ -1613,52 +1748,50 @@ msgstr "아바타를 저장할 수 없습니다"
msgid "<b>Location</b> at (date)\t"
msgstr "<b>위치</b> (날짜별)\t"
+#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "별명:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "생일:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client Information"
msgstr "클라이언트 정보"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client:"
msgstr "클라이언트:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Contact Details"
msgstr "연락처 자세히"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr "전자메일 주소:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "전체 이름:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Groups"
-msgstr "그룹"
-
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "아이디:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
msgstr "요청한 정보…"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
msgstr "운영 체제:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "버전:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "그룹"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1666,56 +1799,154 @@ msgstr ""
"이 연락처가 나타날 그룹을 고르십시오. 여러 개의 그룹을 고를 수도 있고 그룹을 "
"고르지 않을 수도 있습니다."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
-msgid "Version:"
-msgstr "버전:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "웹사이트:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-groups-widget.c:363
msgid "_Add Group"
msgstr "그룹 추가(_A)"
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+msgid "Select"
+msgstr "선택"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1250
+msgid "Group"
+msgstr "그룹"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+msgid "Linked Contacts"
+msgstr "연결할 연락처"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "연결할 연락처 선택"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "새 연락처 미리 보기"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "왼쪽의 목록에서 선택한 연락처를 서로 연결합니다."
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:839
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "편집(_E)"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:865
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "연락처 연결(_L)…"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "%u개 연락처가 들어 있는 가상 연락처"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>위치</b> (날짜별)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "새 네트워크"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "IRC 네트워크 선택"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "새 서버"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "서버"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "포트"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:310
-msgid "Account"
-msgstr "계정"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
+msgid "Link Contacts"
+msgstr "연락처 연결"
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "연결 해제(_U)…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr "해당 가상 연락처를 그 안에 들어 있는 연락처 여러 개로 나눕니다."
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
+msgid "_Link"
+msgstr "연결(_L)"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "가상 연락처 '%s' 연결을 해제하시겠습니까?"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr "정말로 이 가상 연락처의 연결을 해제하시겠습니까? 그러면 내부에 들어 있는 연락처 여러 개로 나뉩니다."
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "연결 해제(_U)"
+
+#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "시각"
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Conversations"
msgstr "대화"
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "다음 찾기"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "이전 찾기"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Previous Conversations"
msgstr "예전 대화"
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
msgid "Search"
msgstr "검색"
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
msgstr "검색할 말(_F):"
@@ -1724,28 +1955,27 @@ msgid "Contact ID:"
msgstr "연락처 아이디:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
msgid "C_hat"
msgstr "대화(_H)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:154
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
msgid "New Conversation"
msgstr "새 대화"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
msgid "Send _Video"
msgstr "영상 보내기(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
-#: ../src/empathy-call-window.ui.h:17
-msgid "_Call"
-msgstr "호출(_C)"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
+msgstr "호출(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
msgid "New Call"
msgstr "새 호출"
@@ -1782,59 +2012,59 @@ msgid "Set your presence and current status"
msgstr "현재 상태를 설정합니다"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
msgid "Custom messages…"
msgstr "사용자 지정 메시지…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "찾기:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "대소문자 구별"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "찾지 못했습니다"
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
msgid "Received an instant message"
msgstr "인스턴스 메시지를 받았습니다"
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
msgid "Sent an instant message"
msgstr "인스턴스 메시지를 보냈습니다"
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
msgid "Incoming chat request"
msgstr "대화 요청 받았습니다"
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
msgid "Contact connected"
msgstr "연락처 연결했습니다"
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
msgid "Contact disconnected"
msgstr "연락처 연결 끊었습니다"
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
msgid "Connected to server"
msgstr "서버에 연결했습니다"
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
msgid "Disconnected from server"
msgstr "서버에서 연결을 끊었습니다"
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
msgid "Incoming voice call"
msgstr "음성 호출 받았습니다"
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
msgid "Outgoing voice call"
msgstr "음성 호출 보냈습니다"
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
msgid "Voice call ended"
msgstr "음성 통화를 마쳤습니다"
@@ -1870,17 +2100,88 @@ msgstr "깔끔"
msgid "Blue"
msgstr "파랑"
-#: ../libempathy-gtk/empathy-ui-utils.c:1501
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "채팅 서버에서 제공한 신원을 확인할 수 없습니다.\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "인증 기관이 서명하지 않은 인증서입니다"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "인증서가 만료되었습니다"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "인증서를 활성화하지 않았습니다"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "인증서에 필요한 핑거프린트가 없습니다"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr "인증서가 확인한 호스트 이름이 서버 이름과 맞지 않습니다."
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "자기만 서명한 인증서입니다"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr "인증서가 인증 기관에 의해 철회되었습니다"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "인증서의 암호화가 취약합니다"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "인증서의 길이가 확인할 수 있는 한계값을 넘어갑니다"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "인증서의 형식이 틀렸습니다"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "예상 호스트 이름: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "인증서 호스트 이름: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "계속"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "연결을 신뢰할 수 없습니다. 그래도 계속 하시겠습니까?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "앞으로 연결할 때 이렇게 선택"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "인증서 상세 정보"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "URI를 열 수 없습니다"
-#: ../libempathy-gtk/empathy-ui-utils.c:1618
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "파일을 선택하십시오"
-#: ../libempathy-gtk/empathy-ui-utils.c:1682
-msgid "Select a destination"
-msgstr "대상 선택"
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#, c-format
+msgid "Incoming file from %s"
+msgstr "%s에서 온 파일"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2065,16 +2366,16 @@ msgstr "오류 메시지 없음"
msgid "Instant Message (Empathy)"
msgstr "메신저 (엠퍼시)"
-#: ../src/empathy.c:596
+#: ../src/empathy.c:414
msgid "Don't connect on startup"
msgstr "시작할 때 연결하지 않습니다"
-#: ../src/empathy.c:600
+#: ../src/empathy.c:418
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "시작할 때 연락처 목록이나 기타 대화창을 표시하지 않습니다"
# IM은 메신저라고 번역
-#: ../src/empathy.c:612
+#: ../src/empathy.c:435
msgid "- Empathy IM Client"
msgstr "- 엠퍼시 메신저 클라이언트"
@@ -2118,7 +2419,7 @@ msgstr "그놈 인스턴스 메시지 클라이언트"
#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
-msgstr "류창우 <cwryu@debian.org>"
+msgstr "GNOME Korea <http://gnome.or.kr/>"
#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
@@ -2150,7 +2451,7 @@ msgstr ""
"중에 편집 메뉴에서 계정을 추가할 수도 있습니다."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1315
msgid "An error occurred"
msgstr "오류가 발생했습니다"
@@ -2159,37 +2460,37 @@ msgstr "오류가 발생했습니다"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
#, c-format
msgid "New %s account"
msgstr "새 %s 계정"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:514
msgid "What kind of chat account do you have?"
msgstr "어떤 종류의 대화 계정을 보유하고 있습니까?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:520
msgid "Do you have any other chat accounts you want to set up?"
msgstr "설정할 또 다른 대화 계정이 있습니까?"
# 도구 설명
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:526
msgid "Enter your account details"
msgstr "계정 정보를 편집합니다"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:531
msgid "What kind of chat account do you want to create?"
msgstr "어떤 종류의 대화 계정을 만드시겠습니까?"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:537
msgid "Do you want to create other chat accounts?"
msgstr "다른 대화 계정을 더 만드시겠습니까?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:544
msgid "Enter the details for the new account"
msgstr "새 계정의 정보를 입력하십시오"
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:659
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2200,41 +2501,41 @@ msgstr ""
"대화 프로그램을 사용하는 친구, 동료들과 대화할 수 있습니다. 마이크와 웹카메라"
"를 사용하면 음성 및 영상 통화도 할 수 있습니다."
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:676
msgid "Do you have an account you've been using with another chat program?"
msgstr "다른 대화 프로그램에서 사용하던 계정이 있습니까?"
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:699
msgid "Yes, import my account details from "
msgstr "예, 계정 정보를 다음에서 가져옵니다: "
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:720
msgid "Yes, I'll enter my account details now"
msgstr "예, 지금 계정 정보를 입력합니다"
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:742
msgid "No, I want a new account"
msgstr "아니오, 새 계정을 만듭니다"
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:752
msgid "No, I just want to see people online nearby for now"
msgstr "아니오, 현재 주위에 연결한 사람을 보고 싶습니다"
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:773
msgid "Select the accounts you want to import:"
msgstr "가져오려는 계정을 선택하십시오:"
-#: ../src/empathy-account-assistant.c:851
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-account-assistant.c:857
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "예"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:864
msgid "No, that's all for now"
msgstr "아니오, 지금은 됐습니다"
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1129
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2245,16 +2546,16 @@ msgstr ""
"사용하려면 먼저 아래 사항이 올바른지 확인하십시오. '계정' 대화창에서 이 설정"
"을 바꿀 수도 있고, 이 기능을 끌 수도 있습니다."
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
msgid "Edit->Accounts"
msgstr "편집->계정"
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1151
msgid "I don't want to enable this feature for now"
msgstr "이 기능 사용하지 않기"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1187
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2265,67 +2566,67 @@ msgstr ""
"수 없습니다. 이 기능을 사용하려면 telepathy-salut 패키지를 설치하고 '계정' 대"
"화창에서 '주변 사람\"을 만드십시오"
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1193
msgid "telepathy-salut not installed"
msgstr "telepathy-salut를 설치하지 않았습니다"
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1239
msgid "Messaging and VoIP Accounts Assistant"
msgstr "메신저 및 VoIP 계정 도우미"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1273
msgid "Welcome to Empathy"
msgstr "안녕하세요, 엠퍼시입니다"
# tooltip
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1282
msgid "Import your existing accounts"
msgstr "기존 계정을 가져옵니다"
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1300
msgid "Please enter personal details"
msgstr "개인 정보를 입력하십시오"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:66
+#: ../src/empathy-accounts-dialog.c:65
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "%s 계정에 저장하지 않은 수정 사항이 있습니다."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:70
+#: ../src/empathy-accounts-dialog.c:69
msgid "Your new account has not been saved yet."
msgstr "새로 만든 계정을 아직 저장하지 않았습니다."
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
msgstr "연결하는 중…"
-#: ../src/empathy-accounts-dialog.c:290
-#, c-format
-msgid "Disconnected — %s"
-msgstr "연결 끊김 — %s"
-
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
msgid "Offline — %s"
msgstr "연결 중지 상태 — %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:334
+#, c-format
+msgid "Disconnected — %s"
+msgstr "연결 끊김 — %s"
+
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline — No Network Connection"
msgstr "연결 중지 상태 — 네트워크 연결 없음"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "알 수 없는 상태"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline — Account Disabled"
msgstr "연결 중지 상태 — 계정 사용하지 않음"
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:810
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2333,16 +2634,16 @@ msgstr ""
"새 계정을 만드려 합니다. 그러면 바뀐 사항을 잃어버리게 됩니다. 정말 계속 하시"
"겠습니까?"
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1157
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "정말로 컴퓨터에서 %s 계정을 제거하시겠습니까?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1161
msgid "This will not remove your account on the server."
msgstr "서버의 계정은 제거하지 않습니다."
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1399
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2350,7 +2651,7 @@ msgstr ""
"다른 계정을 선택하려 합니다. 그러면 바뀐 사항을 잃어버리게 됩니다. 정말 계속 "
"하시겠습니까?"
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:2002
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2359,83 +2660,131 @@ msgstr ""
"니까?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "계정 정보를 읽어들이는 중입니다"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "프로토콜을 설치하지 않았습니다"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "프로토콜:"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr "새 계정을 만들면, 해당 프로토콜의 백엔드를 먼저 설치해야 합니다."
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
msgstr "추가(_A)…"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
msgstr "가져오기(_I)…"
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr " - 엠퍼시 인증 클라이언트"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "엠퍼시 인증 클라이언트"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "주변 사람"
+
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr "- 엠퍼시 음성/영상 클라이언트"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "엠퍼시 음성/영상 클라이언트"
+
+#: ../src/empathy-call-window.c:479
msgid "Contrast"
msgstr "대비"
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:482
msgid "Brightness"
msgstr "밝기"
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:485
msgid "Gamma"
msgstr "감마"
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:590
msgid "Volume"
msgstr "볼륨"
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1175
msgid "_Sidebar"
msgstr "가장자리 창(_S)"
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1194
msgid "Audio input"
msgstr "음성 입력"
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1198
msgid "Video input"
msgstr "영상 입력"
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1202
msgid "Dialpad"
msgstr "숫자판"
+#: ../src/empathy-call-window.c:1207
+msgid "Details"
+msgstr "자세히"
+
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1117
+#: ../src/empathy-call-window.c:1275
#, c-format
msgid "Call with %s"
msgstr "호출: %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1198
+#: ../src/empathy-call-window.c:1354
msgid "Call"
msgstr "호출"
+#: ../src/empathy-call-window.c:1508
+msgid "The IP address as seen by the machine"
+msgstr "컴퓨터에서 확인한 IP 주소"
+
+#: ../src/empathy-call-window.c:1510
+msgid "The IP address as seen by a server on the Internet"
+msgstr "인터넷 서버에서 확인한 IP 주소"
+
+#: ../src/empathy-call-window.c:1512
+msgid "The IP address of the peer as seen by the other side"
+msgstr "다른 상대편 컴퓨터에서 확인한 IP 주소"
+
+#: ../src/empathy-call-window.c:1514
+msgid "The IP address of a relay server"
+msgstr "중계 서버가 확인한 IP 주소"
+
+#: ../src/empathy-call-window.c:1516
+msgid "The IP address of the multicast group"
+msgstr "멀티캐스트 그룹의 IP 주소"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1695
+#: ../src/empathy-call-window.c:2263
#, c-format
msgid "Connected — %d:%02dm"
msgstr "연결 — %d:%02d"
-#: ../src/empathy-call-window.c:1756
+#: ../src/empathy-call-window.c:2324
msgid "Technical Details"
msgstr "기술 정보"
-#: ../src/empathy-call-window.c:1794
+#: ../src/empathy-call-window.c:2362
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2444,7 +2793,7 @@ msgstr ""
"이 컴퓨터에서 지원하는 음성 형식 중에서 %s 측의 소프트웨어에서 지원하지 않는 "
"음성 형식이 있습니다."
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:2367
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2453,7 +2802,7 @@ msgstr ""
"이 컴퓨터에서 지원하는 영상 형식 중에서 %s 측의 소프트웨어에서 지원하지 않는 "
"영상 형식이 있습니다."
-#: ../src/empathy-call-window.c:1805
+#: ../src/empathy-call-window.c:2373
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2462,23 +2811,23 @@ msgstr ""
"%s에 연결할 수 없습니다. 현재 직접 연결을 허용하지 않는 네트워크에 연결되어 "
"있을 수도 있습니다."
-#: ../src/empathy-call-window.c:1811
+#: ../src/empathy-call-window.c:2379
msgid "There was a failure on the network"
msgstr "네트워크 관련해 실패했습니다."
-#: ../src/empathy-call-window.c:1815
+#: ../src/empathy-call-window.c:2383
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"이 호출에 필요한 음성 형식을 지원하는 기능을 컴퓨터에 설치하지 않았습니다."
-#: ../src/empathy-call-window.c:1818
+#: ../src/empathy-call-window.c:2386
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"이 호출에 필요한 영상 형식을 지원하는 기능을 컴퓨터에 설치하지 않았습니다."
-#: ../src/empathy-call-window.c:1828
+#: ../src/empathy-call-window.c:2396
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2488,111 +2837,143 @@ msgstr ""
"텔레파시 컴포넌트에 예상치 못한 일이 발생했습니다. <a href=\"%s\">이 버그를 "
"보고해 주시고</a> 도움말 메뉴의 '디버깅' 창에 있는 기록을 첨부하십시오."
-#: ../src/empathy-call-window.c:1836
+#: ../src/empathy-call-window.c:2404
msgid "There was a failure in the call engine"
msgstr "호출 엔진에 실패가 발생했습니다"
-#: ../src/empathy-call-window.c:1875
+#: ../src/empathy-call-window.c:2407
+msgid "The end of the stream was reached"
+msgstr "스트림이 끝났습니다"
+
+#: ../src/empathy-call-window.c:2447
msgid "Can't establish audio stream"
msgstr "음성 스트림에 연결할 수 없습니다"
-#: ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:2457
msgid "Can't establish video stream"
msgstr "영상 스트림에 연결할 수 없습니다"
#: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "음성"
+
+#: ../src/empathy-call-window.ui.h:2
msgid "Call the contact again"
msgstr "이 연락처에 다시 호출"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:3
msgid "Camera Off"
msgstr "카메라 끄기"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
msgid "Camera On"
msgstr "카메라 켜기"
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "디코딩 코덱:"
+
+#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
msgstr "카메라를 사용하지 않고 영상 보내기를 중지합니다"
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:7
msgid "Enable camera and send video"
msgstr "카메라를 사용하고 영상을 보냅니다"
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:8
msgid "Enable camera but don't send video"
msgstr "카메라를 사용하지만 영상을 보내지 않습니다"
-#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "인코딩 코덱:"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
msgstr "끊기"
-#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-call-window.ui.h:11
msgid "Hang up current call"
msgstr "현재 호출을 끊습니다"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "로컬 후보:"
+
+#: ../src/empathy-call-window.ui.h:13
msgid "Preview"
msgstr "미리 보기"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:14
msgid "Redial"
msgstr "다시 걸기"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "원격 후보:"
+
+#: ../src/empathy-call-window.ui.h:16
msgid "Send Audio"
msgstr "음성 보내기"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "오디오 전송을 켜고 끕니다"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:19
msgid "V_ideo"
msgstr "영상(_I)"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "영상"
+
+#: ../src/empathy-call-window.ui.h:21
msgid "Video Off"
msgstr "영상 끄기"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:22
msgid "Video On"
msgstr "영상 켜기"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:23
msgid "Video Preview"
msgstr "영상 미리 보기"
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "호출(_C)"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "보기(_V)"
-#: ../src/empathy-chat-window.c:440 ../src/empathy-chat-window.c:460
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d개 읽지 않음)"
-#: ../src/empathy-chat-window.c:452
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (기타 %u개)"
-#: ../src/empathy-chat-window.c:468
+#: ../src/empathy-chat-window.c:480
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (다른 탭 %d개 읽지 않음)"
-#: ../src/empathy-chat-window.c:477
+#: ../src/empathy-chat-window.c:489
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (모두 %d개 읽지 않음)"
-#: ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:695
msgid "Typing a message."
msgstr "메시지를 입력하는 중입니다."
@@ -2624,55 +3005,63 @@ msgstr "탭 왼쪽으로 이동(_L)"
msgid "Move Tab _Right"
msgstr "탭 오른쪽으로 이동(_R)"
-#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "모든 메시지 알리기"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "차례(_C)"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "대화(_C)"
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
msgid "_Detach Tab"
msgstr "탭 떼어내기(_D)"
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "편집(_E)"
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "즐겨 찾는 대화방(_F)"
-#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "도움말(_H)"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "다음 탭(_N)"
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
msgid "_Previous Tab"
msgstr "이전 탭(_P)"
-#: ../src/empathy-chat-window.ui.h:16 ../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 "연락처 목록 표시(_S)"
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
msgstr "탭(_T)"
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "탭 닫기 실행 취소(_U)"
+
+#: ../src/empathy-chatrooms-window.c:241
msgid "Name"
msgstr "이름"
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
msgid "Room"
msgstr "방"
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
msgid "Auto-Connect"
msgstr "자동 연결"
@@ -2680,76 +3069,86 @@ msgstr "자동 연결"
msgid "Manage Favorite Rooms"
msgstr "즐겨 찾기 대화방 관리"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming video call"
msgstr "영상 호출 받음"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:468
msgid "Incoming call"
msgstr "호출 받음"
-#: ../src/empathy-event-manager.c:343
+#: ../src/empathy-event-manager.c:472
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s 님이 영상 호출하고 있습니다. 응답하시겠습니까?"
-#: ../src/empathy-event-manager.c:344
+#: ../src/empathy-event-manager.c:473
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 님이 호출하고 있습니다. 응답하시겠습니까?"
-#: ../src/empathy-event-manager.c:366
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s에서 온 호출"
+
+#: ../src/empathy-event-manager.c:501
msgid "_Reject"
msgstr "거부(_R)"
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:507
msgid "_Answer"
msgstr "응답(_A)"
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming video call from %s"
msgstr "%s에서 온 영상 호출"
-#: ../src/empathy-event-manager.c:489
-#, c-format
-msgid "Incoming call from %s"
-msgstr "%s에서 온 호출"
-
-#: ../src/empathy-event-manager.c:579
+#: ../src/empathy-event-manager.c:695
msgid "Room invitation"
msgstr "방 초대"
-#: ../src/empathy-event-manager.c:582
+#: ../src/empathy-event-manager.c:697
+#, c-format
+msgid "Invitation to join %s"
+msgstr "%s 방에 초대"
+
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 님이 %s 방에 초대합니다"
-#: ../src/empathy-event-manager.c:590
+#: ../src/empathy-event-manager.c:712
msgid "_Decline"
msgstr "거절(_D)"
-#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-event-manager.c:717
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "입장(_J)"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:743
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 님이 %s 방에 초대했습니다"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "%s 방에 초대 받았습니다"
+
+#: ../src/empathy-event-manager.c:797
#, c-format
msgid "Incoming file transfer from %s"
msgstr "파일 전송을 받았습니다 (%s에서)"
-#: ../src/empathy-event-manager.c:818
+#: ../src/empathy-event-manager.c:1005
#, c-format
msgid "Subscription requested by %s"
msgstr "%s 님이 가입 요청을 했습니다"
-#: ../src/empathy-event-manager.c:822
+#: ../src/empathy-event-manager.c:1009
#, c-format
msgid ""
"\n"
@@ -2758,118 +3157,116 @@ msgstr ""
"\n"
"메시지: %s"
-#. someone is logging off
-#: ../src/empathy-event-manager.c:862
+#: ../src/empathy-event-manager.c:1052
#, c-format
msgid "%s is now offline."
msgstr "%s 님이 연결 중지 상태입니다."
-#. someone is logging in
-#: ../src/empathy-event-manager.c:878
+#: ../src/empathy-event-manager.c:1072
#, c-format
msgid "%s is now online."
msgstr "%s 님이 연결되어 있습니다."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "알 수 없음"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s (전체 %s, 속도 %s/s)"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s"
msgstr "%s (전체 %s)"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "\"%s\" 파일 받는 중 (%s에서)"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "\"%s\" 파일 보내는 중 (%s에게)"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "\"%s\" 파일을 %s에서 받는 중 오류"
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
msgid "Error receiving a file"
msgstr "파일을 받는데 오류"
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "\"%s\" 파일을 %s에 보내는 중 오류"
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
msgid "Error sending a file"
msgstr "파일을 보내는데 오류"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
#, c-format
msgid "\"%s\" received from %s"
msgstr "\"%s\" 파일 받음 (%s에서)"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" 파일 보냄 (%s에게)"
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
msgid "File transfer completed"
msgstr "파일 전송 완료"
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../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:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "\"%s\" 파일이 올바른지 검사하는 중입니다"
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "\"%s\"의 해시를 구하는 중입니다"
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:996
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1008
msgid "File"
msgstr "파일"
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1030
msgid "Remaining"
msgstr "남음"
@@ -2892,161 +3289,160 @@ msgid "Import Accounts"
msgstr "계정 가져오기"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:292
msgid "Import"
msgstr "가져오기"
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:301
msgid "Protocol"
msgstr "프로토콜"
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:325
msgid "Source"
msgstr "소스"
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "%s 계정"
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "해당 사항이 없습니다"
-#: ../src/empathy-main-window.c:437
+#: ../src/empathy-main-window.c:538
msgid "Reconnect"
msgstr "다시 연결"
-#: ../src/empathy-main-window.c:443
+#: ../src/empathy-main-window.c:544
msgid "Edit Account"
msgstr "계정 편집"
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:550
msgid "Close"
msgstr "닫기"
-#: ../src/empathy-main-window.c:1033
+#: ../src/empathy-main-window.c:1232
msgid "Contact"
msgstr "연락처"
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1557
+msgid "Contact List"
+msgstr "연락처 목록"
+
+#: ../src/empathy-main-window.c:1666
msgid "Show and edit accounts"
msgstr "계정을 보고 편집합니다"
#: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "연락처 목록"
-
-#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
msgstr "지도 위에 연락처(_M)"
# 뭐지?
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
msgid "Context"
msgstr "컨텍스트"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
msgid "Join _Favorites"
msgstr "즐겨 찾기에 입장(_F)"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
msgid "Manage Favorites"
msgstr "즐겨 찾기 관리"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
msgid "N_ormal Size"
msgstr "보통 크기(_O)"
-#: ../src/empathy-main-window.ui.h:7 ../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 "새 호출(_C)…"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
msgstr "보통 크기, 아바타 포함(_A)"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
msgid "P_references"
msgstr "기본 설정(_R)"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
msgid "Show P_rotocols"
msgstr "프로토콜 표시(_R)"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
msgid "Sort by _Name"
msgstr "이름 순서로 정렬(_N)"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Status"
msgstr "상태 순서로 정렬(_S)"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
msgid "_Accounts"
msgstr "계정(_A)"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
msgid "_Compact Size"
msgstr "작은 크기(_C)"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
msgid "_Debug"
msgstr "디버깅(_D)"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
msgid "_File Transfers"
msgstr "파일 전송(_F)"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
msgid "_Join…"
msgstr "입장(_J)…"
-#: ../src/empathy-main-window.ui.h:23 ../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 "새 대화(_N)…"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
msgid "_Offline Contacts"
msgstr "연결 중지 상태 연락처(_O)"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
msgid "_Personal Information"
msgstr "개인 정보(_P)"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
msgid "_Room"
msgstr "방(_R)"
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "대화방"
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "구성원"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:539
+#: ../src/empathy-new-chatroom-dialog.c:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
+"%s\n"
"초대 필요: %s\n"
"암호 필요: %s\n"
"구성원: %s"
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "아니오"
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "방 목록을 시작할 수 없습니다"
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "방 목록을 중지할 수 없습니다"
@@ -3080,68 +3476,72 @@ msgid "_Room:"
msgstr "대화방(_R):"
# 상태 메시지
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:138
msgid "Message received"
msgstr "메시지 받음"
# 상태 메시지
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:139
msgid "Message sent"
msgstr "메시지 보냄"
# 상태 메시지
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:140
msgid "New conversation"
msgstr "새 대화"
# 상태 메시지
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:141
msgid "Contact goes online"
msgstr "연락처가 온라인"
# 상태 메시지
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:142
msgid "Contact goes offline"
msgstr "연락처가 연결 중지 상태"
# 상태 메시지
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:143
msgid "Account connected"
msgstr "계정 연결"
# 상태 메시지
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:144
msgid "Account disconnected"
msgstr "계정 연결 끊김"
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:445
msgid "Language"
msgstr "언어"
+#: ../src/empathy-preferences.c:882
+msgid "Preferences"
+msgstr "기본 설정"
+
#: ../src/empathy-preferences.ui.h:1
msgid "Appearance"
msgstr "모양"
#: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "시작할 때 자동으로 연결(_C)"
-
-#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "동작"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
msgid "Chat Th_eme:"
msgstr "대화 테마(_E):"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
msgid "Disable notifications when _away or busy"
msgstr "자리 비움이거나 다른 용무 중일 때 알리지 않기(_A)"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable sounds when _away or busy"
msgstr "자리 비움이거나 다른 용무 중일 때 소리 사용하지 않기(_A)"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "알림 영역에 새로 들어온 이벤트 표시"
+
#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "연락처의 사람이 연결하면 알리기"
@@ -3168,17 +3568,17 @@ msgid "Location sources:"
msgstr "위치 검색 방법:"
#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "대화 내용 기록"
+
+#: ../src/empathy-preferences.ui.h:15
msgid "Notifications"
msgstr "알림"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
msgid "Play sound for events"
msgstr "이벤트 소리 내기"
-#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "기본 설정"
-
#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "개인 정보"
@@ -3219,41 +3619,62 @@ msgid "Themes"
msgstr "테마"
#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr "시작할 때 자동으로 연결(_A)"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Cellphone"
msgstr "휴대전화(_C)"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable bubble notifications"
msgstr "풍선 알림 사용(_E)"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable sound notifications"
msgstr "사운드 알림 사용(_E)"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_Network (IP, Wi-Fi)"
msgstr "네트워크(_N) (IP, Wi-FI)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Open new chats in separate windows"
msgstr "새로운 대화는 별도 창에 열기(_O)"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Publish location to my contacts"
msgstr "위치를 연락처에 있는 사람들에게 공개(_P)"
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
msgid "_Reduce location accuracy"
msgstr "위치 부정확하게 만들기(_R)"
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:141
msgid "Respond"
msgstr "응답"
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "거부"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "응답"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "거절"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "허용"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "상태"
@@ -3262,67 +3683,67 @@ msgstr "상태"
msgid "_Quit"
msgstr "끝내기(_Q)"
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
msgid "Contact Map View"
msgstr "연락처 지도 보기"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1219
msgid "Save"
msgstr "저장"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
msgstr "디버깅 창"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1475
msgid "Pause"
msgstr "일시 중지"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1487
msgid "Level "
msgstr "단계 "
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1507
msgid "Debug"
msgstr "디버깅"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1513
msgid "Info"
msgstr "정보"
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "메시지"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1525
msgid "Warning"
msgstr "경고"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1531
msgid "Critical"
msgstr "치명적"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1537
msgid "Error"
msgstr "오류"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1556
msgid "Time"
msgstr "시각"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1559
msgid "Domain"
msgstr "범위"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1561
msgid "Category"
msgstr "분류"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1563
msgid "Level"
msgstr "단계"
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1600
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3337,32 +3758,107 @@ msgstr "참석자 초대"
msgid "Choose a contact to invite into the conversation:"
msgstr "대화에 초대할 연락처를 고르십시오:"
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "초대"
+
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"대화창을 표시하지 않고, 필요한 동작을 (예를 들어 가져오기) 한 다음 끝납니다"
-#: ../src/empathy-accounts.c:217
-msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr "salut 계정이 없으면 대화창을 표시하지 않습니다"
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "Salut이 아닌 계정이 있으면 대화창을 표시하지 않습니다"
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"최초에 주어진 계정을 선택합니다 (예, gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
msgid "<account-id>"
msgstr "<계정아이디>"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
msgid "- Empathy Accounts"
msgstr "- 엠퍼시 계정"
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
msgid "Empathy Accounts"
msgstr "엠퍼시 계정"
#: ../src/empathy-debugger.c:40
msgid "Empathy Debugger"
msgstr "엠퍼시 디버깅"
+
+#~ msgid "Send and receive messages"
+#~ msgstr "메시지를 보내고 받습니다"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "MC 4 계정을 가져옴"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4 계정을 가져왔습니다."
+
+#~ msgid "_Character set:"
+#~ msgstr "문자 인코딩(_C):"
+
+#~ msgid "Pri_ority:"
+#~ msgstr "우선 순위(_O):"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "전자메일 주소(_E):"
+
+#~ msgid "_Nickname:"
+#~ msgstr "대화명(_N):"
+
+#~ msgid "Hostname of the proxy for outbound requests."
+#~ msgstr "외부로 연결하는 요청에 사용할 프록시의 호스트 이름."
+
+#~ msgid ""
+#~ "Look up the DNS SRV record at the service's domain for the host name of a "
+#~ "STUN server."
+#~ msgstr ""
+#~ "STUN 서버의 호스트 이름을 알아내는데 해당 서비스 도메인의 DNS SRV 레코드"
+#~ "를 이용합니다."
+
+#~ msgid "Port of the proxy for outbound requests."
+#~ msgstr "외부로 연결하는 요청에 사용할 프록시의 포트."
+
+#~ msgid ""
+#~ "The username for SIP authentication, if different from the SIP URI\n"
+#~ "username."
+#~ msgstr ""
+#~ "SIP 인증에 사용할 사용자 이름. SIP URI에 있는 사용자 이름과 다를 경우."
+
+#~ msgid ""
+#~ "Update the registration binding if the external address for the client is "
+#~ "discovered to be different from the local binding."
+#~ msgstr ""
+#~ "클라이언트의 외부 주소가 로컬 바인딩과 다른 경우에 레지스트레이션 바인딩"
+#~ "을 업데이트합니다."
+
+#~ msgid ""
+#~ "Use the loose routing behavior and the Route header as recommended in RFC "
+#~ "3261."
+#~ msgstr ""
+#~ "RFC 3261에 추천된 방법대로 느슨한 라우팅 방법 및 Route 헤더를 사용합니다."
+
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "야후! 일본 사용(_Y)"
+
+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "이 대화에 다시 연결하는데 실패했습니다"
+
+#~ msgid "Failed to join chat room"
+#~ msgstr "대화방에 입장하는데 실패했습니다"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>위치</b>, "
+
+#~ msgid "Select a destination"
+#~ msgstr "대상 선택"
+
+#~ msgid "%s account"
+#~ msgstr "%s 계정"
diff --git a/po/nb.po b/po/nb.po
index cc2516ae1..dd1dfc529 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,10 @@
# Sigurd Gartmann <sigurdga@yahoo-inc.com>, 2005, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.31.x\n"
+"Project-Id-Version: empathy 2.91.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 12:19+0200\n"
-"PO-Revision-Date: 2010-09-25 12:20+0200\n"
+"POT-Creation-Date: 2010-10-16 12:28+0200\n"
+"PO-Revision-Date: 2010-10-16 12:46+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
"Language: no\n"
@@ -112,276 +112,268 @@ msgid "Empathy default download folder"
msgstr "Forvalgt nedlastingsmappe for Empathy"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy har spurt om import av kontoer"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy har migrert logger fra 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 skal sette bortestatus automatisk ved inaktivitet"
-#: ../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 skal koble til automatisk ved oppstart"
-#: ../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 skal redusere nøyaktighet for lokasjonen"
-#: ../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 skal bruke personbildet for kontakten som ikon for pratevinduet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
msgstr "Slå på utviklerverktøy for 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 "Aktiver varsling oppsprettmeldinger for nye meldinger"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
msgstr "Bruk stavekontroll"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "Skjul hovedvinduet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "Skjul hovedvinduet."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "Tegn for fullføring av kallenavn"
-#: ../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 "Åpne nye samtaler i egne vinduer"
-#: ../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 "Sti til Adium-tema som skal brukes"
-#: ../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 "Sti til Adium-tema skal brukes hvis tema for prat er 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 "Spill av lyd når meldinger kommer inn"
-#: ../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 "Spill av lyd ved nye samtaler"
-#: ../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 "Spill av lyd for utgående meldinger"
-#: ../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 "Spill av lyd når kontakter logger inn"
-#: ../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 "Spill av lyd når kontakter logger ut"
-#: ../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 "Spill av lyd når du logger inn"
-#: ../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 "Spill av lyd når du logger ut"
-#: ../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 "Vis varsling når prat ikke er fokusert"
-#: ../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 "Vis varsling når en kontakt logger inn"
-#: ../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 "Vis varsling når en kontakt logger ut"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "Vis personbilder"
-#: ../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 "Vis kontaktliste i rom"
-#: ../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 "Vis hint om lukking av hovedvinduet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "Vis frakoblede kontakter"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "Vis protokoller"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "Stavekontrollspråk"
-#: ../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 "Forvalgt mappe for lagring av filoverføringer."
-#: ../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 "Den forrige mappen et personbilde ble valgt fra."
-#: ../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 "Posisjon for pratevinduets sidelinje"
-#: ../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 "Lagret posisjon (i pikselr) for pratevinduets sideområde."
-#: ../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 "Temaet som brukes til å vise samtaler."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "Vis smilefjes grafisk"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "Bruk varslingslyder"
-#: ../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 "Bruk tema for samtalerom"
-#: ../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 "Om Empathy kan publisere brukers lokasjon til kontakter."
-#: ../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 "Om Empathy kan bruke GPS for å gjette lokasjon."
-#: ../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 "Om Empathy kan bruke mobilnettverk for å gjette lokasjon."
-#: ../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 "Om Empathy kan bruke nettverket for å gjette lokasjon."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Om Empathy har spurt om å importere kontoer fra andre programmer."
-
-#: ../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 "Om Empathy har migrert logger for 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 "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart."
-#: ../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 ""
"Om Empathy skal bytte til bortemodus automatisk hvis bruker ikke er aktiv."
-#: ../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 "Om Empathy skal redusere nøyaktighet for lokasjon av personvernhensyn."
-#: ../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 ""
"Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
-#: ../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 "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på."
-#: ../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."
msgstr "Om tilkoblingshåndterere skal brukes til å koble til/fra automatisk."
-#: ../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 "Om stavekontroll skal sjekke ord mot de språkene du ønsker å bruke."
-#: ../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 "Om smilefjes skal konverteres til grafiske bilder i samtaler."
-#: ../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 ""
"Om en lyd skal spilles av for å varsle om at kontakter logger inn på "
"nettverket."
-#: ../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 ""
"Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket."
-#: ../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 "Om lyder skal spilles av for å varsle om hendelser."
-#: ../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 "Om lyder skal spilles av for å varsle om innkommende meldinger."
-#: ../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 "Om lyder skal spilles av for å varsle om nye samtaler."
-#: ../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 "Om lyder skal spilles av for å varsle om utgående meldinger."
-#: ../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 "Om lyder skal spilles av når du logger inn på et nettverk."
-#: ../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 "Om lyder skal spilles av når du logger ut av et nettverk."
-#: ../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 "Om lyder skal spilles av når du er borte eller opptatt."
-#: ../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 "Om varsel skal vises når en kontakt kobler fra."
-#: ../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 "Om et varsel skal vises når en kontakt er kobler fra."
-#: ../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."
@@ -389,36 +381,36 @@ msgstr ""
"Om varsling skal vises når en melding mottas selv om pratevinduet er åpent "
"men ikke har fokus."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Om varsling skal vises når en ny melding mottas."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h: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 "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
-#: ../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 "Om kontakter som er frakoblet skal vises i kontaktlisten."
-#: ../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 "Om varsling skal vises når du er borte eller opptatt."
-#: ../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 "Om protokoller for kontakter skal vises i kontaktlisten."
-#: ../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 "Om kontaktlisten skal vises i praterom."
-#: ../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 "Om kontaktlisten skal vises i kompakt modus."
-#: ../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."
@@ -426,11 +418,11 @@ msgstr ""
"Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal "
"vises."
-#: ../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 "Om tema skal brukes for praterom eller ikke."
-#: ../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 "
@@ -446,7 +438,7 @@ msgstr "Håndter meldings- og VoIP-kontoer"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2105
msgid "Messaging and VoIP Accounts"
msgstr "Meldings- og VoIP-kontoer"
@@ -518,9 +510,9 @@ msgstr "Usynlig"
msgid "Offline"
msgstr "Frakoblet"
-#: ../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:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Ukjent"
@@ -636,16 +628,20 @@ msgstr ""
"Lengden på tjenersertifikatet eller dybden på sertifikatkjeden på tjeneren "
"oversteg grensen som settes av kryptografibiblioteket"
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Personer i nærheten"
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:548
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgstr "Facebook-prat"
@@ -699,67 +695,67 @@ msgstr "i fremtiden"
msgid "All"
msgstr "Alle"
-#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-account-widget.c:612
#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:613
msgid "Password"
msgstr "Passord"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:614
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Tjener"
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:615
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-account-widget.c:589
-#: ../libempathy-gtk/empathy-account-widget.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:687
+#: ../libempathy-gtk/empathy-account-widget.c:744
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1299
msgid "Username:"
msgstr "Brukernavn:"
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1634
msgid "A_pply"
msgstr "_Bruk"
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1664
msgid "L_og in"
msgstr "L_ogg inn"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1730
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1399
#: ../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 "Konto:"
-#: ../libempathy-gtk/empathy-account-widget.c:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1741
msgid "_Enabled"
msgstr "Slått _på"
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "This account already exists on the server"
msgstr "Denne kontoen eksisterer allerede på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1809
msgid "Create a new account on the server"
msgstr "Lag en ny konto på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:1902
msgid "Ca_ncel"
msgstr "A_vbryt"
@@ -768,19 +764,19 @@ msgstr "A_vbryt"
#. * 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:2190
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s av %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2216
#, c-format
msgid "%s Account"
msgstr "%s-konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2220
msgid "New account"
msgstr "Ny konto"
@@ -1292,7 +1288,7 @@ msgstr "ukjent"
msgid "Error sending message '%s': %s"
msgstr "Feil ved sending av melding «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
msgid "Topic:"
msgstr "Emne:"
@@ -1305,29 +1301,29 @@ msgstr "Emnet er satt til: %s"
msgid "No topic defined"
msgstr "Emne ikke definert"
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "(No Suggestions)"
msgstr "(Ingen forslag)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1875
msgid "Insert Smiley"
msgstr "Sett inn smilefjes"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-chat.c:1893
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "_Send"
-#: ../libempathy-gtk/empathy-chat.c:1881
+#: ../libempathy-gtk/empathy-chat.c:1927
msgid "_Spelling Suggestions"
msgstr "_Staveforslag"
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2004
msgid "Failed to retrieve recent logs"
msgstr "Klarte ikke å hente siste logger"
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2110
#, c-format
msgid "%s has disconnected"
msgstr "%s har koblet fra"
@@ -1335,12 +1331,12 @@ msgstr "%s har koblet fra"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2117
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s ble sparket av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2120
#, c-format
msgid "%s was kicked"
msgstr "%s ble sparket"
@@ -1348,17 +1344,17 @@ msgstr "%s ble sparket"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2128
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s ble bannlyst av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2131
#, c-format
msgid "%s was banned"
msgstr "%s ble bannlyst"
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2135
#, c-format
msgid "%s has left the room"
msgstr "%s har forlatt rommet"
@@ -1368,46 +1364,46 @@ msgstr "%s har forlatt rommet"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2144
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%s has joined the room"
msgstr "%s har blitt med i rommet"
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2194
#, c-format
msgid "%s is now known as %s"
msgstr "%s er nå kjent som %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2333 ../src/empathy-call-window.c:1938
msgid "Disconnected"
msgstr "Koblet fra"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2956
msgid "Wrong password; please try again:"
msgstr "Feil passord; vennligst prøv igjen:"
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:2957
msgid "Retry"
msgstr "Prøv igjen"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:2962
msgid "This room is protected by a password:"
msgstr "Dette rommet er beskyttet med et passord:"
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:2963
msgid "Join"
msgstr "Bli med"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3103
msgid "Connected"
msgstr "Koblet til"
-#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-chat.c:3156
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Samtale"
@@ -1430,17 +1426,17 @@ msgstr "_Åpne lenke"
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Endre kontaktinformasjon"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "Personlig informasjon"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:110
msgid "New Contact"
msgstr "Ny kontakt"
@@ -1461,33 +1457,33 @@ msgid "Favorite People"
msgstr "Favorittpersoner"
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-individual-view.c:2209
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Vil du virkelig fjerne gruppen «%s»?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-individual-view.c:2212
msgid "Removing group"
msgstr "Fjerner gruppe"
#. 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-individual-view.c:2266
+#: ../libempathy-gtk/empathy-individual-view.c:2380
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "Fje_rn"
#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-individual-view.c:2297
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Vil du virkelig fjerne kontakten «%s»?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-individual-view.c:2299
msgid "Removing contact"
msgstr "Fjerner kontakt"
@@ -1497,64 +1493,64 @@ msgid "_Add Contact…"
msgstr "_Legg til kontakt..."
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../libempathy-gtk/empathy-individual-menu.c:516
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Prat"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Lydsamtale"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videosamtale"
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:644
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "_Tidligere samtaler"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "Send fil"
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "Del mitt skrivebord"
-#: ../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:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1290
msgid "Favorite"
msgstr "Favoritt"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "Infor_masjon"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:489
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "R_ediger"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:917
msgid "Inviting you to this room"
msgstr "Inviterer deg til dette rommet"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr "_Inviter til praterom"
@@ -1562,178 +1558,178 @@ msgstr "_Inviter til praterom"
msgid "Select a contact"
msgstr "Velg en kontakt"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-individual-widget.c:147
msgid "Full name:"
msgstr "Fullt navn:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Phone number:"
msgstr "Telefonnummer:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "E-mail address:"
msgstr "E-postadresse:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "Website:"
msgstr "Nettsted:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Birthday:"
msgstr "Fødselsdag:"
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Country ISO Code:"
msgstr "ISO-kode for land:"
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Country:"
msgstr "Land:"
-#: ../libempathy-gtk/empathy-contact-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "State:"
msgstr "Tilstand:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "City:"
msgstr "By:"
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Area:"
msgstr "Område:"
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Postal Code:"
msgstr "Postkode:"
-#: ../libempathy-gtk/empathy-contact-widget.c:590
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Street:"
msgstr "Gate:"
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Building:"
msgstr "Bygning:"
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Floor:"
msgstr "Etasje:"
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Room:"
msgstr "Rom:"
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Text:"
msgstr "Tekst:"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Description:"
msgstr "Beskrivelse:"
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Accuracy Level:"
msgstr "Nøyaktighetsnivå:"
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Error:"
msgstr "Feil:"
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Vertical Error (meters):"
msgstr "Vertikal feil (meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:640
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Horizontal Error (meters):"
msgstr "Horisontal feil (meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:642
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Speed:"
msgstr "Hastighet:"
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Bearing:"
msgstr "Retning:"
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Climb Speed:"
msgstr "Klatrehastighet:"
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Last Updated on:"
msgstr "Sist oppdatert:"
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Longitude:"
msgstr "Lengdegrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Latitude:"
msgstr "Breddegrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Altitude:"
msgstr "Høyde:"
-#: ../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:717
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Sted"
#. 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:736
+#: ../libempathy-gtk/empathy-individual-widget.c:600
#, 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:788
+#: ../libempathy-gtk/empathy-individual-widget.c:649
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y, %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-individual-widget.c:840
msgid "Save Avatar"
msgstr "Lagre personbilder"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Unable to save avatar"
msgstr "Kan ikke lagre personbilde"
@@ -1743,7 +1739,7 @@ msgstr "<b>Lokasjon</b> (dato)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
msgid "Alias:"
msgstr "Alias:"
@@ -1763,7 +1759,7 @@ msgstr "Kontaktdetaljer"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1429
msgid "Identifier:"
msgstr "Identifikator:"
@@ -1796,18 +1792,18 @@ msgstr ""
msgid "_Add Group"
msgstr "_Legg til gruppe"
-#: ../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 "Velg"
-#: ../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:1252
msgid "Group"
msgstr "Gruppe"
#. 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 "Koblede kontakter"
@@ -1831,19 +1827,19 @@ msgstr "Kontakter som velges i listen til venstre vil bli koblet sammen."
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:836
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "R_ediger"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "Koble kontakter …"
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1862,6 +1858,11 @@ msgstr "Nytt nettverk"
msgid "Choose an IRC network"
msgstr "Velg et IRC-nettverk"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Velg"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "ny tjener"
@@ -1873,16 +1874,16 @@ 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 "Koble kontakter"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "_Fjern kobling …"
-#: ../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."
msgstr "Del opp vist metakontakt i kontaktene den inneholder."
@@ -1891,22 +1892,24 @@ msgstr "Del opp vist metakontakt i kontaktene den inneholder."
#. 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 "_Koble"
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "Fjern kobling for metakontakt «%s»?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
-msgstr "Er du sikker på at du vil fjerne kobling for denne metakontakten? Dette vil dele metakontakten opp i kontaktene den inneholder."
+msgstr ""
+"Er du sikker på at du vil fjerne kobling for denne metakontakten? Dette vil "
+"dele metakontakten opp i kontaktene den inneholder."
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Fjern kobling"
@@ -2010,6 +2013,15 @@ msgstr "Sett din tilstedeværelse og aktiv status"
msgid "Custom messages…"
msgstr "Egendefinerte meldinger …"
+#. 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 "Ny %s-konto"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Finn:"
@@ -2095,86 +2107,85 @@ msgid "Blue"
msgstr "Blå"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "Identiteten som ble oppgitt av pratetjeneren kan ikke verifiseres.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "Identiteten som ble oppgitt av pratetjeneren kan ikke verifiseres."
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "Sertifikatet er ikke signert av en sertifikatmyndighet"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "Sertifikatet er ikke signert av en sertifikatmyndighet."
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "Sertifikatet har utløpt"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "Sertifikatet er utløpt."
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "Sertifikatet er ikke aktivert"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "Sertifikatet er ikke aktivert ennå."
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "Sertifikatet har ikke forventet fingeravtrykk"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "Sertifikatet har ikke forventet fingeravtrykk."
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr ""
-"Vertsnavn verifisert av sertifikatet er ikke det samme som navn på tjener"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "Vertsnavn verifisert av sertifikatet er ikke det samme som navn på tjener."
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
-msgstr "Sertifikatet er selvsignert"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "Sertifikatet er selvsignert."
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr ""
-"Sertifikatet har blitt trukket tilbake av utstedende sertifikatmyndighet"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "Sertifikatet har blitt trukket tilbake av utstedende sertifikatmyndighet."
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "Sertifikatet er kryptografisk svakt"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "Sertifikatet er kryptografisk svakt."
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "Sertifikatets lengde overstiger verifiserbare grenser"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "Sertifikatets lengde overstiger verifiserbare grenser."
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
-msgstr "Sertifikatet ikke feilutformet"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "Sertifikatet ikke feilutformet."
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "Forventet vertsnavn: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "Vertsnavn i sertifikat: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "Fortsett"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "Denne tilkoblingen er ikke tiltrodd. Vil du fortsette likevel?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "Husk dette valget for fremtidige tilkoblinger"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "Sertifikatdetaljer"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "Kan ikke åpne URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "Velg en fil"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
msgid "Incoming file from %s"
msgstr "Innkommende fil fra %s"
@@ -2362,19 +2373,35 @@ msgstr "Ingen feilmelding"
msgid "Instant Message (Empathy)"
msgstr "Lynmelding (Empathy)"
-#: ../src/empathy.c:414
+#: ../src/empathy.c:268
+msgid "Error contacting the Account Manager"
+msgstr "Feil ved forsøk på å kontakte kontohåndtering"
+
+#: ../src/empathy.c:270
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"Det oppsto en feil under tilkobling til kontohåndtering for Telepathy. Feilen var:\n"
+"\n"
+"%s"
+
+#: ../src/empathy.c:428
msgid "Don't connect on startup"
msgstr "Ikke koble til ved oppstart"
-#: ../src/empathy.c:418
+#: ../src/empathy.c:432
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:449
msgid "- Empathy IM Client"
msgstr "- Empathy lynmeldingsprogram"
-#: ../src/empathy-about-dialog.c:85
+#: ../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 "
@@ -2386,7 +2413,7 @@ msgstr ""
"Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) "
"enhver senere versjon."
-#: ../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 "
@@ -2397,7 +2424,7 @@ msgstr ""
"GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET "
"BESTEMT FORMÅL. Se GNU General Public License for detaljer."
-#: ../src/empathy-about-dialog.c: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 "
@@ -2407,11 +2434,11 @@ msgstr ""
"Hvis ikke så skriv til Free Software Foundation, Inc., 51 Franklin Street, "
"Fifth Floor, Boston, MA 02110-1301159, USA."
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "En meldingsklient for GNOME"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"Kjartan Maraas\n"
@@ -2448,45 +2475,35 @@ msgstr ""
"avslutte assistenten og legge til kontoer senere fra Rediger-menyen."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "En feil oppsto"
-#. 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 "Ny %s-konto"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "Hvilken type konto har du?"
-#: ../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 "Har du noen andre lynmeldingskontoer du vil sette opp?"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "Oppgi detaljer for konto"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr "Hvilken type lynmeldingskonto vil du lage?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "Vil du lage flere lynmeldingskontoer?"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "Oppgi detaljer for den nye kontoen"
-#: ../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 "
@@ -2498,41 +2515,41 @@ msgstr ""
"prateprogrammer. Hvis du har en mikrofon eller et nettkamera kan du også ha "
"lyd- og bildesamtaler."
-#: ../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 "Har du en konto som du har brukt med et annet lynmeldingsprogram?"
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "Ja, importer mine kontodetaljer fra "
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "Ja, jeg vil skrive inn mine kontodetaljer nå"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "Nei, jeg vil ha en ny konto"
-#: ../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 "Nei, jeg vil bare se personer i nærheten foreløpig"
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "Velg kontoer du vil importere:"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:810
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Ja"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "Nei, det var alt for nå"
-#: ../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 "
@@ -2544,16 +2561,16 @@ msgstr ""
"under er riktige. Du kan lett endre disse detaljene senere eller slå av "
"funksjonen i «Konto»-dialogen"
-#: ../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 "Rediger->Kontoer"
-#: ../src/empathy-account-assistant.c:1152
+#: ../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å"
-#: ../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 "
@@ -2565,66 +2582,66 @@ msgstr ""
"funksjonen må du installere pakken telepathy-salut og opprette en «Folk i "
"nærheten»-konto i Konto-dialogen"
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut er ikke installert"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Assistent for meldings- og VoIP-kontoer"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "Velkommen til Empathy"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "Importer dine eksisterende kontoer"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgstr "Vennligst oppgi personlige detaljer"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
msgstr "Din nye konto er ikke lagret ennå."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
msgid "Connecting…"
msgstr "Kobler til..."
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline — %s"
msgstr "Frakoblet - %s"
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
msgstr "Koblet fra - %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
msgstr "Frakoblet - Ingen nettverkstilkobling"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "Ukjent status"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline — Account Disabled"
msgstr "Frakoblet - Konto deaktivert"
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:759
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2632,16 +2649,16 @@ msgstr ""
"Du er i ferd med å lage en ny konto hvilket vil forkaste\n"
"dine endringer. Er du sikker på at du vil fortsette?"
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Vil du fjerne %s fra din datamaskin?"
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr "Dette vil ikke fjerne din konto på tjeneren."
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1348
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2649,7 +2666,7 @@ msgstr ""
"Du er i ferd med å velge en annen konto hvilket vil forkaste\n"
"dine endringer. Er du sikker på at du vil fortsette?"
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:1951
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2721,70 +2738,70 @@ msgstr "Gamma"
msgid "Volume"
msgstr "Volum"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1166
msgid "_Sidebar"
msgstr "_Sidelinje"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1186
msgid "Audio input"
msgstr "Lydinngang"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1190
msgid "Video input"
msgstr "Videoinngang"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1194
msgid "Dialpad"
msgstr "Nummertavle"
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1199
msgid "Details"
msgstr "Detaljer"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-call-window.c:1266
#, c-format
msgid "Call with %s"
msgstr "Samtale med %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1352
+#: ../src/empathy-call-window.c:1345
msgid "Call"
msgstr "Ring"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1499
msgid "The IP address as seen by the machine"
msgstr "IP-adresse som sett av maskinen"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1501
msgid "The IP address as seen by a server on the Internet"
msgstr "IP-adresse som sett av en tjener på internett"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1503
msgid "The IP address of the peer as seen by the other side"
msgstr "IP-adresse for peer som sett av andre siden"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1505
msgid "The IP address of a relay server"
msgstr "IP-adresse for en relay-tjener"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the multicast group"
msgstr "IP-adresse for multicast-gruppe"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2254
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Koblet til - %d:%02dm"
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2315
msgid "Technical Details"
msgstr "Tekniske detaljer"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2353
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2793,7 +2810,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2358
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2802,7 +2819,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2364
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2811,25 +2828,25 @@ msgstr ""
"Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
"ikke tillater direkte tilkoblinger."
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-call-window.c:2370
msgid "There was a failure on the network"
msgstr "Det oppsto en feil på nettverket"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2374
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Lydformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Videoformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2387
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2840,19 +2857,19 @@ msgstr ""
"\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
"«Feilsøking»-vinduet i Hjelp-menyen."
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2395
msgid "There was a failure in the call engine"
msgstr "Det oppsto en feil i samtalemotoren"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2398
msgid "The end of the stream was reached"
msgstr "Slutt på strømmen ble nådd"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2438
msgid "Can't establish audio stream"
msgstr "Kan ikke etablere lydstrøm"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2448
msgid "Can't establish video stream"
msgstr "Kan ikke etablere videostrøm"
@@ -2952,35 +2969,35 @@ msgstr "_Ring"
msgid "_View"
msgstr "_Vis"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ulest)"
msgstr[1] "%s (%d uleste)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:478
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (og %u annen)"
msgstr[1] "%s (og %u andre)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:494
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d ulest fra andre)"
msgstr[1] "%s (%d uleste fra andre)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:503
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d ulest fra alle)"
msgstr[1] "%s (%d uleste fra alle)"
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:709
msgid "Typing a message."
msgstr "Skriver en melding"
@@ -3296,43 +3313,43 @@ msgid "Import Accounts"
msgstr "Importer kontoer"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "Importer"
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "Protokoll"
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "Kilde"
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:384
msgid "No match found"
msgstr "Ingen treff funnet"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:539
msgid "Reconnect"
msgstr "Koble til på nytt"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:545
msgid "Edit Account"
msgstr "Rediger konto"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:551
msgid "Close"
msgstr "Lukk"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1234
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1558
msgid "Contact List"
msgstr "Kontaktliste"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1667
msgid "Show and edit accounts"
msgstr "Vis og rediger kontoer"
@@ -3483,39 +3500,39 @@ msgstr "Romliste"
msgid "_Room:"
msgstr "_Rom:"
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
msgid "Message received"
msgstr "Melding mottatt"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
msgstr "Melding sendt"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr "Ny samtale"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr "Kontakt kobler til"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr "Kontakt kobler fra"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr "Konto koblet til"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr "Konto koblet fra"
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "Språk"
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
msgid "Preferences"
msgstr "Brukervalg"
diff --git a/po/pa.po b/po/pa.po
index e2326087c..45e782b1f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,8 +8,8 @@ msgid ""
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: 2010-09-21 07:37+0000\n"
-"PO-Revision-Date: 2010-09-22 21:21+0530\n"
+"POT-Creation-Date: 2010-10-11 08:04+0000\n"
+"PO-Revision-Date: 2010-10-13 07:34+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"
@@ -18,7 +18,7 @@ msgstr ""
"X-Poedit-Language: Punjabi\n"
"X-Poedit-Country: India\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
@@ -110,264 +110,256 @@ msgid "Empathy default download folder"
msgstr "ਇੰਪੈਥੀ ਡਿਫਾਲਟ ਡਾਊਨਲੋਡ ਫੋਲਡਰ"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "ਇੰਪੈਥੀ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਪੁੱਛੇ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "ਇੰਪੈਥੀ ਨੇ ਬਟਰਫਲਾਈ ਲਾਗ ਮਾਈਗਰੇਟ ਕੀਤਾ"
-#: ../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 "ਇੰਪੈਥੀ ਵੇਹਲੇ ਹੋਣ ਉੱਤੇ ਆਟੋਮੈਟਿਕ-ਦੂਰ ਕਰੇ"
-#: ../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 "ਇੰਪੈਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਕੁਨੈਕਟ ਹੋਵੇ"
-#: ../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 "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ"
-#: ../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 "ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
msgstr "ਵੈਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ ਚਾਲੂ"
-#: ../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 "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਪੋਪਅੱਪ ਸੂਚਨਾ ਚਾਲੂ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
msgstr "ਸ਼ਬਦ-ਜੋੜ ਯੋਗ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "ਮੁੱਖ ਵਿੰਡੋ ਓਹਲੇ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "ਮੁੱਖ ਵਿੰਡੋ ਓਹਲੇ ਕਰੋ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "ਨਾਂ ਪੂਰਾ ਅੱਖਰ"
-#: ../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 "ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ"
-#: ../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 "ਵਰਤਣ ਵਾਸਤੇ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ"
-#: ../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 "ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ, ਜੋ ਕਿ ਵਰਤਣਾ ਹੈ, ਜਦੋਂ ਗੱਲਬਾਤ ਲਈ ਅਡੀਓਮ ਥੀਮ ਚੁਣਿਆ ਹੋਵੇ।"
-#: ../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 "ਆ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਇੱਕ ਧੁਨੀ ਚਲਾਓ"
-#: ../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 "ਨਵੀਆਂ ਗੱਲਾਂਬਾਤਾਂ ਲਈ ਧੁਨੀ ਚਲਾਓ"
-#: ../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 "ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਆਵਾਜ਼ ਚਲਾਓ"
-#: ../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 "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗਇਨ ਕਰੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
-#: ../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 "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗ-ਆਉਟ ਕਰੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
-#: ../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 "ਜਦੋਂ ਅਸੀਂ ਲਾਗਇਨ ਕਰੀਏ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
-#: ../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 "ਜਦੋਂ ਅਸੀਂ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
-#: ../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 "ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
-#: ../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 "ਜੇ ਸੰਪਰਕ ਲਾਗ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
-#: ../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 "ਜੇ ਸੰਪਰਕ ਲਾਗ ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "ਅਵਤਾਰ ਵੇਖੋ"
-#: ../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 "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ"
-#: ../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 "ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ ਵੇਖੋ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "ਸ਼ਬਦ-ਜੋੜ ਭਾਸ਼ਾਵਾਂ"
-#: ../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 "ਫਾਇਲ ਸੰਚਾਰ ਸੰਭਾਲਣ ਲਈ ਡਿਫਾਲਟ ਫੋਲਡਰ ਹੈ।"
-#: ../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 "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ, ਜਿੱਥੇ ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਿਆ ਗਿਆ ਸੀ।"
-#: ../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 "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸਥਿਤੀ"
-#: ../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 "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸੰਭਾਲੀ ਸਥਿਤੀ (ਪਿਕਸਲ 'ਚ)।"
-#: ../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 "ਥੀਮ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "ਗਰਾਫਿਕਸ ਚਿਹਰੇ ਵਰਤੋਂ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਰਤੋਂ"
-#: ../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 "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤੋਂ"
-#: ../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 "ਕੀ ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦੇ ਟਿਕਾਣਿਆਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਉਸ ਦੇ ਸੰਪਰਕਾਂ ਨਾਲ ਦੇਵੇ।"
-#: ../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 "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੇ।"
-#: ../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 "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤੇ।"
-#: ../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 "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ।"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਹੋਰ ਪਰੋਗਰਾਮਾਂ ਤੋਂ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਪੁੱਛੇ।"
-
-#: ../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 "ਕੀ ਇੰਪੈਥੀ ਬਟਰਫਲਾਈ ਲਾਗ ਕਰ ਚੁੱਕਿਆ ਹੈ।"
-#: ../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 "ਕੀ ਇੰਪੈਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤੁਹਾਡੇ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਲਾਗ ਇਨ ਕਰੇ।"
-#: ../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 "ਜੇ ਯੂਜ਼ਰ ਕੁਝ ਨਾ ਕਰੇ ਤਾਂ ਕੀ ਇੰਪੈਥੀ ਆਟੋਮੈਟਿਕ ਹੀ ਦੂਰ ਸੈੱਟ ਕਰੇ।"
-#: ../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 "ਕੀ ਇੰਪੈਥੀ ਪਰਾਈਵੇਸੀ ਕਾਰਨਾਂ ਕਰਕੇ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ।"
-#: ../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 "ਕੀ ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ।"
-#: ../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 "ਕੀ ਵੈੱਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ, ਜਿਵੇਂ ਕਿ ਵੈੱਬ ਇੰਸਪੈਕਟਰ ਆਦਿ ਯੋਗ ਕਰਨੇ ਹਨ।"
-#: ../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."
msgstr "ਕੀ ਕੁਨੈਕੁਵਿਟੀ ਮੈਨੇਜਰ ਆਟੋਮੈਟਿਕ ਡਿਸ-ਕੁਨੈਕਟ/ਮੁੜ-ਕੁਨਕੈਟ ਲਈ ਵਰਤਿਆ ਜਾਵੇ"
-#: ../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 "ਕੀ ਜਦੋਂ ਤੁਸੀਂ ਲਿਖੋ ਤਾਂ ਸ਼ਬਦਾਂ ਨੂੰ ਭਾਸ਼ਾ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾਵੇ"
-#: ../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 "ਕੀ ਸਮਾਈਲੀ ਨੂੰ ਗੱਲਬਾਤ ਵਿੱਚ ਗਰਾਫਿਕਲ ਚਿੱਤਰਾਂ ਵਿੱਚ ਬਦਲਿਆ ਜਾਵੇ"
-#: ../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 "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਇਨ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
-#: ../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 "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਆਫ਼ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
-#: ../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 "ਕੀ ਈਵੈਂਟਾਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
-#: ../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 "ਕੀ ਆ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
-#: ../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 "ਕੀ ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਦੀ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
-#: ../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 "ਕੀ ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
-#: ../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 "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਲਾਗ ਇਨ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
-#: ../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 "ਕੀ ਨੈੱਟਵਰਕ ਤੋਂ ਲਾਗ ਆਫ਼ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
-#: ../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 "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝੇ ਹੋਵੇ ਤਾਂ ਕੀ ਸਾਊਂਡ ਸੂਚਨਾਵਾਂ ਚਲਾਉਣੀਆਂ ਹਨ।"
-#: ../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 "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੋਵੇ।"
-#: ../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 "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਵੇ।"
-#: ../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."
@@ -375,45 +367,45 @@ msgstr ""
"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ ਪਹਿਲਾਂ ਖੁੱਲ੍ਹੀ ਹੋਵੇ, ਪਰ "
"ਫੋਕਸ ਨਾ ਹੋਵੇ।"
-#: ../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 "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ।"
-#: ../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 "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਅਤੇ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਅਵਤਾਰ ਵੇਖਾਏ ਜਾਣ।"
-#: ../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 "ਕੀ ਸੰਪਰਕ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਹਨ, ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾਏ ਜਾਣ"
-#: ../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 "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਦੂਰ ਰੁੱਝੇ ਹੋਵੋ"
-#: ../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 "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਪਰੋਟੋਕਾਲ ਵੇਖਾਏ ਜਾਣ।"
-#: ../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 "ਕੀ ਗਲੱਬਾਤ ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖਣੀ ਹੈ।"
-#: ../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 "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਨੂੰ ਸੰਖੇਪ ਮੋਡ ਵਿੱਚ ਵੇਖਣਾ ਹੈ।"
-#: ../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."
msgstr "ਕੀ ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ 'x' ਬਟਨ ਦਬਾਉਣ ਨਾਲ ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਬਾਰੇ ਸੁਨੇਹਾ ਡਾਈਲਾਗ ਵੇਖਾਇਆ ਜਾਵੇ।"
-#: ../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 "ਕੀ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤਣਾ ਹੈ।"
-#: ../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 "
@@ -428,7 +420,7 @@ msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਪਰਬੰਧ"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2105
msgid "Messaging and VoIP Accounts"
msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ"
@@ -500,9 +492,9 @@ msgstr "ਅਦਿੱਖ"
msgid "Offline"
msgstr "ਆਫਲਾਈਨ"
-#: ../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:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "ਅਣਜਾਣ"
@@ -614,16 +606,20 @@ msgstr ""
"ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ ਦੀ ਲੰਬਾਈ ਜਾਂ ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ ਚੇਨ ਦੀ ਡੂੰਘਾਈ ਕ੍ਰਿਪਟੂਗਰਾਫ਼ੀ ਲਾਇਬਰੇਰੀ ਵਲੋਂ ਰੱਖੀ "
"ਗਈ ਲਿਮਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ।"
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "ਨੇੜਲੇ ਲੋਕ"
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:548
msgid "Yahoo! Japan"
msgstr "ਯਾਹੂ! ਜਾਪਾਨ"
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr "ਗੂਗਲ ਟਾਕ"
+
+#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgstr "ਫੇਸਬੁੱਕ ਚੈਟ"
@@ -718,7 +714,7 @@ msgstr "ਲਾਗਇਨ(_o)"
#. Account and Identifier
#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1399
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1270,7 +1266,7 @@ msgstr "ਅਣਜਾਣ"
msgid "Error sending message '%s': %s"
msgstr "ਸੁਨੇਹਾ '%s' ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
msgid "Topic:"
msgstr "ਵਿਸ਼ਾ:"
@@ -1293,7 +1289,7 @@ msgstr "ਚਿਹਰਾ ਸ਼ਾਮਲ ਕਰੋ"
#. send button
#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "ਭੇਜੋ(_S)"
@@ -1361,31 +1357,31 @@ msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
msgid "%s is now known as %s"
msgstr "%s ਨੂੰ ਹੁਣ %s ਵਜੋਂ ਜਾਣਿਆ ਜਾਵੇਗਾ"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
msgid "Disconnected"
msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2910
msgid "Wrong password; please try again:"
msgstr "ਗਲਤ ਪਾਸਵਰਡ; ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ:"
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:2911
msgid "Retry"
msgstr "ਮੁੜ-ਕੋਸ਼ਿਸ਼"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:2916
msgid "This room is protected by a password:"
msgstr "ਇਹ ਰੂਮ ਪਾਸਵਰਡ ਨਾਲ ਸੁਰੱਖਿਅਤ ਹੈ:"
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:2917
msgid "Join"
msgstr "ਦਾਖਲ"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3057
msgid "Connected"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ"
-#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-chat.c:3110
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "ਗੱਲਬਾਤ"
@@ -1408,17 +1404,17 @@ msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O)"
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸੋਧ"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "ਨਵਾਂ ਸੰਪਰਕ"
@@ -1435,7 +1431,6 @@ msgid "Ungrouped"
msgstr "ਬਿਨ-ਗਰੁੱਪ"
#: ../libempathy-gtk/empathy-contact-list-store.h:72
-#| msgid "Favorite"
msgid "Favorite People"
msgstr "ਪਸੰਦ ਦੇ ਲੋਕ"
@@ -1476,64 +1471,64 @@ msgid "_Add Contact…"
msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)..."
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../libempathy-gtk/empathy-individual-menu.c:516
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "ਗੱਲਬਾਤ(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "ਆਡੀਓ ਕਾਲ(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "ਵਿਡੀਓ ਕਾਲ(_V)"
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:644
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "ਫਾਇਲ ਭੇਜੋ"
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "ਮੇਰਾ ਡੈਸਕਟਾਪ ਸ਼ੇਅਰ ਕਰੋ"
-#: ../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:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1290
msgid "Favorite"
msgstr "ਪਸੰਦ"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "ਜਾਣਕਾਰੀ(_m)"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:489
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "ਸੋਧ(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:917
msgid "Inviting you to this room"
msgstr "ਇਸ ਰੂਮ ਲਈ ਤੁਹਾਨੂੰ ਸੱਦਾ"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
msgid "_Invite to Chat Room"
msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸੱਦਾ(_I)"
@@ -1541,178 +1536,178 @@ msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸੱਦਾ(_I)"
msgid "Select a contact"
msgstr "ਸੰਪਰਕ ਚੁਣੋ"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-individual-widget.c:147
msgid "Full name:"
msgstr "ਪੂਰਾ ਨਾਂ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Phone number:"
msgstr "ਫੋਨ ਨੰਬਰ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "E-mail address:"
msgstr "ਈਮੇਲ ਐਡਰੈੱਸ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "Website:"
msgstr "ਵੈੱਬਸਾਈਟ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Birthday:"
msgstr "ਜਨਮਦਿਨ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Country ISO Code:"
msgstr "ਦੇਸ਼ ISO ਕੋਡ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Country:"
msgstr "ਦੇਸ਼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "State:"
msgstr "ਹਾਲਤ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "City:"
msgstr "ਸ਼ਹਿਰ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Area:"
msgstr "ਏਰੀਆ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Postal Code:"
msgstr "ਡਾਕ ਕੋਡ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:590
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Street:"
msgstr "ਗਲੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Building:"
msgstr "ਇਮਾਰਤ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Floor:"
msgstr "ਮੰਜ਼ਲ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Room:"
msgstr "ਘਰ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Text:"
msgstr "ਟੈਕਸਟ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Description:"
msgstr "ਵੇਰਵਾ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Accuracy Level:"
msgstr "ਸ਼ੁੱਧਤਾ ਲੈਵਲ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Error:"
msgstr "ਗਲਤੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Vertical Error (meters):"
msgstr "ਵਰਟੀਕਲ ਗਲਤੀ (ਮੀਟਰ):"
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:640
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Horizontal Error (meters):"
msgstr "ਹਰੀਜੱਟਲ ਗਲਤੀ (ਮੀਟਰ):"
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:642
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Speed:"
msgstr "ਗਤੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Bearing:"
msgstr "ਬੀਰਿੰਗ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Climb Speed:"
msgstr "ਚੜ੍ਹਨ ਗਤੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Last Updated on:"
msgstr "ਆਖਰੀ ਅੱਪਡੇਟ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Longitude:"
msgstr "ਲੰਬਕਾਰੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Latitude:"
msgstr "ਵਿਥਕਾਰ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Altitude:"
msgstr "ਉਚਾਈ:"
-#: ../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:717
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "ਟਿਕਾਣਾ"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-individual-widget.c:600
#, 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:788
+#: ../libempathy-gtk/empathy-individual-widget.c:649
msgid "%B %e, %Y at %R UTC"
msgstr "%R UTC %e %B %Y ਨੂੰ"
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-individual-widget.c:840
msgid "Save Avatar"
msgstr "ਅਵਤਾਰ ਸੰਭਾਲੋ"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Unable to save avatar"
msgstr "ਅਵਤਾਰ ਸੰਭਾਲਣ ਲਈ ਅਸਮਰੱਥ"
@@ -1722,7 +1717,7 @@ msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
msgid "Alias:"
msgstr "ਉਪ-ਨਾਂ:"
@@ -1742,7 +1737,7 @@ msgstr "ਸੰਪਰਕ ਵੇਰਵਾ"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1429
msgid "Identifier:"
msgstr "ਪਛਾਣਕਰਤਾ:"
@@ -1775,18 +1770,19 @@ msgstr ""
msgid "_Add Group"
msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ(_A)"
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+#| msgid "Select"
+msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "ਚੁਣੋ"
-#: ../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:1250
msgid "Group"
msgstr "ਗਰੁੱਪ"
#. 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 "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ"
@@ -1810,19 +1806,19 @@ msgstr "ਖੱਬੇ ਪਾਸੇ ਲਿਸਟ ਵਿੱਚੋਂ ਚੁਣੇ
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "ਸੋਧ(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ(_L)…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1841,6 +1837,12 @@ msgstr "ਨਵਾਂ ਨੈੱਟਵਰਕ"
msgid "Choose an IRC network"
msgstr "IRC ਨੈੱਟਵਰਕ ਚੁਣੋ"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#| msgid "Select"
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "ਚੁਣੋ"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "ਨਵਾਂ ਸਰਵਰ"
@@ -1852,16 +1854,16 @@ 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 "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "ਲਿੰਕ ਹਟਾਓ(_U)…"
-#: ../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."
msgstr "ਵੇਖਾਏ ਮੇਟਾ-ਸੰਪਰਕ ਨੂੰ ਇਸ 'ਚ ਮੌਜੂਦਾ ਸੰਪਰਕਾਂ 'ਚ ਪੂਰੀ ਤਰ੍ਹਾਂ ਵੰਡ ਦਿਉ।"
@@ -1869,22 +1871,22 @@ msgstr "ਵੇਖਾਏ ਮੇਟਾ-ਸੰਪਰਕ ਨੂੰ ਇਸ 'ਚ ਮ
#. 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 "ਲਿੰਕ ਕਰੋ(_L)"
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "ਮੇਟਾ-ਸੰਪਰਕ '%s' ਲਿੰਕ ਹਟਾਉਣਾ?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਮੇਟਾ-ਲਿੰਕ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ? ਇਹ ਮੇਟਾ-ਸੰਪਰਕਾਂ ਨੂੰ ਮੌਜੂਦ ਸੰਪਰਕਾਂ 'ਚ ਵੰਡ ਦੇਵੇਗਾ।"
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "ਲਿੰਕ ਹਟਾਓ(_U)"
@@ -1899,10 +1901,12 @@ msgid "Conversations"
msgstr "ਗੱਲਬਾਤ"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "ਅੱਗੇ ਲੱਭੋ"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "ਪਿੱਛੇ ਲੱਭੋ"
@@ -1986,15 +1990,24 @@ msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਅਤੇ ਮੌਜੂਦਾ ਹਾ
msgid "Custom messages…"
msgstr "ਪਸੰਦੀਦਾ ਸੁਨੇਹੇ..."
-#: ../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 "ਨਵਾਂ %s ਅਕਾਊਂਟ"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "ਲੱਭੋ:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "ਮਿਲਦੇ ਕੇਸ"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "ਸ਼ਬਦ ਨਹੀਂ ਲੱਭੇ"
@@ -2071,84 +2084,97 @@ msgid "Blue"
msgstr "ਨੀਲਾ"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "ਗੱਲਬਾਤ ਸਰਵਰ ਵਲੋਂ ਦਿੱਤੀ ਪਛਾਣ ਜਾਂਚੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ।\n"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ ਵਲੋਂ ਸਾਇਨ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗੀ"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਹਾਲੇ ਤੱਕ ਸਰਗਰਮ ਨਹੀਂ ਹੈ"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਉੱਤੇ ਉਮੀਦ ਮੁਤਾਬਕ ਫਿੰਗਰਪਰਿੰਟ ਨਹੀਂ ਹਨ"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਵਲੋਂ ਜਾਂਚਿਆ ਗਿਆ ਹੋਸਟ-ਨਾਂ ਸਰਵਰ ਦੇ ਨਾਂ ਨਾਲ ਮਿਲਦਾ ਨਹੀਂ ਹੈ"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਖੁਦ-ਦਸਤਖਤੀ ਹੈ"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ ਵਲੋਂ ਮਨਸੂਖ ਕੀਤਾ ਜਾ ਚੁੱਕਾ ਹੈ"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਕਮਜ਼ੋਰ ਕ੍ਰਿਪਟੋਗਰਾਫਿਕਲ ਵਰਤਦਾ ਹੈ"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਲੰਬਾਈ ਜਾਂਚਯੋਗ ਲਿਮਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਨਿਕਾਰਾ ਹੈ"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#| msgid "The identity provided by the chat server cannot be verified.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "ਗੱਲਬਾਤ ਸਰਵਰ ਵਲੋਂ ਦਿੱਤੀ ਪਛਾਣ ਜਾਂਚੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#| msgid "The certificate is not signed by a Certification Authority"
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ ਵਲੋਂ ਸਾਇਨ ਨਹੀਂ ਕੀਤਾ ਗਿਆ।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#| msgid "The certificate has expired"
+msgid "The certificate has expired."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗੀ ਹੈ।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#| msgid "The certificate hasn't yet been activated"
+msgid "The certificate hasn't yet been activated."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਹਾਲੇ ਤੱਕ ਸਰਗਰਮ ਨਹੀਂ ਹੈ।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#| msgid "The certificate does not have the expected fingerprint"
+msgid "The certificate does not have the expected fingerprint."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਉੱਤੇ ਉਮੀਦ ਮੁਤਾਬਕ ਫਿੰਗਰਪਰਿੰਟ ਨਹੀਂ ਹਨ।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#| msgid ""
+#| "The hostname verified by the certificate doesn't match the server name"
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਵਲੋਂ ਜਾਂਚਿਆ ਗਿਆ ਹੋਸਟ-ਨਾਂ ਸਰਵਰ ਦੇ ਨਾਂ ਨਾਲ ਮਿਲਦਾ ਨਹੀਂ ਹੈ।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#| msgid "The certificate is self-signed"
+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
+#| msgid "The certificate is cryptographically weak"
+msgid "The certificate is cryptographically weak."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਕਮਜ਼ੋਰ ਕ੍ਰਿਪਟੋਗਰਾਫਿਕਲ ਵਰਤਦਾ ਹੈ।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#| msgid "The certificate length exceeds verifiable limits"
+msgid "The certificate length exceeds verifiable limits."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਲੰਬਾਈ ਜਾਂਚਯੋਗ ਲਿਮਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#| msgid "The certificate is malformed"
+msgid "The certificate is malformed."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਨਿਕਾਰਾ ਹੈ।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "ਚਾਹੀਦਾ ਹੋਸਟ ਨਾਂ: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "ਜਾਰੀ ਰੱਖੋ"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "ਇਹ ਕੁਨੈਕਸ਼ਨ ਭਰੋਸੇਯੋਗ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "ਭਵਿੱਖ ਦੇ ਕੁਨੈਕਸ਼ਨਾਂ ਲਈ ਇਹ ਚੋਣ ਯਾਦ ਰੱਖੋ"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਰਵਾ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "URI ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "ਫਾਇਲ ਚੁਣੋ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
msgid "Incoming file from %s"
msgstr "%s ਵਲੋਂ ਫਾਇਲ ਆ ਰਹੀ ਹੈ"
@@ -2348,7 +2374,7 @@ msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਸੰਪਰਕ ਲਿਸਟ ਜਾਂ ਕ
msgid "- Empathy IM Client"
msgstr "- ਇੰਪੈਥੀ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਕਲਾਇਟ"
-#: ../src/empathy-about-dialog.c:85
+#: ../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 "
@@ -2359,7 +2385,7 @@ msgstr ""
"ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ ੨ ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ (ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ "
"ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
-#: ../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 "
@@ -2370,7 +2396,7 @@ msgstr ""
"ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ "
"ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।"
-#: ../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 "
@@ -2380,11 +2406,11 @@ msgstr ""
"ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, ਐਮ ਏ ੦੨੧੧੦-੧੩੦੧੫੯, "
"ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।"
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "ਗਨੋਮ ਲਈ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਕਲਾਇਟ"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net) 2007, 2008, 2009, 2010\n"
@@ -2420,45 +2446,35 @@ msgstr ""
"ਬਾਅਦ ਵਿੱਚ ਸੋਧ ਮੇਨੂ ਵਿੱਚੋਂ ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "ਗਲਤੀ ਆਈ"
-#. 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 "ਨਵਾਂ %s ਅਕਾਊਂਟ"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "ਤੁਹਾਡੇ ਕੋਲ ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਹੈ?"
-#: ../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 "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਤੁਸੀਂ ਸੈੱਟਅੱਪ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "ਆਪਣੇ ਅਕਾਊਂਟ ਦਾ ਵੇਰਵਾ ਦਿਓ"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr "ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "ਕੀ ਤੁਸੀਂ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "ਨਵੇਂ ਅਕਾਊਂਟ ਲਈ ਵੇਰਵਾ ਦਿਓ"
-#: ../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 "
@@ -2469,41 +2485,41 @@ msgstr ""
"ਲਾਈਨ ਅਤੇ ਹੋਰ ਚੈਤ ਪਰੋਗਰਾਮਾਂ ਨਾਲ ਗੱਲਾਂ ਕਰ ਸਕਦੇ ਹੋ। ਮਾਈਕਰੋਫੋਨ ਜਾਂ ਵੈੱਬ ਕੈਮ ਨਾਲ ਤੁਸੀਂ ਆਡੀਓ ਅਤੇ "
"ਵਿਡੀਓ ਕਾਲ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"
-#: ../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 "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਕਿ ਤੁਸੀਂ ਹੋਰ ਚੈਟ ਪਰੋਗਰਾਮ ਨਾਲ ਵਰਤਦੇ ਰਹੇ ਹੋ?"
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "ਹਾਂ, ਮੇਰਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਲਵੋ "
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "ਹਾਂ, ਮੈਂ ਆਪਣਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਹੁਣ ਦੇਵਾਂਗਾ"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "ਨਹੀਂ, ਮੈਂ ਨਵਾਂ ਅਕਾਊਂਟ ਚਾਹੁੰਦਾ ਹਾਂ"
-#: ../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 "ਨਹੀਂ, ਮੈਂ ਸਿਰਫ਼ ਹੁਣ ਆਪਣੇ ਨੇੜੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਨੂੰ ਵੇਖਣਾ ਚਾਹੁੰਦਾ ਹਾਂ"
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "ਅਕਾਊਂਟ ਚੁਣੋ, ਜੋ ਤੁਸੀਂ ਇੰਪੋਰਟ ਕਰਨੇ ਚਾਹੁੰਦੇ ਹੋ:"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:810
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "ਹਾਂ"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "ਨਹੀਂ, ਹੁਣ ਲਈ ਕਾਫ਼ੀ ਹੈ"
-#: ../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 "
@@ -2514,16 +2530,16 @@ msgstr ""
"ਇਹ ਫੀਚਰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਹੇਠਾਂ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਪੂਰੀ ਹੈ। ਤੁਸੀਂ ਇਹ ਵੇਰਵਾ ਬਾਅਦ "
"ਵਿੱਚ ਵੀ ਸੌਖੀ ਤਰ੍ਹਾਂ ਬਦਲ ਸਕਦੇ ਹੋ ਜਾਂ 'ਅਕਾਊਂਟ' ਡਾਈਲਾਗ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇਹ ਫੀਚਰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"
-#: ../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 "ਸੋਧ->ਅਕਾਊਂਟ"
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1104
msgid "I don't want to enable this feature for now"
msgstr "ਮੈਂ ਇਹ ਫੀਚਰ ਹੁਣੇ ਚਾਲੂ ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦਾ"
-#: ../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 "
@@ -2534,66 +2550,66 @@ msgstr ""
"ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ। ਜੇ ਤੁਸੀਂ ਇਹ ਫੀਚਰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ telepathy-salut ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰੋ "
"ਅਤੇ ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਤੋਂ ਨੇੜਲੇ ਲੋਕ ਅਕਾਊਂਟ ਬਣਾਓ।"
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਸਹਾਇਕ"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "ਇੰਪੈਥੀ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgstr "ਨਿੱਜੀ ਵੇਰਵਾ ਦਿਓ"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "ਤੁਹਾਡੇ ਅਕਾਊਂਟ %s ਨਾਲ ਸਬੰਧਿਤ ਕੁਝ ਨਾ-ਸੰਭਾਲੀਆਂ ਸੋਧਾਂ ਹਨ।"
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
msgstr "ਤੁਹਾਡਾ ਨਵਾਂ ਅਕਾਊਂਟ ਹਾਲੇ ਨਹੀਂ ਸੰਭਾਲਿਆ ਗਿਆ ਹੈ।"
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
msgid "Connecting…"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline — %s"
msgstr "ਆਫਲਾਈਨ — %s"
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ — %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
msgstr "ਆਫਲਾਈਨ — ਕੋਈ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "ਅਣਜਾਣ ਹਾਲਤ"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline — Account Disabled"
msgstr "ਆਫਲਾਈਨ — ਅਕਾਊਂਟ ਆਯੋਗ ਹੈ"
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:759
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2601,16 +2617,16 @@ msgstr ""
"ਤੁਸੀਂ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਉਣ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਬਦਲਾਅ ਖਤਮ ਕਰ ਦੇਵੇਗਾ।\n"
"ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "ਕੀ ਤੁਸੀਂ ਆਪਣੇ ਕੰਪਿਊਟਰ ਤੋਂ %s ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr "ਇਹ ਸਰਵਰ ਤੋਂ ਤੁਹਾਡਾ ਅਕਾਊਂਟ ਨਹੀਂ ਹਟਾਏਗਾ।"
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1348
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2618,7 +2634,7 @@ msgstr ""
"ਤੁਸੀਂ ਨਵਾਂ ਅਕਾਊਂਟ ਚੁਣਨ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਬਦਲਾਅ ਅਣਡਿੱਠੇ ਕਰ ਦੇਵੇਗਾ।\n"
"ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:1951
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2690,84 +2706,84 @@ msgstr "ਗਾਮਾ"
msgid "Volume"
msgstr "ਆਵਾਜ਼"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1166
msgid "_Sidebar"
msgstr "ਬਾਹੀ(_S)"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1186
msgid "Audio input"
msgstr "ਆਡੀਓ ਆਉਟਪੁੱਟ"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1190
msgid "Video input"
msgstr "ਵਿਡੀਓ ਆਉਟਪੁੱਟ"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1194
msgid "Dialpad"
msgstr "ਡਾਇਲ-ਪੈਡ"
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1199
msgid "Details"
msgstr "ਵੇਰਵਾ"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-call-window.c:1266
#, c-format
msgid "Call with %s"
msgstr "%s ਲਈ ਕਾਲ ਕਰੋ"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1352
+#: ../src/empathy-call-window.c:1345
msgid "Call"
msgstr "ਕਾਲ ਕਰੋ"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1499
msgid "The IP address as seen by the machine"
msgstr "ਮਸ਼ੀਨ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ IP ਐਡਰੈੱਸ"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1501
msgid "The IP address as seen by a server on the Internet"
msgstr "IP ਐਡਰੈੱਸ, ਜੋ ਕਿ ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਸਰਵਰ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ ਹੈ"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1503
msgid "The IP address of the peer as seen by the other side"
msgstr "ਪੀਅਰ ਦਾ IP ਐਡਰੈੱਸ, ਜੋ ਦੂਜੇ ਪਾਸੇ ਵਿਖਾਈ ਦਿੰਦਾ ਹੈ"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1505
msgid "The IP address of a relay server"
msgstr "ਰੀਲੇਅ ਸਰਵਰ ਦਾ IP ਐਡਰੈੱਸ"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the multicast group"
msgstr "ਮਲਟੀਕਾਸਟ ਗਰੁੱਪ ਦਾ IP ਐਡਰੈੱਸ"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2254
#, c-format
msgid "Connected — %d:%02dm"
msgstr "ਕੁਨੈਕਟ ਹੈ -- %d:%02dm"
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2315
msgid "Technical Details"
msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2353
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s ਦਾ ਸਾਫਟਵੇਅਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਆਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮਝ ਨਹੀਂ ਸਕਦਾ ਹੈ।"
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2358
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s ਦਾ ਸਾਫਟਵੇਅਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਵਿਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮਝ ਨਹੀਂ ਸਕਦਾ ਹੈ।"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2364
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2776,19 +2792,19 @@ msgstr ""
"%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਤੁਹਾਡੇ ਵਿੱਚੋਂ ਕੋਈ ਅਜਿਹੇ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੈ, ਜੋ ਸਿੱਧਾ ਕੁਨੈਕਸ਼ਨ "
"ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-call-window.c:2370
msgid "There was a failure on the network"
msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2374
msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਆਡੀਓ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "The video formats necessary for this call are not installed on your computer"
msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਵਿਡੀਓ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2387
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2798,19 +2814,19 @@ msgstr ""
"ਟੈਲੀਪੈਥੀ ਭਾਗ ਵਿੱਚ ਕੁਝ ਗੜਬੜ ਹੋ ਗਈ ਹੈ। <a href=\"%s\">ਇਹ ਬੱਗ ਜਾਣਕਾਰੀ</a> ਦਿਓ ਅਤੇ ਮੱਦਦ "
"ਮੇਨੂ ਵਿੱਚੋਂ 'ਡੀਬੱਗ' ਵਿੰਡੋ ਤੋਂ ਲੈ ਕੇ ਲਾਗ ਨੱਥੀ ਕਰੋ।"
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2395
msgid "There was a failure in the call engine"
msgstr "ਕਾਲ ਇੰਜਣ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2398
msgid "The end of the stream was reached"
msgstr "ਸਟਰੀਮ ਦਾ ਅੰਤ ਆ ਗਿਆ ਹੈ"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2438
msgid "Can't establish audio stream"
msgstr "ਆਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2448
msgid "Can't establish video stream"
msgstr "ਵਿਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
@@ -2910,35 +2926,35 @@ msgstr "ਕਾਲ ਕਰੋ(_C)"
msgid "_View"
msgstr "ਵੇਖੋ(_V)"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ਨਾ-ਪੜ੍ਹੇ)"
msgstr[1] "%s (%d ਨਾ-ਪੜ੍ਹੇ)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:478
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (ਅਤੇ %u ਹੋਰ)"
msgstr[1] "%s (ਅਤੇ %u ਹੋਰ)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:494
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (ਹੋਰਾਂ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ)"
msgstr[1] "%s (ਹੋਰਾਂ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:503
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (ਸਭ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ)"
msgstr[1] "%s (ਸਭ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ)"
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:709
msgid "Typing a message."
msgstr "ਸੁਨੇਹਾ ਲਿਖਦਾ/ਲਿਖਦੀ ਹੈ।"
@@ -3272,27 +3288,27 @@ msgstr "ਸਰੋਤ"
msgid "No match found"
msgstr "ਕੋਈ ਮੇਲ ਨਹੀਂ ਲੱਭਿਆ"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:538
msgid "Reconnect"
msgstr "ਮੁੜ-ਕੁਨੈਕਟ"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:544
msgid "Edit Account"
msgstr "ਅਕਾਊਂਟ ਸੋਧ"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:550
msgid "Close"
msgstr "ਬੰਦ ਕਰੋ"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1232
msgid "Contact"
msgstr "ਸੰਪਰਕ"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1557
msgid "Contact List"
msgstr "ਸੰਪਰਕ ਲਿਸਟ"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1666
msgid "Show and edit accounts"
msgstr "ਅਕਾਊਂਟ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"
@@ -3745,6 +3761,13 @@ msgstr "ਇੰਪੈਥੀ ਅਕਾਊਂਟ"
msgid "Empathy Debugger"
msgstr "ਇੰਪੈਥੀ ਡੀਬੱਗਰ"
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "ਇੰਪੈਥੀ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਪੁੱਛੇ"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "ਕੀ ਇੰਪੈਥੀ ਹੋਰ ਪਰੋਗਰਾਮਾਂ ਤੋਂ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਪੁੱਛੇ।"
+
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "ਯਾਹੂ! ਜਾਪਾਨ ਵਰਤੋਂ(_Y)"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 849f4b29f..f802e5ae4 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,12 +7,13 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.31.92\n"
+"Project-Id-Version: empathy 2.91.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 13:49+0800\n"
-"PO-Revision-Date: 2010-09-25 13:50+0800\n"
+"POT-Creation-Date: 2010-10-13 15:39+0800\n"
+"PO-Revision-Date: 2010-10-13 15:40+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -108,315 +109,307 @@ msgid "Empathy default download folder"
msgstr "Empathy 預設下載資料夾"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy 已詢問匯入帳號"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy 已轉移 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 當閒置時應該自動設為離開"
-#: ../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 啟動時自動連線"
-#: ../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 應降低位置的準確度"
-#: ../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 要使用聯絡人的大頭貼做為聊天視窗圖示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
msgstr "啟用 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 "啟用新訊息的彈出式通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
msgstr "啟用拼字檢查程式"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "隱藏主視窗"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "隱藏主視窗。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "網名補齊字符"
-#: ../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 "在個別視窗開啟新的聊天"
-#: ../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 "要使用的 Adium 佈景主題路徑"
-#: ../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 "如果聊天室使用的主題是 Adium 時要使用的 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 "收到訊息時播放音效"
-#: ../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 "當開啟新的談話時播放音效"
-#: ../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 "送出訊息時播放音效"
-#: ../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 "當聯絡人登入時播放音效"
-#: ../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 "當有聯絡人登出時播放音效"
-#: ../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 "當我們登入時播放音效"
-#: ../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 "當我們登出時播放音效"
-#: ../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 "如果聊天視窗失去焦點則彈出通知"
-#: ../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 "當聯絡人登入時彈出通知"
-#: ../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 "當聯絡人登出時彈出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "顯示大頭貼"
-#: ../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 "在聊天室顯示聯絡人清單"
-#: ../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 "關閉主視窗時顯示提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "顯示離線聯絡人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "顯示協定"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "拼字檢查的語言"
-#: ../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 "用來儲存檔案傳輸接收檔案的預設資料夾。"
-#: ../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 "上次選擇大頭貼圖片的目錄。"
-#: ../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 "聊天視窗側窗格的位置"
-#: ../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 "聊天視窗側窗格的儲存位置 (單位為像素)。"
-#: ../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 "用來顯示在聊天視窗的談話中的佈景主題。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "使用圖片式表情符號"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "使用通知音效"
-#: ../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 "在聊天室使用佈景主題"
-#: ../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 "Empathy 是否要將使用者的位置發佈給他的聯絡人。"
-#: ../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 "Empathy 是否使用 GPS 來推測位置。"
-#: ../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 "Empathy 是否使用流動電話網絡來推測位置。"
-#: ../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 "Empathy 是否使用網絡來推測位置。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Empathy 是否應詢問你要不要從其他程式匯入帳號。"
-
-#: ../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 "Empathy 是否應轉移 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 "Empathy 是否應在啟動時自動登入你的帳號。"
-#: ../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 "Empathy 是否應在使用者閒置時自動切換為離開模式。"
-#: ../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 "Empathy 是否基於私隱的理由減低位置的準確度。"
-#: ../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 "Empathy 是否使用聯絡人大頭貼做為聊天視窗圖示。"
-#: ../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 "是否啟用 WebKit 開發者工具,例如 Web Inspector。"
-#: ../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."
msgstr "是否使用連線管理程式自動斷線或重新連線。"
-#: ../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 "是否以你設定的語言檢查輸入有無錯字。"
-#: ../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 "是否將談話中的表情符號轉換為圖片形式。"
-#: ../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 "是否播放音效來通知有聯絡人登入網絡。"
-#: ../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 "是否播放音效來通知有聯絡人登出網絡。"
-#: ../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 "是否播放音效來通知有事件發生。"
-#: ../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 "是否播放音效來通知有收到訊息。"
-#: ../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 "是否播放音效來通知新的談話。"
-#: ../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 "是否播放音效來通知有送出訊息。"
-#: ../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 "當登入某網絡時是否播放音效。"
-#: ../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 "當登出某網絡時是否播放音效。"
-#: ../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 "當狀態為離開或忙碌時是否播放音效通知。"
-#: ../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 "當聯絡人離線時是否顯示彈出式通知。"
-#: ../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 "當聯絡人上線時是否顯示彈出式通知。"
-#: ../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."
msgstr "收到新訊息時是否顯示彈出式通知(即使已開啟聊天視窗,但沒有獲得焦點)。"
-#: ../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 "當收到新訊息時是否顯示彈出式通知。"
-#: ../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 "是否在聯絡人清單與聊天視窗顯示聯絡人大頭貼。"
-#: ../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 "是否在聯絡人清單中顯示離線的聯絡人。"
-#: ../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 "當狀態為離開或忙碌時是否顯示彈出式通知。"
-#: ../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 "是否要在聯絡人清單內顯示聯絡人使用協定。"
-#: ../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 "是否在聊天室中顯示聯絡人清單。"
-#: ../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 "是否以精簡模式顯示聯絡人清單。"
-#: ../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."
msgstr "是否在使用標題列的「x」按鈕關閉主視窗時,顯示訊息對話窗。"
-#: ../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 "是否為聊天室使用佈景主題。"
-#: ../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 "
@@ -429,7 +422,7 @@ msgstr "管理訊息與 VoIP 帳號"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2105
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
@@ -501,9 +494,9 @@ msgstr "隱藏"
msgid "Offline"
msgstr "離線"
-#: ../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:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "不明"
@@ -615,16 +608,20 @@ msgid ""
"chain, exceed the limits imposed by the cryptography library"
msgstr "伺服器證書的長度,或是伺服器證書鏈的深度超過密碼函式庫所能處理的範圍"
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:548
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -674,7 +671,7 @@ msgstr "全部"
#: ../libempathy-gtk/empathy-account-widget.c:514
#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳號"
@@ -713,7 +710,7 @@ msgstr "登入(_O)"
#. Account and Identifier
#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1399
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1259,7 +1256,7 @@ msgstr "不明"
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤;%s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
msgid "Topic:"
msgstr "主題:"
@@ -1282,7 +1279,7 @@ msgstr "插入表情符號"
#. send button
#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "傳送(_S)"
@@ -1350,31 +1347,31 @@ msgstr "%s 已經加入此聊天室"
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
msgid "Disconnected"
msgstr "已斷線"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2910
msgid "Wrong password; please try again:"
msgstr "密碼錯誤;請再試一次:"
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:2911
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:2916
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護:"
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:2917
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3057
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-chat.c:3110
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "談話"
@@ -1397,17 +1394,17 @@ msgstr "開啟連結(_O)"
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "編輯聯絡人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "個人資料"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "新增聯絡人"
@@ -1464,64 +1461,64 @@ msgid "_Add Contact…"
msgstr "新增聯絡人(_A)…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../libempathy-gtk/empathy-individual-menu.c:516
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "聊天(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "視像通話(_V)"
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:644
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "傳送檔案"
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "分享我的桌面"
-#: ../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:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1290
msgid "Favorite"
msgstr "喜好"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "資訊(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:489
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:917
msgid "Inviting you to this room"
msgstr "邀請你到這個聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
@@ -1529,178 +1526,178 @@ msgstr "邀請到聊天室(_I)"
msgid "Select a contact"
msgstr "選擇聯絡人"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-individual-widget.c:147
msgid "Full name:"
msgstr "全名:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Phone number:"
msgstr "電話號碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "E-mail address:"
msgstr "電子信箱位址:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "Website:"
msgstr "網站:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Birthday:"
msgstr "生日:"
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Country ISO Code:"
msgstr "國家 ISO 碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Country:"
msgstr "國家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "State:"
msgstr "州:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "City:"
msgstr "市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Area:"
msgstr "區域:"
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Postal Code:"
msgstr "郵遞區號:"
-#: ../libempathy-gtk/empathy-contact-widget.c:590
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Street:"
msgstr "街:"
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Building:"
msgstr "建築:"
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Floor:"
msgstr "樓層:"
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Room:"
msgstr "室:"
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Text:"
msgstr "文字:"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Accuracy Level:"
msgstr "準確度等級:"
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Error:"
msgstr "錯誤:"
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:640
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:642
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Bearing:"
msgstr "方位:"
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Last Updated on:"
msgstr "上次更新於:"
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Longitude:"
msgstr "經度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Altitude:"
msgstr "緯度:"
-#: ../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:717
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-individual-widget.c:600
#, 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:788
+#: ../libempathy-gtk/empathy-individual-widget.c:649
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-individual-widget.c:840
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1710,7 +1707,7 @@ msgstr "<b>位置</b> 於 (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
msgid "Alias:"
msgstr "別名:"
@@ -1730,7 +1727,7 @@ msgstr "聯絡人詳細資料"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1429
msgid "Identifier:"
msgstr "識別身分:"
@@ -1761,18 +1758,20 @@ msgstr "請選擇這個聯絡人要顯現在哪個羣組。注意你可以選擇
msgid "_Add Group"
msgstr "加入羣組(_G)"
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "選擇"
-#: ../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:1250
msgid "Group"
msgstr "羣組"
#. 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 "已連結的聯絡人"
@@ -1796,19 +1795,19 @@ msgstr "在所方清單所選的聯絡人將連結在一起。"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "連結聯絡人(_L)…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1826,6 +1825,13 @@ msgstr "新增網絡"
msgid "Choose an IRC network"
msgstr "選擇 IRC 網絡"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "選擇"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "新增伺服器"
@@ -1837,16 +1843,16 @@ 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 "連結聯絡人"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "取消連結(_U)…"
-#: ../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."
msgstr "將顯示的後設聯絡人其包含的聯絡人完全分開。"
@@ -1855,22 +1861,22 @@ msgstr "將顯示的後設聯絡人其包含的聯絡人完全分開。"
#. 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 "連結(_L)"
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "要取消後設聯絡人「%s」的連接嗎?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
msgstr "你確定要取消此後設聯絡人的連結?後設聯絡人所包含的聯絡人將會完全分開。"
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "取消連結(_U)"
@@ -1974,6 +1980,15 @@ msgstr "設定你的上線與目前的狀態"
msgid "Custom messages…"
msgstr "自選訊息…"
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "新增 %s 帳號"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "尋找:"
@@ -2059,84 +2074,109 @@ msgid "Blue"
msgstr "藍色"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
+#, fuzzy
+#| msgid "The identity provided by the chat server cannot be verified.\n"
+msgid "The identity provided by the chat server cannot be verified."
msgstr "對話伺服器所提供的識別身分無法通過驗證。\n"
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#, fuzzy
+#| msgid "The certificate is not signed by a Certification Authority"
+msgid "The certificate is not signed by a Certification Authority."
msgstr "該證書並非由證書授權中心所簽署"
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#, fuzzy
+#| msgid "The certificate has expired"
+msgid "The certificate has expired."
msgstr "證書已逾期"
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#, fuzzy
+#| msgid "The certificate hasn't yet been activated"
+msgid "The certificate hasn't yet been activated."
msgstr "證書尚未啟用"
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#, fuzzy
+#| msgid "The certificate does not have the expected fingerprint"
+msgid "The certificate does not have the expected fingerprint."
msgstr "證書並未擁有預期的指紋"
-#: ../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
+#, fuzzy
+#| msgid ""
+#| "The hostname verified by the certificate doesn't match the server name"
+msgid "The hostname verified by the certificate doesn't match the server name."
msgstr "證書所驗證的主機名稱與伺服器名稱不符"
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#, fuzzy
+#| msgid "The certificate is self-signed"
+msgid "The certificate is self-signed."
msgstr "證書為自我簽署"
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#, fuzzy
+#| msgid ""
+#| "The certificate has been revoked by the issuing Certification Authority"
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
msgstr "證書已被原本發出的證書授權機構撤銷"
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#, fuzzy
+#| msgid "The certificate is cryptographically weak"
+msgid "The certificate is cryptographically weak."
msgstr "證書於密碼防護上較弱"
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#, fuzzy
+#| msgid "The certificate length exceeds verifiable limits"
+msgid "The certificate length exceeds verifiable limits."
msgstr "證書長度超出可驗證的範圍"
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#, fuzzy
+#| msgid "The certificate is malformed"
+msgid "The certificate is malformed."
msgstr "證書格式不良"
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "預期的證書主機名稱:%s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "證書主機名稱:%s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "繼續"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "此連線未受信任。你無論如何都要繼續嗎?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "請記住此選擇以供未來連線使用"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "證書詳細資料"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "無法開啓 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "選擇一個檔案"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
msgid "Incoming file from %s"
msgstr "收到來自 %s 的檔案"
@@ -2336,7 +2376,7 @@ msgstr "啟動時不顯示聯絡人清單或任何其他對話窗"
msgid "- Empathy IM Client"
msgstr "- Empathy 即時通用戶端"
-#: ../src/empathy-about-dialog.c:85
+#: ../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 "
@@ -2344,7 +2384,7 @@ msgid ""
"version."
msgstr "Empathy 是自由軟件,你可以遵照自由軟件基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈這一程式,或者自由選擇使用任何更新的版本。"
-#: ../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 "
@@ -2352,18 +2392,18 @@ msgid ""
"details."
msgstr "發佈 Empathy 的目的是希望它有用,但沒有任何擔保。甚至沒有適合特定目的而隱含的擔保。更詳細的情況請參閱 GNU 通用公共許可證。"
-#: ../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 "
"Street, Fifth Floor, Boston, MA 02110-130159 USA"
msgstr "你應該已經和 Empathy 一起收到一份 GNU 通用公共許可證的副本;如果還沒有,寫信給: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "GNOME 的即時訊息用戶端程式"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"如對翻譯有任何意見,請送一封電子郵件給\n"
@@ -2403,45 +2443,35 @@ msgid ""
msgstr "你可以回到前頁再次輸入帳號的詳細資料或結束此助理,稍後再從「編輯」選單加入帳號。"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "發生錯誤"
-#. 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 "新增 %s 帳號"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "你的聊天帳號是哪一種?"
-#: ../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 "你還想要設定其他的聊天帳號嗎?"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "請輸入你的帳號詳細資料"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr "你想要建立何種聊天帳號?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "是否想要建立其他聊天帳號?"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "請輸入新帳號的詳細資料"
-#: ../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 "
@@ -2449,41 +2479,41 @@ msgid ""
"calls."
msgstr "使用 Empathy 可以在網上跟附近的人聊天,或是和使用 Google Talk、AIM、Windows Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網絡攝影機還可以進行語音或視像通話。"
-#: ../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 "你是否有使用其他聊天程式的帳號?"
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "是的,請匯入我的帳號詳細資料於"
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "是的,我現在要輸入帳號的詳細資料"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "不,我想要新的帳號"
-#: ../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 "不,我現在只想看看附近有誰上線"
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "選擇要匯入的帳號:"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:810
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "是"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "不,目前就這樣"
-#: ../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 "
@@ -2491,16 +2521,16 @@ msgid ""
"disable this feature by using the 'Accounts' dialog"
msgstr "Empathy 可以自動探索與你連線到相同網絡上的人們,並且和他們聊天。如果你想要使用此功能,請檢查下列詳細資料是否正確。你也可以在以後簡單地更改這些細節,或是用「帳號」對話窗來停用此功能"
-#: ../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 "編輯 -> 帳號"
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1104
msgid "I don't want to enable this feature for now"
msgstr "我現在不想要啟用這項功能"
-#: ../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 "
@@ -2508,66 +2538,66 @@ msgid ""
"the Accounts dialog"
msgstr "你無法與連線到你本機網絡的人們聊天,因為 telepathy-salut 尚未安裝。如果你想要啟用此功能,請安裝 telepathy-salut 套件,並從「帳號」對話窗建立「附近的人」帳號"
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut 尚未安裝"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "訊息與 VoIP 帳號助理"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "歡迎使用 Empathy"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "匯入現有的帳號"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgstr "請輸入個人詳細資料"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "有與你的 %s 帳號相關的修改尚未儲存。"
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
msgstr "尚未儲存你的新帳號。"
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
msgid "Connecting…"
msgstr "連線中…"
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline — %s"
msgstr "離線 — %s"
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
msgstr "已斷線 — %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
msgstr "離線 — 無網絡連線"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "未知的狀態"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline — Account Disabled"
msgstr "離線 — 帳號已停用"
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:759
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2575,16 +2605,16 @@ msgstr ""
"你即將建立新的帳號,這樣會放棄\n"
"你所做的更改。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "是否想要從你的電腦上移除羣組 %s?"
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr "這不會移除伺服器上的你的帳號。"
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1348
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2592,7 +2622,7 @@ msgstr ""
"你即將建立另一個帳號,這樣會放棄\n"
"你所做的更改。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:1951
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2662,105 +2692,105 @@ msgstr "Gamma"
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1166
msgid "_Sidebar"
msgstr "側邊欄(_S)"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1186
msgid "Audio input"
msgstr "音效輸入"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1190
msgid "Video input"
msgstr "視像輸入"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1194
msgid "Dialpad"
msgstr "播號盤"
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1199
msgid "Details"
msgstr "詳細資料"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-call-window.c:1266
#, c-format
msgid "Call with %s"
msgstr "與 %s 通話中"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1352
+#: ../src/empathy-call-window.c:1345
msgid "Call"
msgstr "通話"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1499
msgid "The IP address as seen by the machine"
msgstr "機器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1501
msgid "The IP address as seen by a server on the Internet"
msgstr "互聯網上的伺服器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1503
msgid "The IP address of the peer as seen by the other side"
msgstr "其他端看見的點的 IP 位址"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1505
msgid "The IP address of a relay server"
msgstr "中繼伺服器的 IP 位址"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the multicast group"
msgstr "多點廣播羣組的 IP 位址"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2254
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已連線 — %d:%02dm"
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2315
msgid "Technical Details"
msgstr "技術細節"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2353
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 的軟件不瞭解任何你電腦上所支援的音訊格式"
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2358
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 的軟件不瞭解任何你電腦上所支援的視像格式"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2364
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr "無法和 %s 建立連線。你們其中之一可能在一個不允許直接連線的網絡之上。"
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-call-window.c:2370
msgid "There was a failure on the network"
msgstr "這個網絡上有錯誤發生"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2374
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的音訊格式尚未在你的電腦上安裝"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的視像格式尚未在你的電腦上安裝"
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2387
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2768,19 +2798,19 @@ msgid ""
"the Help menu."
msgstr "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助選單內的「除錯」視窗中所收集的紀錄。"
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2395
msgid "There was a failure in the call engine"
msgstr "通話引擎內有錯誤發生"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2398
msgid "The end of the stream was reached"
msgstr "已達串流末端"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2438
msgid "Can't establish audio stream"
msgstr "無法建立音訊串流"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2448
msgid "Can't establish video stream"
msgstr "無法建立視像串流"
@@ -2880,31 +2910,31 @@ msgstr "通話(_C)"
msgid "_View"
msgstr "檢視(_V)"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 個未讀)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:478
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (與 %u 其他的)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:494
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (來自其他人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:503
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (來自所有人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:709
msgid "Typing a message."
msgstr "正在輸入訊息。"
@@ -3220,15 +3250,15 @@ msgid "Import Accounts"
msgstr "匯入帳號"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "匯入"
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "通訊協定"
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "來源"
@@ -3236,27 +3266,27 @@ msgstr "來源"
msgid "No match found"
msgstr "找不到符合項目"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:538
msgid "Reconnect"
msgstr "重新連接"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:544
msgid "Edit Account"
msgstr "編輯帳號"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:550
msgid "Close"
msgstr "關閉"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1232
msgid "Contact"
msgstr "聯絡人"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1557
msgid "Contact List"
msgstr "聯絡人清單"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1666
msgid "Show and edit accounts"
msgstr "顯示並編輯帳號"
@@ -3708,6 +3738,13 @@ msgstr "Empathy 帳號"
msgid "Empathy Debugger"
msgstr "Empathy 除錯程式"
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy 已詢問匯入帳號"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Empathy 是否應詢問您要不要從其他程式匯入帳號。"
+
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "使用 Yahoo! 日本(_Y)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 56ddd1888..41a79de34 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,12 +7,13 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.31.92\n"
+"Project-Id-Version: empathy 2.91.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 13:49+0800\n"
+"POT-Creation-Date: 2010-10-13 15:39+0800\n"
"PO-Revision-Date: 2010-09-23 20:50+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -108,315 +109,307 @@ msgid "Empathy default download folder"
msgstr "Empathy 預設下載資料夾"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy 已詢問匯入帳號"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy 已轉移 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 當閒置時應該自動設為離開"
-#: ../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 啟動時自動連線"
-#: ../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 應降低位置的準確度"
-#: ../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 要使用連絡人的大頭貼做為聊天視窗圖示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
msgstr "啟用 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 "啟用新訊息的彈出式通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
msgstr "啟用拼字檢查程式"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "隱藏主視窗"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "隱藏主視窗。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "暱稱補齊字元"
-#: ../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 "在個別視窗開啟新的聊天"
-#: ../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 "要使用的 Adium 佈景主題路徑"
-#: ../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 "如果聊天室使用的主題是 Adium 時要使用的 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 "收到訊息時播放音效"
-#: ../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 "當開啟新的談話時播放音效"
-#: ../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 "送出訊息時播放音效"
-#: ../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 "當連絡人登入時播放音效"
-#: ../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 "當有連絡人登出時播放音效"
-#: ../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 "當我們登入時播放音效"
-#: ../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 "當我們登出時播放音效"
-#: ../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 "如果聊天視窗失去焦點則彈出通知"
-#: ../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 "當連絡人登入時彈出通知"
-#: ../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 "當連絡人登出時彈出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "顯示大頭貼"
-#: ../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 "在聊天室顯示連絡人清單"
-#: ../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 "關閉主視窗時顯示提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "顯示離線連絡人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "顯示協定"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "拼字檢查的語言"
-#: ../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 "用來儲存檔案傳輸接收檔案的預設資料夾。"
-#: ../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 "上次選擇大頭貼圖片的目錄。"
-#: ../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 "聊天視窗側窗格的位置"
-#: ../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 "聊天視窗側窗格的儲存位置 (單位為像素)。"
-#: ../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 "用來顯示在聊天視窗的談話中的佈景主題。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "使用圖片式表情符號"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "使用通知音效"
-#: ../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 "在聊天室使用佈景主題"
-#: ../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 "Empathy 是否要將使用者的位置發佈給他的連絡人。"
-#: ../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 "Empathy 是否使用 GPS 來推測位置。"
-#: ../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 "Empathy 是否使用行動電話網路來推測位置。"
-#: ../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 "Empathy 是否使用網路來推測位置。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Empathy 是否應詢問您要不要從其他程式匯入帳號。"
-
-#: ../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 "Empathy 是否應轉移 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 "Empathy 是否應在啟動時自動登入您的帳號。"
-#: ../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 "Empathy 是否應在使用者閒置時自動切換為離開模式。"
-#: ../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 "Empathy 是否基於隱私的理由減低位置的準確度。"
-#: ../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 "Empathy 是否使用連絡人大頭貼做為聊天視窗圖示。"
-#: ../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 "是否啟用 WebKit 開發者工具,例如 Web Inspector。"
-#: ../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."
msgstr "是否使用連線管理程式自動斷線或重新連線。"
-#: ../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 "是否以您設定的語言檢查輸入有無錯字。"
-#: ../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 "是否將談話中的表情符號轉換為圖片形式。"
-#: ../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 "是否播放音效來通知有連絡人登入網路。"
-#: ../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 "是否播放音效來通知有連絡人登出網路。"
-#: ../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 "是否播放音效來通知有事件發生。"
-#: ../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 "是否播放音效來通知有收到訊息。"
-#: ../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 "是否播放音效來通知新的談話。"
-#: ../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 "是否播放音效來通知有送出訊息。"
-#: ../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 "當登入某網路時是否播放音效。"
-#: ../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 "當登出某網路時是否播放音效。"
-#: ../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 "當狀態為離開或忙碌時是否播放音效通知。"
-#: ../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 "當連絡人離線時是否顯示彈出式通知。"
-#: ../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 "當連絡人上線時是否顯示彈出式通知。"
-#: ../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."
msgstr "收到新訊息時是否顯示彈出式通知(即使已開啟聊天視窗,但沒有獲得焦點)。"
-#: ../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 "當收到新訊息時是否顯示彈出式通知。"
-#: ../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 "是否在連絡人清單與聊天視窗顯示連絡人大頭貼。"
-#: ../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 "是否在連絡人清單中顯示離線的連絡人。"
-#: ../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 "當狀態為離開或忙碌時是否顯示彈出式通知。"
-#: ../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 "是否要在聯絡人清單內顯示聯絡人使用協定。"
-#: ../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 "是否在聊天室中顯示連絡人清單。"
-#: ../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 "是否以精簡模式顯示連絡人清單。"
-#: ../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."
msgstr "是否在使用標題列的「x」按鈕關閉主視窗時,顯示訊息對話窗。"
-#: ../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 "是否為聊天室使用佈景主題。"
-#: ../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 "
@@ -431,7 +424,7 @@ msgstr "管理訊息與 VoIP 帳號"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2105
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
@@ -503,9 +496,9 @@ msgstr "隱藏"
msgid "Offline"
msgstr "離線"
-#: ../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:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "不明"
@@ -617,16 +610,20 @@ msgid ""
"chain, exceed the limits imposed by the cryptography library"
msgstr "伺服器憑證的長度,或是伺服器憑證鏈的深度超過密碼函式庫所能處理的範圍"
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:548
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -676,7 +673,7 @@ msgstr "全部"
#: ../libempathy-gtk/empathy-account-widget.c:514
#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳號"
@@ -715,7 +712,7 @@ msgstr "登入(_O)"
#. Account and Identifier
#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1399
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1266,7 +1263,7 @@ msgstr "不明"
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤;%s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
msgid "Topic:"
msgstr "主題:"
@@ -1289,7 +1286,7 @@ msgstr "插入表情符號"
#. send button
#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "傳送(_S)"
@@ -1357,31 +1354,31 @@ msgstr "%s 已經加入此聊天室"
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
msgid "Disconnected"
msgstr "已斷線"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2910
msgid "Wrong password; please try again:"
msgstr "密碼錯誤;請再試一次:"
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:2911
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:2916
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護:"
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:2917
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3057
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-chat.c:3110
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "談話"
@@ -1404,17 +1401,17 @@ msgstr "開啟連結(_O)"
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "編輯連絡人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "個人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "新增連絡人"
@@ -1471,64 +1468,64 @@ msgid "_Add Contact…"
msgstr "新增聯絡人(_A)…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../libempathy-gtk/empathy-individual-menu.c:516
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "聊天(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "視訊通話(_V)"
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:644
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "傳送檔案"
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "分享我的桌面"
-#: ../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:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1290
msgid "Favorite"
msgstr "喜好"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "資訊(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:489
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:917
msgid "Inviting you to this room"
msgstr "邀請您到這個聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
@@ -1536,178 +1533,178 @@ msgstr "邀請到聊天室(_I)"
msgid "Select a contact"
msgstr "選擇連絡人"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-individual-widget.c:147
msgid "Full name:"
msgstr "全名:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Phone number:"
msgstr "電話號碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "E-mail address:"
msgstr "電子信箱位址:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "Website:"
msgstr "網站:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Birthday:"
msgstr "生日:"
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Country ISO Code:"
msgstr "國家 ISO 碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Country:"
msgstr "國家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "State:"
msgstr "州:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "City:"
msgstr "市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Area:"
msgstr "區域:"
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Postal Code:"
msgstr "郵遞區號:"
-#: ../libempathy-gtk/empathy-contact-widget.c:590
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Street:"
msgstr "街:"
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Building:"
msgstr "建築:"
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Floor:"
msgstr "樓層:"
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Room:"
msgstr "室:"
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Text:"
msgstr "文字:"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Accuracy Level:"
msgstr "準確度等級:"
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Error:"
msgstr "錯誤:"
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (公尺):"
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:640
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (公尺):"
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:642
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Bearing:"
msgstr "方位:"
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Last Updated on:"
msgstr "上次更新於:"
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Longitude:"
msgstr "經度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Altitude:"
msgstr "緯度:"
-#: ../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:717
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-individual-widget.c:600
#, 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:788
+#: ../libempathy-gtk/empathy-individual-widget.c:649
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-individual-widget.c:840
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1717,7 +1714,7 @@ msgstr "<b>位置</b> 於 (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
msgid "Alias:"
msgstr "別名:"
@@ -1737,7 +1734,7 @@ msgstr "連絡人詳細資料"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1429
msgid "Identifier:"
msgstr "識別身分:"
@@ -1769,18 +1766,20 @@ msgstr ""
msgid "_Add Group"
msgstr "加入群組(_G)"
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "選擇"
-#: ../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:1250
msgid "Group"
msgstr "群組"
#. 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 "已連結的聯絡人"
@@ -1804,19 +1803,19 @@ msgstr "在所方清單所選的聯絡人將連結在一起。"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "連結聯絡人(_L)…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1834,6 +1833,13 @@ msgstr "新增網路"
msgid "Choose an IRC network"
msgstr "選擇 IRC 網路"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "選擇"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "新增伺服器"
@@ -1845,16 +1851,16 @@ 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 "連結聯絡人"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "取消連結(_U)…"
-#: ../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."
msgstr "將顯示的後設聯絡人其包含的聯絡人完全分開。"
@@ -1863,22 +1869,22 @@ msgstr "將顯示的後設聯絡人其包含的聯絡人完全分開。"
#. 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 "連結(_L)"
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "要取消後設聯絡人「%s」的連接嗎?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
msgstr "您確定要取消此後設聯絡人的連結?後設聯絡人所包含的聯絡人將會完全分開。"
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "取消連結(_U)"
@@ -1982,6 +1988,15 @@ msgstr "設定您的上線與目前的狀態"
msgid "Custom messages…"
msgstr "自訂訊息…"
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "新增 %s 帳號"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "尋找:"
@@ -2067,84 +2082,109 @@ msgid "Blue"
msgstr "藍色"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
+#, fuzzy
+#| msgid "The identity provided by the chat server cannot be verified.\n"
+msgid "The identity provided by the chat server cannot be verified."
msgstr "對話伺服器所提供的識別身分無法通過驗證。\n"
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#, fuzzy
+#| msgid "The certificate is not signed by a Certification Authority"
+msgid "The certificate is not signed by a Certification Authority."
msgstr "該憑證並非由憑證授權中心所簽署"
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#, fuzzy
+#| msgid "The certificate has expired"
+msgid "The certificate has expired."
msgstr "憑證已逾期"
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#, fuzzy
+#| msgid "The certificate hasn't yet been activated"
+msgid "The certificate hasn't yet been activated."
msgstr "憑證尚未啟用"
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#, fuzzy
+#| msgid "The certificate does not have the expected fingerprint"
+msgid "The certificate does not have the expected fingerprint."
msgstr "憑證並未擁有預期的指紋"
-#: ../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
+#, fuzzy
+#| msgid ""
+#| "The hostname verified by the certificate doesn't match the server name"
+msgid "The hostname verified by the certificate doesn't match the server name."
msgstr "憑證所驗證的主機名稱與伺服器名稱不符"
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#, fuzzy
+#| msgid "The certificate is self-signed"
+msgid "The certificate is self-signed."
msgstr "憑證為自我簽署"
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#, fuzzy
+#| msgid ""
+#| "The certificate has been revoked by the issuing Certification Authority"
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
msgstr "憑證已被原本發出的憑證授權機構撤銷"
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#, fuzzy
+#| msgid "The certificate is cryptographically weak"
+msgid "The certificate is cryptographically weak."
msgstr "憑證於密碼防護上較弱"
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#, fuzzy
+#| msgid "The certificate length exceeds verifiable limits"
+msgid "The certificate length exceeds verifiable limits."
msgstr "憑證長度超出可驗證的範圍"
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#, fuzzy
+#| msgid "The certificate is malformed"
+msgid "The certificate is malformed."
msgstr "憑證格式不良"
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "預期的憑證主機名稱:%s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "憑證主機名稱:%s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "繼續"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "此連線未受信任。您無論如何都要繼續嗎?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "請記住此選擇以供未來連線使用"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "憑證詳細資料"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "無法開啓 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "選擇一個檔案"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
msgid "Incoming file from %s"
msgstr "收到來自 %s 的檔案"
@@ -2344,7 +2384,7 @@ msgstr "啟動時不顯示連絡人清單或任何其他對話窗"
msgid "- Empathy IM Client"
msgstr "- Empathy 即時通用戶端"
-#: ../src/empathy-about-dialog.c:85
+#: ../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 "
@@ -2355,7 +2395,7 @@ msgstr ""
"的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈"
"這一程式,或者自由選擇使用任何更新的版本。"
-#: ../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 "
@@ -2365,7 +2405,7 @@ msgstr ""
"發佈 Empathy 的目的是希望它有用,但沒有任何擔保。甚至沒有適合特定目的而隱含的"
"擔保。更詳細的情況請參閱 GNU 通用公共許可證。"
-#: ../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 "
@@ -2375,11 +2415,11 @@ msgstr ""
"給: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
"Boston, MA 02110-130159 USA"
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "GNOME 的即時訊息用戶端程式"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"如對翻譯有任何意見,請送一封電子郵件給\n"
@@ -2421,45 +2461,35 @@ msgstr ""
"號。"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "發生錯誤"
-#. 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 "新增 %s 帳號"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "您的聊天帳號是哪一種?"
-#: ../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 "您還想要設定其他的聊天帳號嗎?"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "請輸入您的帳號詳細資料"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr "您想要建立何種聊天帳號?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "是否想要建立其他聊天帳號?"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "請輸入新帳號的詳細資料"
-#: ../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 "
@@ -2470,41 +2500,41 @@ msgstr ""
"Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以進行語音或視"
"訊通話。"
-#: ../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 "您是否有使用其他聊天程式的帳號?"
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "是的,請匯入我的帳號詳細資料於"
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "是的,我現在要輸入帳號的詳細資料"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "不,我想要新的帳號"
-#: ../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 "不,我現在只想看看附近有誰上線"
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "選擇要匯入的帳號:"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:810
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "是"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "不,目前就這樣"
-#: ../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 "
@@ -2515,16 +2545,16 @@ msgstr ""
"用此功能,請檢查下列詳細資料是否正確。您也可以在以後簡單地變更這些細節,或是"
"用「帳號」對話窗來停用此功能"
-#: ../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 "編輯 -> 帳號"
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1104
msgid "I don't want to enable this feature for now"
msgstr "我現在不想要啟用這項功能"
-#: ../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 "
@@ -2535,66 +2565,66 @@ msgstr ""
"啟用此功能,請安裝 telepathy-salut 套件,並從「帳號」對話窗建立「附近的人」帳"
"號"
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut 尚未安裝"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "訊息與 VoIP 帳號助理"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "歡迎使用 Empathy"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "匯入現有的帳號"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgstr "請輸入個人詳細資料"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
msgstr "尚未儲存您的新帳號。"
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
msgid "Connecting…"
msgstr "連線中…"
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline — %s"
msgstr "離線 — %s"
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
msgstr "已斷線 — %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
msgstr "離線 — 無網路連線"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "未知的狀態"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline — Account Disabled"
msgstr "離線 — 帳號已停用"
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:759
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2602,16 +2632,16 @@ msgstr ""
"您即將建立新的帳號,這樣會放棄\n"
"您所做的變更。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "是否想要從您的電腦上移除群組 %s?"
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr "這不會移除伺服器上的您的帳號。"
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1348
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2619,7 +2649,7 @@ msgstr ""
"您即將建立另一個帳號,這樣會放棄\n"
"您所做的變更。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:1951
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2689,105 +2719,105 @@ msgstr "Gamma"
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1166
msgid "_Sidebar"
msgstr "側邊欄(_S)"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1186
msgid "Audio input"
msgstr "音效輸入"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1190
msgid "Video input"
msgstr "視訊輸入"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1194
msgid "Dialpad"
msgstr "播號盤"
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1199
msgid "Details"
msgstr "詳細資料"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-call-window.c:1266
#, c-format
msgid "Call with %s"
msgstr "與 %s 通話中"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1352
+#: ../src/empathy-call-window.c:1345
msgid "Call"
msgstr "通話"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1499
msgid "The IP address as seen by the machine"
msgstr "機器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1501
msgid "The IP address as seen by a server on the Internet"
msgstr "網際網路上的伺服器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1503
msgid "The IP address of the peer as seen by the other side"
msgstr "其他端看見的點的 IP 位址"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1505
msgid "The IP address of a relay server"
msgstr "中繼伺服器的 IP 位址"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the multicast group"
msgstr "多點廣播群組的 IP 位址"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2254
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已連線 — %d:%02dm"
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2315
msgid "Technical Details"
msgstr "技術細節"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2353
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 的軟體不瞭解任何您電腦上所支援的音訊格式"
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2358
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 的軟體不瞭解任何您電腦上所支援的視訊格式"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2364
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr "無法和 %s 建立連線。您們其中之一可能在一個不允許直接連線的網路之上。"
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-call-window.c:2370
msgid "There was a failure on the network"
msgstr "這個網路上有錯誤發生"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2374
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝"
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2387
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2797,19 +2827,19 @@ msgstr ""
"在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">回報這個錯誤</a>並附上"
"從求助選單內的「除錯」視窗中所收集的紀錄。"
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2395
msgid "There was a failure in the call engine"
msgstr "通話引擎內有錯誤發生"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2398
msgid "The end of the stream was reached"
msgstr "已達串流末端"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2438
msgid "Can't establish audio stream"
msgstr "無法建立音訊串流"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2448
msgid "Can't establish video stream"
msgstr "無法建立視訊串流"
@@ -2909,31 +2939,31 @@ msgstr "通話(_C)"
msgid "_View"
msgstr "檢視(_V)"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 個未讀)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:478
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (與 %u 其他的)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:494
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (來自其他人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:503
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (來自所有人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:709
msgid "Typing a message."
msgstr "正在輸入訊息。"
@@ -3249,15 +3279,15 @@ msgid "Import Accounts"
msgstr "匯入帳號"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "匯入"
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "通訊協定"
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "來源"
@@ -3265,27 +3295,27 @@ msgstr "來源"
msgid "No match found"
msgstr "找不到符合項目"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:538
msgid "Reconnect"
msgstr "重新連接"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:544
msgid "Edit Account"
msgstr "編輯帳號"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:550
msgid "Close"
msgstr "關閉"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1232
msgid "Contact"
msgstr "連絡人"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1557
msgid "Contact List"
msgstr "連絡人清單"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1666
msgid "Show and edit accounts"
msgstr "顯示並編輯帳號"
@@ -3740,6 +3770,13 @@ msgstr "Empathy 帳號"
msgid "Empathy Debugger"
msgstr "Empathy 除錯程式"
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy 已詢問匯入帳號"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Empathy 是否應詢問您要不要從其他程式匯入帳號。"
+
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "使用 Yahoo! 日本(_Y)"
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index ab69d417b..4de9bce96 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -93,6 +93,8 @@ static PidginCmMapItem pidgin_cm_map[] =
#define PIDGIN_ACCOUNT_TAG_PROTOCOL "protocol"
#define PIDGIN_ACCOUNT_TAG_PASSWORD "password"
#define PIDGIN_ACCOUNT_TAG_SETTINGS "settings"
+#define PIDGIN_SETTING_PROP_UI "ui"
+#define PIDGIN_SETTING_PROP_NAME "name"
#define PIDGIN_SETTING_PROP_TYPE "type"
#define PIDGIN_PROTOCOL_BONJOUR "bonjour"
#define PIDGIN_PROTOCOL_NOVELL "novell"
@@ -110,7 +112,7 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
/* We can't do anything if the setting don't have a name */
tag_name = (gchar *) xmlGetProp (setting,
- (xmlChar *) PIDGIN_ACCOUNT_TAG_NAME);
+ (xmlChar *) PIDGIN_SETTING_PROP_NAME);
if (!tag_name)
return;
@@ -183,10 +185,54 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
g_free (content);
}
+static void
+import_dialog_pidgin_handle_settings (EmpathyImportAccountData *data,
+ xmlNodePtr settings)
+{
+ xmlNodePtr setting;
+ gchar *tag_ui, *name, *type, *content;
+
+ tag_ui = (gchar *) xmlGetProp (settings, (xmlChar *) PIDGIN_SETTING_PROP_UI);
+
+ /* UI settings - fetch the Enabled parameter.
+ * The expected value of the ui property is 'gtk-gaim', which looks obsolete,
+ * but still valid for 2.7.3.
+ */
+ if (tag_ui && !tp_strdiff (tag_ui, "gtk-gaim"))
+ {
+ for (setting = settings->children; setting; setting = setting->next)
+ {
+ name = (gchar *) xmlGetProp (setting,
+ (xmlChar *) PIDGIN_SETTING_PROP_NAME);
+ type = (gchar *) xmlGetProp (setting,
+ (xmlChar *) PIDGIN_SETTING_PROP_TYPE);
+ /* The Enabled parameter is supposed to be boolean.
+ * Pidgin name of the setting is 'auto-login'.
+ */
+ if (!tp_strdiff (name, "auto-login") && !tp_strdiff (type, "bool"))
+ {
+ content = (gchar *) xmlNodeGetContent (setting);
+ data->enabled = (0 != (gint) g_ascii_strtod (content, NULL));
+ g_free (content);
+ }
+ g_free (type);
+ g_free (name);
+ }
+ }
+ /* General settings. */
+ else
+ {
+ for (setting = settings->children; setting; setting = setting->next)
+ import_dialog_pidgin_parse_setting (data, setting);
+ }
+
+ g_free (tag_ui);
+}
+
GList *
empathy_import_pidgin_load (void)
{
- xmlNodePtr rootnode, node, child, setting;
+ xmlNodePtr rootnode, node, child;
xmlParserCtxtPtr ctxt;
xmlDocPtr doc;
gchar *filename;
@@ -310,8 +356,7 @@ empathy_import_pidgin_load (void)
/* Other settings */
else if (!tp_strdiff ((gchar *) child->name,
PIDGIN_ACCOUNT_TAG_SETTINGS))
- for (setting = child->children; setting; setting = setting->next)
- import_dialog_pidgin_parse_setting (data, setting);
+ import_dialog_pidgin_handle_settings (data, child);
}
/* If we have the needed settings, add the account data to the list,
diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 520f056f4..7e69d6235 100644
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -40,6 +40,7 @@ empathy_import_account_data_new (const gchar *source)
data->source = g_strdup (source);
data->protocol = NULL;
data->connection_manager = NULL;
+ data->enabled = FALSE;
return data;
}
diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h
index 20af25a91..09b85e0bc 100644
--- a/src/empathy-import-utils.h
+++ b/src/empathy-import-utils.h
@@ -37,6 +37,8 @@ typedef struct
gchar *connection_manager;
/* The name of the account import source */
gchar *source;
+ /* Indicates whether the account is enabled by default */
+ gboolean enabled;
} EmpathyImportAccountData;
typedef enum {
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 09898180a..fc1e2f532 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -167,6 +167,7 @@ import_widget_create_account_cb (GObject *source,
GAsyncResult *result,
gpointer user_data)
{
+ TpAccountManager *account_manager;
TpAccount *account;
GError *error = NULL;
EmpathyImportWidget *self = user_data;
@@ -184,6 +185,13 @@ import_widget_create_account_cb (GObject *source,
DEBUG ("account created\n");
+ if (tp_account_is_enabled (account))
+ {
+ account_manager = tp_account_manager_dup ();
+ empathy_connect_new_account (account, account_manager);
+ g_object_unref (account_manager);
+ }
+
g_object_unref (self);
}
@@ -208,7 +216,8 @@ import_widget_add_account (EmpathyImportWidget *self,
DEBUG ("display name: %s\n", display_name);
- properties = g_hash_table_new (NULL, NULL);
+ properties = tp_asv_new (NULL, NULL);
+ tp_asv_set_boolean (properties, TP_IFACE_ACCOUNT ".Enabled", data->enabled);
tp_account_manager_create_account_async (account_manager,
(const gchar*) data->connection_manager, data->protocol, display_name,
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 85a64a365..a89ba1cf1 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -101,6 +101,7 @@ G_DEFINE_TYPE (EmpathyMainWindow, empathy_main_window, GTK_TYPE_WINDOW);
#define GET_PRIV(self) ((EmpathyMainWindowPriv *)((EmpathyMainWindow *) self)->priv)
struct _EmpathyMainWindowPriv {
+ EmpathyContactList *contact_manager;
EmpathyIndividualStore *individual_store;
EmpathyIndividualView *individual_view;
TpAccountManager *account_manager;
@@ -695,6 +696,7 @@ empathy_main_window_finalize (GObject *window)
g_object_unref (priv->account_manager);
g_object_unref (priv->individual_store);
+ g_object_unref (priv->contact_manager);
g_hash_table_destroy (priv->errors);
/* disconnect all handlers of status-changed signal */
@@ -1536,7 +1538,6 @@ static void
empathy_main_window_init (EmpathyMainWindow *window)
{
EmpathyMainWindowPriv *priv;
- EmpathyContactList *list_iface;
EmpathyIndividualManager *individual_manager;
GtkBuilder *gui;
GtkWidget *sw;
@@ -1676,7 +1677,12 @@ empathy_main_window_init (EmpathyMainWindow *window)
gtk_container_add (GTK_CONTAINER (item), priv->throbber);
priv->throbber_tool_item = GTK_WIDGET (item);
- list_iface = EMPATHY_CONTACT_LIST (empathy_contact_manager_dup_singleton ());
+ /* XXX: this class is designed to live for the duration of the program,
+ * so it's got a race condition between its signal handlers and its
+ * finalization. The class is planned to be removed, so we won't fix
+ * this before then. */
+ priv->contact_manager = EMPATHY_CONTACT_LIST (
+ empathy_contact_manager_dup_singleton ());
individual_manager = empathy_individual_manager_dup_singleton ();
priv->individual_store = empathy_individual_store_new (
individual_manager);
@@ -1691,11 +1697,9 @@ empathy_main_window_init (EmpathyMainWindow *window)
EMPATHY_INDIVIDUAL_FEATURE_ALL);
priv->butterfly_log_migration_members_changed_id = g_signal_connect (
- list_iface, "members-changed",
+ priv->contact_manager, "members-changed",
G_CALLBACK (main_window_members_changed_cb), window);
- g_object_unref (list_iface);
-
gtk_widget_show (GTK_WIDGET (priv->individual_view));
gtk_container_add (GTK_CONTAINER (sw),
GTK_WIDGET (priv->individual_view));
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 89133edb5..813637dca 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -26,6 +26,7 @@
#include <config.h>
#include <string.h>
+#include <stdio.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@@ -101,7 +102,7 @@ static void preferences_languages_load (EmpathyPreferences
static gboolean preferences_languages_load_foreach (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
- gchar **languages);
+ GList *languages);
static void preferences_languages_cell_toggled_cb (GtkCellRendererToggle *cell,
gchar *path_string,
EmpathyPreferences *preferences);
@@ -471,9 +472,6 @@ preferences_languages_add (EmpathyPreferences *preferences)
codes = empathy_spell_get_language_codes ();
- g_settings_set_boolean (priv->gsettings_chat,
- EMPATHY_PREFS_CHAT_SPELL_CHECKER_ENABLED,
- codes != NULL);
if (!codes) {
gtk_widget_set_sensitive (priv->treeview_spell_checker, FALSE);
}
@@ -569,37 +567,34 @@ preferences_languages_load (EmpathyPreferences *preferences)
EmpathyPreferencesPriv *priv = GET_PRIV (preferences);
GtkTreeView *view;
GtkTreeModel *model;
- gchar *value;
- gchar **vlanguages;
+ GList *enabled_codes;
- value = g_settings_get_string (priv->gsettings_chat,
- EMPATHY_PREFS_CHAT_SPELL_CHECKER_LANGUAGES);
+ enabled_codes = empathy_spell_get_enabled_language_codes ();
- if (value == NULL)
- return;
+ g_settings_set_boolean (priv->gsettings_chat,
+ EMPATHY_PREFS_CHAT_SPELL_CHECKER_ENABLED,
+ enabled_codes != NULL);
- vlanguages = g_strsplit (value, ",", -1);
- g_free (value);
+ if (enabled_codes == NULL)
+ return;
view = GTK_TREE_VIEW (priv->treeview_spell_checker);
model = gtk_tree_view_get_model (view);
gtk_tree_model_foreach (model,
(GtkTreeModelForeachFunc) preferences_languages_load_foreach,
- vlanguages);
+ enabled_codes);
- g_strfreev (vlanguages);
+ g_list_free (enabled_codes);
}
static gboolean
preferences_languages_load_foreach (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
- gchar **languages)
+ GList *languages)
{
gchar *code;
- gchar *lang;
- gint i;
gboolean found = FALSE;
if (!languages) {
@@ -611,10 +606,8 @@ preferences_languages_load_foreach (GtkTreeModel *model,
return FALSE;
}
- for (i = 0, lang = languages[i]; lang; lang = languages[++i]) {
- if (!tp_strdiff (lang, code)) {
- found = TRUE;
- }
+ if (g_list_find_custom (languages, code, (GCompareFunc) strcmp)) {
+ found = TRUE;
}
g_free (code);
diff --git a/src/empathy.c b/src/empathy.c
index f22d69b25..2a8761c6f 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -259,7 +259,21 @@ account_manager_ready_cb (GObject *source_object,
if (!tp_account_manager_prepare_finish (manager, result, &error))
{
+ GtkWidget *dialog;
+
DEBUG ("Failed to prepare account manager: %s", error->message);
+
+ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+ _("Error contacting the Account Manager"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ _("There was an error while trying to connect to the Telepathy "
+ "Account Manager. The error was:\n\n%s"),
+ error->message);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+
g_error_free (error);
return;
}