GNOME.org
 

[empathy] update for Punjabi

commit 08aa9a4e24a6087ee94774027cdcfce54f87e175
Author: A S Alam <aalam users sf net>
Date:   Thu Sep 2 07:39:21 2010 +0530

    update for Punjabi

 po/pa.po |  954 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 600 insertions(+), 354 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 61ff07b..f99b676 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-08-11 16:40+0000\n"
-"PO-Revision-Date: 2010-08-17 07:11+0530\n"
+"POT-Creation-Date: 2010-08-30 15:46+0000\n"
+"PO-Revision-Date: 2010-09-02 07:38+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"
@@ -22,7 +22,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
+#| msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "���ਲ �ਾ�, ਫ�ਸਬ�ੱ�, MSN ਤ� ਹ�ਰ �� ��ੱ� ਸਰਵਿਸਾ� �ੱਤ� �ੱਲਾ� �ਰ�"
 
 #: ../data/empathy.desktop.in.in.h:2
@@ -84,10 +85,13 @@ 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 right "
+#| "away to the user."
 msgid ""
-"Display incoming events in the status area. If false present them right away "
-"to the user."
-msgstr "ਹਾਲਤ ��ਤਰ '� � ਰਹ� �ਵ��� ਲ� �ਾਣ�ਾਰ� ਵ��ਾ�। �� ਸ�ੱ� ਨਾ ��ਤਾ ਤਾ� �ਹ ਯ��਼ਰ ਨ�ੰ ਵ��ਾ� �ਾਵ���।"
+"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"
@@ -294,8 +298,10 @@ msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "�� �ੰਪ�ਥ� ਸ਼�ਰ� ਸਮ�� ���ਮ��ਿ� ਹ� ਤ�ਹਾਡ� ��ਾ���ਾ� ਵਿੱ� ਲਾ� �ਨ �ਰ�।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if user is idle."
-msgstr "ਯ��਼ਰ ਦ� ਵ�ਹਲ� ਹ�ਣ �ੱਤ� �� �ੰਪ�ਥ� ���ਮ��ਿ� ਹ� ਦ�ਰ ਸ�ੱ� �ਰ�।"
+#| msgid ""
+#| "Whether Empathy should go into away mode automatically if user is idle."
+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."
@@ -303,7 +309,7 @@ msgstr "�� �ੰਪ�ਥ� ਪਰਾ�ਵ�ਸ� �ਾਰਨਾ� 
 
 #: ../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 "�� �ੰਪ�ਥ� �ੱਲਬਾਤ ਵਿੰਡ� ���ਾਨ ਵ��� ਸੰਪਰ� ਦ� �ਵਤਾਰ ਨ�ੰ ਵਰਤ�"
+msgstr "�� �ੰਪ�ਥ� �ੱਲਬਾਤ ਵਿੰਡ� ���ਾਨ ਵ��� ਸੰਪਰ� ਦ� �ਵਤਾਰ ਨ�ੰ ਵਰਤ�।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
@@ -428,7 +434,7 @@ msgstr "ਸ�ਨ�ਹ� �ਤ� VoIP ��ਾ��� ਪਰਬੰਧ"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2092
+#: ../src/empathy-accounts-dialog.c:2151
 msgid "Messaging and VoIP Accounts"
 msgstr "ਸ�ਨ�ਹ� �ਤ� VoIP ��ਾ���"
 
@@ -567,27 +573,22 @@ msgid "Encryption is not available"
 msgstr "�ੰ��ਰਿਪਸ਼ਨ �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
 #: ../libempathy/empathy-utils.c:354
-#| msgid "Certificate not activated"
 msgid "Certificate is invalid"
 msgstr "ਸਰ��ਫਿ��� �ਲਤ ਹ�"
 
 #: ../libempathy/empathy-utils.c:356
-#| msgid "Connection managers should be used"
 msgid "Connection has been refused"
 msgstr "��ਨ��ਸ਼ਨ ਤ�� �ਨ�ਾਰ ��ਤਾ �ਿ�"
 
 #: ../libempathy/empathy-utils.c:358
-#| msgid "Connection managers should be used"
 msgid "Connection can't be established"
 msgstr "��ਨ��ਸ਼ਨ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #: ../libempathy/empathy-utils.c:360
-#| msgid "Connection managers should be used"
 msgid "Connection has been lost"
 msgstr "��ਨ��ਸ਼ਨ �ਤਮ ਹ� �ਿ�"
 
 #: ../libempathy/empathy-utils.c:362
-#| msgid "This account already exists on the server"
 msgid "This resource is already connected to the server"
 msgstr "�ਹ ਸਰ�ਤ ਪਹਿਲਾ� ਹ� ਸਰਵਰ ਨਾਲ ��ਨ��� ਹ�"
 
@@ -596,7 +597,6 @@ msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "�ਸ� ਸਰ�ਤ ਦ� ਵਰਤ�� �ਰ�� ��ਨ��ਸ਼ਨ ਨ�ੰ ਨਵ�� ��ਨ��ਸ਼ਨ ਨਾਲ ਬਦਲ ਦਿੱਤਾ �ਿ� ਹ�"
 
 #: ../libempathy/empathy-utils.c:367
-#| msgid "This account already exists on the server"
 msgid "The account already exists on the server"
 msgstr "��ਾ��� ਸਰਵਰ �ੱਤ� ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
@@ -605,7 +605,6 @@ msgid "Server is currently too busy to handle the connection"
 msgstr "ਸਰਵਰ �ਸ ਵ�ਲ� �ਨਾ ਰ�ੱ�ਿ� ਹ��� ਹ� �ਿ ��ਨ��ਸ਼ਨ ਸੰਭਾਲ ਨਹ�� ਸ�ਦਾ"
 
 #: ../libempathy/empathy-utils.c:371
-#| msgid "Certificate not provided"
 msgid "Certificate has been revoked"
 msgstr "ਸਰ��ਫਿ��� ਮਨਸ�� ��ਤਾ �ਾ ��ੱ�ਾ ਹ�"
 
@@ -614,22 +613,25 @@ msgid "Certificate uses an insecure cipher algorithm or is cryptographically wea
 msgstr "ਸਰ��ਫਿ��� �ਸ�ਰੱ�ਿ�ਤ ਸ�ਫ਼ਰ �ਲ��ਰਿਥਮ ਵਰਤਦਾ ਹ� �ਾ� �ਮ�਼�ਰ ��ਰਿਪ���ਰਾਫਿ�ਲ ਵਰਤਦਾ ਹ�"
 
 #: ../libempathy/empathy-utils.c:376
+#| msgid ""
+#| "The length of the server certificate, or the depth of the server "
+#| "certificate chain exceed the limits imposed by the crypto library"
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
-"chain exceed the limits imposed by the crypto library"
+"chain, exceed the limits imposed by the cryptography library"
 msgstr ""
-"ਸਰਵਰ ਸਰ��ਫਿ��� ਦ� ਲੰਬਾ� �ਾ� ਸਰਵਰ ਸਰ��ਫਿ��� ��ਨ ਦ� ਡ�ੰ�ਾ� ��ਰਿਪ�� ਲਾ�ਬਰ�ਰ� ਵਲ�� ਰੱ�� �� ਲਿਮ� "
-"ਤ�� ਵੱਧ �� ਹ�।"
+"ਸਰਵਰ ਸਰ��ਫਿ��� ਦ� ਲੰਬਾ� �ਾ� ਸਰਵਰ ਸਰ��ਫਿ��� ��ਨ ਦ� ਡ�ੰ�ਾ� ��ਰਿਪ���ਰਾਫ਼� ਲਾ�ਬਰ�ਰ� ਵਲ�� ਰੱ�� �� "
+"ਲਿਮ� ਤ�� ਵੱਧ �� ਹ�।"
 
-#: ../libempathy/empathy-utils.c:529
+#: ../libempathy/empathy-utils.c:540
 msgid "People Nearby"
 msgstr "ਨ��ਲ� ਲ��"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:545
 msgid "Yahoo! Japan"
 msgstr "ਯਾਹ�! �ਾਪਾਨ"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:546
 msgid "Facebook Chat"
 msgstr "ਫ�ਸਬ�ੱ� ���"
 
@@ -689,52 +691,63 @@ msgstr "ਸਭ"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1137
+#: ../libempathy-gtk/empathy-account-widget.c:1145
 msgid "Username:"
 msgstr "ਯ��਼ਰ ਨਾ�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1480
+#: ../libempathy-gtk/empathy-account-widget.c:1475
+msgid "A_pply"
+msgstr "ਲਾ�� �ਰ�(_p)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1505
 msgid "L_og in"
 msgstr "ਲਾ��ਨ(_o)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1548
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1571
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1397
 #: ../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:1559
-msgid "Enabled"
-msgstr "�ਾਲ�"
+#: ../libempathy-gtk/empathy-account-widget.c:1582
+#| msgid "Enabled"
+msgid "_Enabled"
+msgstr "ਯ��(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1624
+#: ../libempathy-gtk/empathy-account-widget.c:1647
 msgid "This account already exists on the server"
 msgstr "�ਹ ��ਾ��� ਸਰਵਰ �ੱਤ� ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1627
+#: ../libempathy-gtk/empathy-account-widget.c:1650
 msgid "Create a new account on the server"
 msgstr "ਸਰਵਰ �ੱਤ� ਨਵਾ� ��ਾ��� ਬਣਾ�"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1743
+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".
 #. * 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:1996
+#: ../libempathy-gtk/empathy-account-widget.c:2028
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s �ੱਤ� %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2022
+#: ../libempathy-gtk/empathy-account-widget.c:2054
 #, c-format
 msgid "%s Account"
 msgstr "%s ��ਾ���"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2026
+#: ../libempathy-gtk/empathy-account-widget.c:2058
 msgid "New account"
 msgstr "ਨਵਾ� ��ਾ���"
 
@@ -756,11 +769,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:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "ਪਾਸਵਰਡ(_w):"
 
@@ -801,7 +814,7 @@ msgid "<b>Example:</b> username"
 msgstr "<b>�ਿਵ�� �ਿ:</b> username"
 
 #: ../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:"
@@ -819,26 +832,23 @@ 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 "Character set:"
+msgid "Ch_aracter set:"
+msgstr "�ੱ�ਰ ਸ�ੱ�(_a):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 msgid "What is your ICQ UIN?"
 msgstr "ਤ�ਹਾਡਾ ICQ UIN �� ਹ�?"
 
-#: ../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:246
-msgid "New Network"
-msgstr "ਨਵਾ� ਨ�ੱ�ਵਰ�"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.c:183
 #: ../libempathy-gtk/empathy-account-widget-sip.c:216
 msgid "Auto"
@@ -904,6 +914,15 @@ msgstr "�ਸਲ� ਨਾ�:"
 msgid "Servers"
 msgstr "ਸਰਵਰ"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#| msgid "What is your AIM screen name?"
+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"
@@ -912,20 +931,31 @@ 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 "_Encryption required (TLS/SSL)"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "�ੰ��ਰਿਪਸ਼ਨ �ਾਹ�ਦ� ਹ� (TLS/SSL)(_y)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#| msgid "_Ignore SSL certificate errors"
+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 "Pri_ority:"
+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):"
 
 #. 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"
@@ -937,50 +967,42 @@ msgstr ""
 "�� ਤ�ਹਾਡ� ��ਲ ਫ�ਸਬ�ੱ� ਯ��਼ਰ ਨਾ� ਨਹ�� ਹ� ਤਾ� �ਹ ��ਣਨ ਵਾਸਤ� <a href=\"http://www.facebook.com/";
 "username/\">�ਹ ਪ��਼</a> ਵਰਤ��।"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "Use old SS_L"
 msgstr "ਪ�ਰਾਣ� SS_L ਵਰਤ��"
 
-#: ../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 "ਤ�ਹਾਡਾ ਫ�ਸਬ�ੱ� ਪਾਸਵਰਡ �� ਹ�?"
 
-#: ../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 "ਤ�ਹਾਡਾ ਫ�ਸਬ�ੱ� ਯ��਼ਰ ਨਾ� �� ਹ�?"
 
-#: ../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 "ਤ�ਹਾਡਾ ���ਲ ID �� ਹ�?"
 
-#: ../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 "ਤ�ਹਾਡਾ ���ਲ ਪਾਸਵਰਡ �� ਹ�?"
 
-#: ../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 "ਤ�ਹਾਡਾ �ੱਬਰ ID �� ਹ�?"
 
-#: ../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 "ਤ�ਹਾਡਾ �ੱਬਰ ਪਾਸਵਰਡ �� ਹ�?"
 
-#: ../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 "ਤ�ਹਾਡਾ �ਾਹ�ਦਾ �ੱਬਰ ID �� ਹ�?"
 
-#: ../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 "ਤ�ਹਾਡਾ �ਾਹ�ਦਾ �ੱਬਰ ਪਾਸਵਰਡ �� ਹ�?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "�ੰ��ਰਿਪਸ਼ਨ �ਾਹ�ਦ� ਹ� (TLS/SSL)(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-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"
@@ -994,25 +1016,27 @@ 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:"
+msgid "E-_mail address:"
+msgstr "�ਮ�ਲ �ਡਰ�ੱਸ(_m):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#| msgid "Nickname:"
+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 "�ੱਬਰ ID(_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):"
@@ -1090,25 +1114,26 @@ msgid "_Username:"
 msgstr "ਯ��਼ਰ ਨਾ�(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#| msgid "_Ignore conference and chat room invitations"
+msgid "I_gnore conference and chat room invitations"
+msgstr "�ਨਫਰੰਸ �ਤ� �ੱਲਬਾਤ ਰ�ਮ ਸੱਦ� �ਣਡਿੱਠ�(_g)"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "Use _Yahoo! Japan"
 msgstr "ਯਾਹ�! �ਾਪਾਨ ਵਰਤ��(_Y)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "ਤ�ਹਾਡਾ ਯਾਹ�! ID �� ਹ�?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
 msgstr "ਤ�ਹਾਡਾ ਯਾਹ�! ਪਾਸਵਰਡ �� ਹ�?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
 msgstr "ਯਾਹ�! I_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
 msgid "_Room List locale:"
 msgstr "ਰ�ਮ ਲਿਸ� ਭਾਸ਼ਾ(_R):"
@@ -1154,39 +1179,39 @@ msgstr "�ਹ �ੱਲਬਾਤ ਲ� ਵਿਸ਼ਾ ਸਹਾ�� ਨਹ
 msgid "You are not allowed to change the topic"
 msgstr "ਤ�ਹਾਨ�ੰ ਵਿਸ਼ਾ ਬਦਲਣ ਦਾ �ਧਿ�ਾਰ ਨਹ�� ਹ�"
 
-#: ../libempathy-gtk/empathy-chat.c:820
+#: ../libempathy-gtk/empathy-chat.c:819
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ਮ���ਦਾ �ੱਲਬਾਤ ਤ�� ਸਭ ਸ�ਨ�ਹ� ਸਾਫ਼ �ਰ�"
 
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:822
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: ਮ���ਦਾ �ੱਲਬਾਤ ਦਾ ਵਿਸ਼ਾ ਸ�ੱ� �ਰ�"
 
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:825
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: ਨਵਾ� �ੱਲਬਾਤ ਰ�ਮ ����ੰਨ �ਰ�"
 
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:828
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: ਨਵਾ� �ੱਲਬਾਤ ਰ�ਮ ����ੰਨ �ਰ�"
 
-#: ../libempathy-gtk/empathy-chat.c:834
+#: ../libempathy-gtk/empathy-chat.c:833
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: ਪ�ਰਾ�ਵ�� �ੱਲਬਾਤ ��ਲ�ਹ�"
 
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:836
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: ਪ�ਰਾ�ਵ�� �ੱਲਬਾਤ �ਰ�"
 
-#: ../libempathy-gtk/empathy-chat.c:841
+#: ../libempathy-gtk/empathy-chat.c:840
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: ਮ���ਦਾ ਸਰਵਰ �ੱਤ� �ਪਣਾ ਨਾ� ਬਦਲ�"
 
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:843
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>:�ੱ� ��ਸ਼ਨ ਸ�ਨ�ਹਾ ਮ���ਦਾ �ੱਲਬਾਤ ਵਿੱ� ਭ���"
 
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:846
 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 "
@@ -1196,7 +1221,7 @@ msgstr ""
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 
-#: ../libempathy-gtk/empathy-chat.c:852
+#: ../libempathy-gtk/empathy-chat.c:851
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1204,84 +1229,84 @@ msgstr ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:861
 #, c-format
 msgid "Usage: %s"
 msgstr "ਵਰਤ��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:891
+#: ../libempathy-gtk/empathy-chat.c:890
 msgid "Unknown command"
 msgstr "�ਣ�ਾਣ �ਮਾ�ਡ"
 
-#: ../libempathy-gtk/empathy-chat.c:1012
+#: ../libempathy-gtk/empathy-chat.c:1011
 msgid "Unknown command; see /help for the available commands"
 msgstr "�ਣ�ਾਣ �ਮਾ�ਡ; �ਪਲੱਬਧ �ਮਾ�ਡ ਵਾਸਤ� ਮੱਦਦ ਲ� /help ਵਰਤ��"
 
-#: ../libempathy-gtk/empathy-chat.c:1150
+#: ../libempathy-gtk/empathy-chat.c:1149
 msgid "offline"
 msgstr "�ਫਲਾ�ਨ"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "invalid contact"
 msgstr "�ਲਤ ਸੰਪਰ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "permission denied"
 msgstr "�ਧਿ�ਾਰ ਪਾਬੰਦ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "too long message"
 msgstr "ਬਹ�ਤ ਲੰਮਾ ਸ�ਨ�ਹਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "not implemented"
 msgstr "ਸਥਾਪਤ ਨਹ��"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1165
 msgid "unknown"
 msgstr "�ਣ�ਾਣ"
 
-#: ../libempathy-gtk/empathy-chat.c:1170
+#: ../libempathy-gtk/empathy-chat.c:1169
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "ਸ�ਨ�ਹਾ '%s' ਭ��ਣ ਦ�ਰਾਨ �ਲਤ�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1280 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
 msgid "Topic:"
 msgstr "ਵਿਸ਼ਾ:"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1291
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ਵਿਸ਼ਾ ਨਹ�� ��ਤਾ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1293
 msgid "No topic defined"
 msgstr "��� ਵਿਸ਼ਾ ਨਹ�� ਦਿੱਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:1773
+#: ../libempathy-gtk/empathy-chat.c:1772
 msgid "(No Suggestions)"
 msgstr "(��� ਸ��ਾ� ਨਹ��)"
 
-#: ../libempathy-gtk/empathy-chat.c:1827
+#: ../libempathy-gtk/empathy-chat.c:1826
 msgid "Insert Smiley"
 msgstr "�ਿਹਰਾ ਸ਼ਾਮਲ �ਰ�"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1845
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
 msgid "_Send"
 msgstr "ਭ���(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1879
+#: ../libempathy-gtk/empathy-chat.c:1878
 msgid "_Spelling Suggestions"
 msgstr "ਸਪ�ਲਿੰ� ਸ��ਾ�(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1956
+#: ../libempathy-gtk/empathy-chat.c:1955
 msgid "Failed to retrieve recent logs"
 msgstr "ਤਾ�਼ਾ ਲਾ� ਲ�ਣ ਲ� ਫ�ਲ�ਹ"
 
-#: ../libempathy-gtk/empathy-chat.c:2062
+#: ../libempathy-gtk/empathy-chat.c:2061
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ਡਿਸ-��ਨ��� ਹ� �ਿ� ਹ�"
@@ -1289,12 +1314,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:2069
+#: ../libempathy-gtk/empathy-chat.c:2068
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ਨ� %1$s ਨ�ੰ �ਿੱ� ਮਾਰ�"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2071
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ਨ�ੰ �ਿੱ� ਮਾਰ�"
@@ -1302,17 +1327,17 @@ msgstr "%s ਨ�ੰ �ਿੱ� ਮਾਰ�"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2080
+#: ../libempathy-gtk/empathy-chat.c:2079
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ਵਲ�� %1$s �ੱਤ� ਪਾਬੰਦ� ਲਾ�"
 
-#: ../libempathy-gtk/empathy-chat.c:2083
+#: ../libempathy-gtk/empathy-chat.c:2082
 #, c-format
 msgid "%s was banned"
 msgstr "%s �ੱਤ� ਪਾਬੰਦ� ਲਾ�"
 
-#: ../libempathy-gtk/empathy-chat.c:2087
+#: ../libempathy-gtk/empathy-chat.c:2086
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ਨ� ਰ�ਮ �ੱਡਿ�"
@@ -1322,47 +1347,47 @@ msgstr "%s ਨ� ਰ�ਮ �ੱਡਿ�"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2096
+#: ../libempathy-gtk/empathy-chat.c:2095
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2121
+#: ../libempathy-gtk/empathy-chat.c:2120
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ਰ�ਮ ਵਿੱ� ਦਾ�ਲ ਹ���"
 
-#: ../libempathy-gtk/empathy-chat.c:2146
+#: ../libempathy-gtk/empathy-chat.c:2145
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ਨ�ੰ ਹ�ਣ %s ਵ��� �ਾਣਿ� �ਾਵ��ਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:2285 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
 msgid "Disconnected"
 msgstr "��ਨ��ਸ਼ਨ �ਤਮ"
 
-#: ../libempathy-gtk/empathy-chat.c:2923
+#: ../libempathy-gtk/empathy-chat.c:2922
 msgid "Wrong password; please try again:"
 msgstr "�ਲਤ ਪਾਸਵਰਡ; ਮ�� ��ਸ਼ਿਸ਼ �ਰ� ��:"
 
-#: ../libempathy-gtk/empathy-chat.c:2924
+#: ../libempathy-gtk/empathy-chat.c:2923
 msgid "Retry"
 msgstr "ਮ��-��ਸ਼ਿਸ਼"
 
-#: ../libempathy-gtk/empathy-chat.c:2929
+#: ../libempathy-gtk/empathy-chat.c:2928
 msgid "This room is protected by a password:"
 msgstr "�ਹ ਰ�ਮ ਪਾਸਵਰਡ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਹ�:"
 
-#: ../libempathy-gtk/empathy-chat.c:2930
+#: ../libempathy-gtk/empathy-chat.c:2929
 msgid "Join"
 msgstr "ਦਾ�ਲ"
 
-#: ../libempathy-gtk/empathy-chat.c:3070
+#: ../libempathy-gtk/empathy-chat.c:3069
 msgid "Connected"
 msgstr "��ਨ��� ��ਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:3123
-#: ../libempathy-gtk/empathy-log-window.c:639
+#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "�ੱਲਬਾਤ"
 
@@ -1385,6 +1410,7 @@ msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
 msgid "Edit Contact Information"
 msgstr "ਸੰਪਰ� �ਾਣ�ਾਰ� ਸ�ਧ"
 
@@ -1406,84 +1432,85 @@ msgid "Subscription Request"
 msgstr "ਮ��ਬਰ� ਮੰ�"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2025
+#: ../libempathy-gtk/empathy-individual-view.c:2244
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "�� ਤ�ਸ�� �ਰ�ੱਪ '%s' ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2028
+#: ../libempathy-gtk/empathy-individual-view.c:2247
 msgid "Removing group"
 msgstr "�ਰ�ੱਪ ਹ�ਾ�� �ਾ ਰਿਹਾ ਹ�"
 
 #. Remove
 #: ../libempathy-gtk/empathy-contact-list-view.c:2055
 #: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2167
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2386
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "ਹ�ਾ�(_R)"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2113
+#: ../libempathy-gtk/empathy-individual-view.c:2332
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "�� ਤ�ਸ�� ਸੰਪਰ� '%s' ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2115
+#: ../libempathy-gtk/empathy-individual-view.c:2334
 msgid "Removing contact"
 msgstr "ਸੰਪਰ� ਹ�ਾ�� �ਾ ਰਿਹਾ ਹ�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:233
+#: ../libempathy-gtk/empathy-individual-menu.c:364
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "ਸੰਪਰ� ਸ਼ਾਮਲ(_A)..."
 
 #: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:273
+#: ../libempathy-gtk/empathy-individual-menu.c:489
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "�ੱਲਬਾਤ(_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:530
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "�ਡ�� �ਾਲ(_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:356
+#: ../libempathy-gtk/empathy-individual-menu.c:572
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "ਵਿਡ�� �ਾਲ(_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:408
+#: ../libempathy-gtk/empathy-individual-menu.c:630
 #: ../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:449
+#: ../libempathy-gtk/empathy-individual-menu.c:671
 msgid "Send File"
 msgstr "ਫਾ�ਲ ਭ���"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:491
+#: ../libempathy-gtk/empathy-individual-menu.c:713
 msgid "Share My Desktop"
 msgstr "ਮ�ਰਾ ਡ�ਸ��ਾਪ ਸ਼��ਰ �ਰ�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1801
-#: ../libempathy-gtk/empathy-individual-menu.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-individual-menu.c:747
+#: ../libempathy-gtk/empathy-individual-widget.c:1288
 msgid "Favorite"
 msgstr "ਪਸੰਦ"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:552
+#: ../libempathy-gtk/empathy-individual-menu.c:774
 msgid "Infor_mation"
 msgstr "�ਾਣ�ਾਰ�(_m)"
 
@@ -1493,13 +1520,13 @@ msgid "_Edit"
 msgstr "ਸ�ਧ(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:696
+#: ../libempathy-gtk/empathy-individual-menu.c:967
 #: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "�ਸ ਰ�ਮ ਲ� ਤ�ਹਾਨ�ੰ ਸੱਦਾ"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:734
+#: ../libempathy-gtk/empathy-individual-menu.c:1014
 msgid "_Invite to Chat Room"
 msgstr "�ੱਲਬਾਤ ਰ�ਮ ਲ� ਸੱਦਾ(_I)"
 
@@ -1507,149 +1534,179 @@ msgstr "�ੱਲਬਾਤ ਰ�ਮ ਲ� ਸੱਦਾ(_I)"
 msgid "Select a contact"
 msgstr "ਸੰਪਰ� ��ਣ�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-individual-widget.c:148
 msgid "Full name:"
 msgstr "ਪ�ਰਾ ਨਾ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
 msgid "Phone number:"
 msgstr "ਫ�ਨ ਨੰਬਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
 msgid "E-mail address:"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:222
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
 msgid "Website:"
 msgstr "ਵ�ੱਬਸਾ��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:223
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
 msgid "Birthday:"
 msgstr "�ਨਮਦਿਨ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "Select"
-msgstr "��ਣ�"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../src/empathy-main-window.c:1231
-msgid "Group"
-msgstr "�ਰ�ੱਪ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "Country ISO Code:"
 msgstr "ਦ�ਸ਼ ISO ��ਡ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:843
+#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Country:"
 msgstr "ਦ�ਸ਼:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:845
+#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "State:"
 msgstr "ਹਾਲਤ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "City:"
 msgstr "ਸ਼ਹਿਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:849
+#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Area:"
 msgstr "�ਰ��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:851
+#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Postal Code:"
 msgstr "ਡਾ� ��ਡ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:853
+#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Street:"
 msgstr "�ਲ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:855
+#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Building:"
 msgstr "�ਮਾਰਤ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:857
+#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Floor:"
 msgstr "ਮੰ�਼ਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:859
+#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Room:"
 msgstr "�ਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Text:"
 msgstr "���ਸ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Description:"
 msgstr "ਵ�ਰਵਾ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Accuracy Level:"
 msgstr "ਸ਼�ੱਧਤਾ ਲ�ਵਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:869
+#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Error:"
 msgstr "�ਲਤ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Vertical Error (meters):"
 msgstr "ਵਰ���ਲ �ਲਤ� (ਮ��ਰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:873
+#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Horizontal Error (meters):"
 msgstr "ਹਰ��ੱ�ਲ �ਲਤ� (ਮ��ਰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:875
+#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Speed:"
 msgstr "�ਤ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:877
+#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Bearing:"
 msgstr "ਬ�ਰਿੰ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:879
+#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Climb Speed:"
 msgstr "���ਹਨ �ਤ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:881
+#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Last Updated on:"
 msgstr "��ਰ� �ੱਪਡ��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:883
+#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Longitude:"
 msgstr "ਲੰਬ�ਾਰ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:885
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Latitude:"
 msgstr "ਵਿਥ�ਾਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:887
+#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Altitude:"
 msgstr "��ਾ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:950
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-individual-widget.c:578
+#: ../libempathy-gtk/empathy-individual-widget.c:595
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "�ਿ�ਾਣਾ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:966
-msgid "<b>Location</b>, "
-msgstr "<b>�ਿ�ਾਣਾ</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-individual-widget.c:597
+#, c-format
+#| msgid "%s of %s"
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:646
 msgid "%B %e, %Y at %R UTC"
 msgstr "%R UTC %e %B %Y ਨ�ੰ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1100
+#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-individual-widget.c:837
 msgid "Save Avatar"
 msgstr "�ਵਤਾਰ ਸੰਭਾਲ�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1156
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:895
 msgid "Unable to save avatar"
 msgstr "�ਵਤਾਰ ਸੰਭਾਲਣ ਲ� �ਸਮਰੱਥ"
 
@@ -1657,7 +1714,9 @@ msgstr "�ਵਤਾਰ ਸੰਭਾਲਣ ਲ� �ਸਮਰੱਥ"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>�ਿ�ਾਣਾ</b> (date) ਨ�ੰ\t"
 
+#. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1223
 msgid "Alias:"
 msgstr "�ਪ-ਨਾ�:"
 
@@ -1670,27 +1729,35 @@ msgid "Client:"
 msgstr "�ਲਾ��:"
 
 #: ../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:7
-msgid "Groups"
-msgstr "�ਰ�ੱਪ"
-
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1427
 msgid "Identifier:"
 msgstr "ਪ�ਾਣ�ਰਤਾ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../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:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#: ../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."
@@ -1698,35 +1765,86 @@ msgstr ""
 "�ਰ�ੱਪ ��ਣ�, �ਿਸ ਵਿੱ� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਨ�ੰ ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�। ਯਾਦ ਰੱ�� �ਿ ਤ�ਸ�� �ੱ� ਤ�� ਵੱਧ �ਰ�ੱਪ �ਾ� ��� "
 "�ਰ�ੱਪ ਨਹ�� ਵ� ��ਣ ਸ�ਦ� ਹ�।"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
-msgid "Version:"
-msgstr "ਵਰ�ਨ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-groups-widget.c:363
 msgid "_Add Group"
 msgstr "�ਰ�ੱਪ ਸ਼ਾਮਲ(_A)"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:250
-#| msgid "Select a contact"
+#: ../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:1247
+msgid "Group"
+msgstr "�ਰ�ੱਪ"
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
+#| msgid "_Link"
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "ਲਿੰ� ਹ�ਾ�(_U)"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+#| msgid "Link Contacts"
+msgid "Linked Contacts"
+msgstr "ਲਿੰ� ��ਤ� ਸੰਪਰ�"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:353
 msgid "Select contacts to link"
 msgstr "ਲਿੰ� �ਰਨ ਲ� ਸੰਪਰ� ��ਣ�"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:298
-#| msgid "New Contact"
+#: ../libempathy-gtk/empathy-individual-linker.c:426
 msgid "New contact preview"
 msgstr "ਨਵਾ� ਸੰਪਰ� �ਲ�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:608
+#: ../libempathy-gtk/empathy-individual-linker.c:470
+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:112
+#, c-format
+#| msgid " (%s)"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:825
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ਸ�ਧ(_E)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:638
-#| msgid "_Joinâ?¦"
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:857
 msgctxt "Link individual (contextual menu)"
 msgid "_Linkâ?¦"
 msgstr "ਲਿੰ� �ਰ�(_L)�"
 
+#: ../libempathy-gtk/empathy-individual-widget.c:1565
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "ਮ��ਾ-ਸੰਪਰ� %u ਸੰਪਰ� ਰੱ�ਦਾ ਹ�"
+msgstr[1] "ਮ��ਾ-ਸੰਪਰ� %u ਸੰਪਰ� ਰੱ�ਦਾ ਹ�"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+#| msgid "<b>Location</b> at (date)\t"
+msgid "<b>Location</b> at (date)"
+msgstr "<b>�ਿ�ਾਣਾ</b> (date) ਨ�ੰ"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "ਨਵਾ� ਨ�ੱ�ਵਰ�"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#| msgid "Edit the selected IRC network"
+msgid "Choose an IRC network"
+msgstr "IRC ਨ�ੱ�ਵਰ� ��ਣ�"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "ਨਵਾ� ਸਰਵਰ"
@@ -1743,39 +1861,55 @@ msgstr "ਪ�ਰ�"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:92
-#| msgid "_Offline Contacts"
+#. 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:109
 msgid "Link Contacts"
 msgstr "ਸੰਪਰ� ਲਿੰ� �ਰ�"
 
 #. Add button
-#: ../libempathy-gtk/empathy-linking-dialog.c:102
-#| msgid "_Open Link"
+#. 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:122
 msgid "_Link"
 msgstr "ਲਿੰ� �ਰ�(_L)"
 
-#: ../libempathy-gtk/empathy-log-window.c:632
+#: ../libempathy-gtk/empathy-log-window.c:646
 #: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "��ਾ���"
 
-#: ../libempathy-gtk/empathy-log-window.c:649
+#: ../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
+msgid "Find Next"
+msgstr "�ੱ�� ਲੱਭ�"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#| msgid "Video Preview"
+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):"
 
@@ -1800,9 +1934,8 @@ msgstr "ਵਿਡ�� ਭ���(_V)"
 
 #. add chat button
 #: ../libempathy-gtk/empathy-new-call-dialog.c:213
-#: ../src/empathy-call-window.ui.h:24
-msgid "_Call"
-msgstr "�ਾਲ �ਰ�(_C)"
+msgid "C_all"
+msgstr "�ਾਲ(_a)"
 
 #. Tweak the dialog
 #: ../libempathy-gtk/empathy-new-call-dialog.c:223
@@ -1930,15 +2063,95 @@ msgstr "ਸਾਫ਼"
 msgid "Blue"
 msgstr "ਨ�ਲਾ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1697
+#: ../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 certrificate is not signed by a Certification Authority"
+msgstr "ਸਰ��ਫਿ��� ਨ�ੰ ਸਰ��ਫਿ��� �ਥਾਰ�� ਵਲ�� ਸਾ�ਨ ਨਹ�� ��ਤਾ �ਿ�"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+#| msgid "Certificate expired"
+msgid "The certificate has expired"
+msgstr "ਸਰ��ਫਿ��� ਦ� ਮਿ�ਦ ਪ�ੱ��"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+#| msgid "Certificate not 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"
+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 "Certificate 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"
+msgstr "ਸਰ��ਫਿ��� ਨ�ੰ ਸਰ��ਫਿ��� �ਥਾਰ�� ਵਲ�� ਮਨਸ�� ��ਤਾ �ਾ ��ੱ�ਾ ਹ�"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+#| msgid ""
+#| "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+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 "Certificate is invalid"
+msgid "The certificate is malformed"
+msgstr "ਸਰ��ਫਿ��� ਨਿ�ਾਰਾ ਹ�"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+#| msgid "Certificate hostname mismatch"
+msgid "Expected hostname: %s"
+msgstr "�ਾਹ�ਦਾ ਹ�ਸ� ਨਾ�: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+#| msgid "Certificate hostname mismatch"
+msgid "Certificate hostname: %s"
+msgstr "ਸਰ��ਫਿ��� ਹ�ਸ�-ਨਾ�: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#| msgid "Context"
+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 expired"
+msgid "Certificate Details"
+msgstr "ਸਰ��ਫਿ��� ਵ�ਰਵਾ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
 msgid "Unable to open URI"
 msgstr "URI ��ਲ�ਹਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1792
+#: ../libempathy-gtk/empathy-ui-utils.c:1793
 msgid "Select a file"
 msgstr "ਫਾ�ਲ ��ਣ�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1861
+#: ../libempathy-gtk/empathy-ui-utils.c:1862
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s ਵਲ�� ਫਾ�ਲ � ਰਹ� ਹ�"
@@ -2122,8 +2335,7 @@ msgstr "��ਣਿ� ਸੰਪਰ� �ਫਲਾ�ਨ ਹ�।"
 msgid "No error message"
 msgstr "��� �ਲਤ� ਸ�ਨ�ਹਾ ਨਹ��"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
 msgid "Instant Message (Empathy)"
 msgstr "ਤ�ਰੰਤ ਸ�ਨ�ਹਾ (�ੰਪ�ਥ�)"
 
@@ -2211,7 +2423,7 @@ msgstr ""
 "ਬਾ�ਦ ਵਿੱ� ਸ�ਧ ਮ�ਨ� ਵਿੱ��� ��ਾ��� ਸ਼ਾਮਲ �ਰ ਸ�ਦ� ਹ�।"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1311
+#: ../src/empathy-account-assistant.c:1310
 msgid "An error occurred"
 msgstr "�ਲਤ� ��"
 
@@ -2220,36 +2432,36 @@ msgstr "�ਲਤ� ��"
 #. 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:604
+#: ../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:510
+#: ../src/empathy-account-assistant.c:509
 msgid "What kind of chat account do you have?"
 msgstr "ਤ�ਹਾਡ� ��ਲ �ਿਸ �ਿਸਮ ਦਾ ��� ��ਾ��� ਹ�?"
 
-#: ../src/empathy-account-assistant.c:516
+#: ../src/empathy-account-assistant.c:515
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "�� ਤ�ਹਾਡ� ��ਲ ਹ�ਰ ��� ��ਾ��� ਹ�, �� ਤ�ਸ�� ਸ�ੱ��ੱਪ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../src/empathy-account-assistant.c:522
+#: ../src/empathy-account-assistant.c:521
 msgid "Enter your account details"
 msgstr "�ਪਣ� ��ਾ��� ਦਾ ਵ�ਰਵਾ ਦਿ�"
 
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:526
 msgid "What kind of chat account do you want to create?"
 msgstr "�ਿਸ �ਿਸਮ ਦਾ ��� ��ਾ��� ਤ�ਸ�� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../src/empathy-account-assistant.c:533
+#: ../src/empathy-account-assistant.c:532
 msgid "Do you want to create other chat accounts?"
 msgstr "�� ਤ�ਸ�� ਹ�ਰ ��� ��ਾ��� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../src/empathy-account-assistant.c:540
+#: ../src/empathy-account-assistant.c:539
 msgid "Enter the details for the new account"
 msgstr "ਨਵ�� ��ਾ��� ਲ� ਵ�ਰਵਾ ਦਿ�"
 
-#: ../src/empathy-account-assistant.c:655
+#: ../src/empathy-account-assistant.c:654
 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 "
@@ -2260,41 +2472,41 @@ msgstr ""
 "ਲਾ�ਨ �ਤ� ਹ�ਰ ��ਤ ਪਰ��ਰਾਮਾ� ਨਾਲ �ੱਲਾ� �ਰ ਸ�ਦ� ਹ�। ਮਾ��ਰ�ਫ�ਨ �ਾ� ਵ�ੱਬ ��ਮ ਨਾਲ ਤ�ਸ�� �ਡ�� �ਤ� "
 "ਵਿਡ�� �ਾਲ ਵ� �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../src/empathy-account-assistant.c:672
+#: ../src/empathy-account-assistant.c:671
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "�� ਤ�ਹਾਡ� ��ਲ ��� ��ਾ��� ਹ�, �� �ਿ ਤ�ਸ�� ਹ�ਰ ��� ਪਰ��ਰਾਮ ਨਾਲ ਵਰਤਦ� ਰਹ� ਹ�?"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:694
 msgid "Yes, import my account details from "
 msgstr "ਹਾ�, ਮ�ਰਾ ��ਾ��� ਵ�ਰਵਾ ਲਵ� "
 
-#: ../src/empathy-account-assistant.c:716
+#: ../src/empathy-account-assistant.c:715
 msgid "Yes, I'll enter my account details now"
 msgstr "ਹਾ�, ਮ�� �ਪਣਾ ��ਾ��� ਵ�ਰਵਾ ਹ�ਣ ਦ�ਵਾ��ਾ"
 
-#: ../src/empathy-account-assistant.c:738
+#: ../src/empathy-account-assistant.c:737
 msgid "No, I want a new account"
 msgstr "ਨਹ��, ਮ�� ਨਵਾ� ��ਾ��� �ਾਹ�ੰਦਾ ਹਾ�"
 
-#: ../src/empathy-account-assistant.c:748
+#: ../src/empathy-account-assistant.c:747
 msgid "No, I just want to see people online nearby for now"
 msgstr "ਨਹ��, ਮ�� ਸਿਰਫ਼ ਹ�ਣ �ਪਣ� ਨ��� �ਨਲਾ�ਨ ਲ��ਾ� ਨ�ੰ ਵ��ਣਾ �ਾਹ�ੰਦਾ ਹਾ�"
 
-#: ../src/empathy-account-assistant.c:769
+#: ../src/empathy-account-assistant.c:768
 msgid "Select the accounts you want to import:"
 msgstr "��ਾ��� ��ਣ�, �� ਤ�ਸ�� �ੰਪ�ਰ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�:"
 
-#: ../src/empathy-account-assistant.c:853
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "ਹਾ�"
 
-#: ../src/empathy-account-assistant.c:860
+#: ../src/empathy-account-assistant.c:859
 msgid "No, that's all for now"
 msgstr "ਨਹ��, ਹ�ਣ ਲ� �ਾਫ਼� ਹ�"
 
-#: ../src/empathy-account-assistant.c:1125
+#: ../src/empathy-account-assistant.c:1124
 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 "
@@ -2305,16 +2517,16 @@ msgstr ""
 "�ਹ ਫ��ਰ ਵਰਤਣਾ �ਾਹ�ੰਦ� ਹ� ਤਾ� ��ੱ� �ਰ� �ਿ ਹ�ਠਾ� ਦਿੱਤ� �ਾਣ�ਾਰ� ਪ�ਰ� ਹ�। ਤ�ਸ�� �ਹ ਵ�ਰਵਾ ਬਾ�ਦ "
 "ਵਿੱ� ਵ� ਸ��� ਤਰ�ਹਾ� ਬਦਲ ਸ�ਦ� ਹ� �ਾ� '��ਾ���' ਡਾ�ਲਾ� ਦ� ਵਰਤ�� �ਰ�� �ਹ ਫ��ਰ ਬੰਦ �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../src/empathy-account-assistant.c:1131
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1186
 msgid "Edit->Accounts"
 msgstr "ਸ�ਧ->��ਾ���"
 
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1146
 msgid "I don't want to enable this feature for now"
 msgstr "ਮ�� �ਹ ਫ��ਰ ਹ�ਣ� �ਾਲ� ਨਹ�� �ਰਨਾ �ਾਹ�ੰਦਾ"
 
-#: ../src/empathy-account-assistant.c:1183
+#: ../src/empathy-account-assistant.c:1182
 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 "
@@ -2325,23 +2537,23 @@ msgstr ""
 "�ੰਸ�ਾਲ ਨਹ�� ਹ�। �� ਤ�ਸ�� �ਹ ਫ��ਰ �ਾਲ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ� ਤਾ� telepathy-salut ਪ���� �ੰਸ�ਾਲ �ਰ� "
 "�ਤ� ��ਾ��� ਡਾ�ਲਾ� ਤ�� ਨ��ਲ� ਲ�� ��ਾ��� ਬਣਾ�।"
 
-#: ../src/empathy-account-assistant.c:1189
+#: ../src/empathy-account-assistant.c:1188
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut �ੰਸ�ਾਲ ਨਹ�� ਹ�"
 
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1234
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "ਸ�ਨ�ਹ� �ਤ� VoIP ��ਾ��� ਸਹਾ��"
 
-#: ../src/empathy-account-assistant.c:1269
+#: ../src/empathy-account-assistant.c:1268
 msgid "Welcome to Empathy"
 msgstr "�ੰਪ�ਥ� ਵਲ�� �� ���� ਨ�ੰ"
 
-#: ../src/empathy-account-assistant.c:1278
+#: ../src/empathy-account-assistant.c:1277
 msgid "Import your existing accounts"
 msgstr "�ਪਣ� ਮ���ਦਾ ��ਾ��� �ੰਪ�ਰ� �ਰ�"
 
-#: ../src/empathy-account-assistant.c:1296
+#: ../src/empathy-account-assistant.c:1295
 msgid "Please enter personal details"
 msgstr "ਨਿੱ�� ਵ�ਰਵਾ ਦਿ�"
 
@@ -2358,33 +2570,33 @@ msgstr "ਤ�ਹਾਡ� ��ਾ��� %s ਨਾਲ ਸਬੰਧਿਤ 
 msgid "Your new account has not been saved yet."
 msgstr "ਤ�ਹਾਡਾ ਨਵਾ� ��ਾ��� ਹਾਲ� ਨਹ�� ਸੰਭਾਲਿ� �ਿ� ਹ�।"
 
-#: ../src/empathy-accounts-dialog.c:271 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
 msgid "Connectingâ?¦"
 msgstr "��ਨ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../src/empathy-accounts-dialog.c:312
+#: ../src/empathy-accounts-dialog.c:322
 #, c-format
 msgid "Offline â?? %s"
 msgstr "à¨?ਫਲਾà¨?ਨ â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:324
+#: ../src/empathy-accounts-dialog.c:334
 #, c-format
 msgid "Disconnected â?? %s"
 msgstr "à¨?à©?ਨà©?à¨?ਸ਼ਨ à¨?ਤਮ  â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:335
+#: ../src/empathy-accounts-dialog.c:345
 msgid "Offline â?? No Network Connection"
 msgstr "à¨?ਫਲਾà¨?ਨ â?? à¨?à©?à¨? ਨà©?ੱà¨?ਵਰà¨? à¨?à©?ਨà©?à¨?ਸ਼ਨ ਨਹà©?à¨?"
 
-#: ../src/empathy-accounts-dialog.c:342
+#: ../src/empathy-accounts-dialog.c:352
 msgid "Unknown Status"
 msgstr "�ਣ�ਾਣ ਹਾਲਤ"
 
-#: ../src/empathy-accounts-dialog.c:354
+#: ../src/empathy-accounts-dialog.c:364
 msgid "Offline â?? Account Disabled"
 msgstr "à¨?ਫਲਾà¨?ਨ â?? à¨?à¨?ਾà¨?à¨?à¨? à¨?ਯà©?à¨? ਹà©?"
 
-#: ../src/empathy-accounts-dialog.c:795
+#: ../src/empathy-accounts-dialog.c:805
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2392,16 +2604,16 @@ msgstr ""
 "ਤ�ਸ�� ਨਵਾ� ��ਾ��� ਬਣਾ�ਣ �ਾ ਰਹ� ਹ�, �� �ਿ ਤ�ਹਾਡ� ਬਦਲਾ� �ਤਮ �ਰ ਦ�ਵ��ਾ।\n"
 "�� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../src/empathy-accounts-dialog.c:1142
+#: ../src/empathy-accounts-dialog.c:1152
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "�� ਤ�ਸ�� �ਪਣ� �ੰਪਿ��ਰ ਤ�� %s ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../src/empathy-accounts-dialog.c:1146
+#: ../src/empathy-accounts-dialog.c:1156
 msgid "This will not remove your account on the server."
 msgstr "�ਹ ਸਰਵਰ ਤ�� ਤ�ਹਾਡਾ ��ਾ��� ਨਹ�� ਹ�ਾ��ਾ।"
 
-#: ../src/empathy-accounts-dialog.c:1383
+#: ../src/empathy-accounts-dialog.c:1394
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2409,7 +2621,7 @@ msgstr ""
 "ਤ�ਸ�� ਨਵਾ� ��ਾ��� ��ਣਨ �ਾ ਰਹ� ਹ�, �� �ਿ ਤ�ਹਾਡ� ਬਦਲਾ� �ਣਡਿੱਠ� �ਰ ਦ�ਵ��ਾ।\n"
 "�� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../src/empathy-accounts-dialog.c:1960
+#: ../src/empathy-accounts-dialog.c:1997
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2418,14 +2630,19 @@ msgstr ""
 "�ਣਡਿੱਠ� ��ਤ� �ਾਣ��। �� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+#| msgid "Contact information"
+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."
@@ -2433,15 +2650,25 @@ 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-auto-salut-account-helper.c:78
+#: ../src/empathy-auth-client.c:217
+#| msgid "- Empathy Audio/Video Client"
+msgid " - Empathy authentication client"
+msgstr "- �ੰਪ�ਥ� ਪਰਮਾਣ�ਿਤਾ �ਲਾ��"
+
+#: ../src/empathy-auth-client.c:233
+#| msgid "Empathy Audio/Video Client"
+msgid "Empathy authentication client"
+msgstr "�ੰਪ�ਥ� ਪਰਮਾਣ�ਿਤਾ �ਲਾ��"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
 msgstr "ਨ��ਲ� ਲ��"
 
@@ -2681,6 +2908,10 @@ msgstr "ਵਿਡ�� �ਾਲ�"
 msgid "Video Preview"
 msgstr "ਵਿਡ�� �ਲ�"
 
+#: ../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)"
@@ -2809,81 +3040,87 @@ msgstr "���-��ਨ���"
 msgid "Manage Favorite Rooms"
 msgstr "ਪਸੰਦ�ਦਾ ਰ�ਮ ਪਰਬੰਧ"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:468
 msgid "Incoming video call"
 msgstr "� ਰਹ� ਵਿਡ�� �ਾਲ"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:468
 msgid "Incoming call"
 msgstr "� ਰਹ� �ਾਲ"
 
-#: ../src/empathy-event-manager.c:477
+#: ../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:478
+#: ../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:481 ../src/empathy-event-manager.c:623
+#: ../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:506
+#: ../src/empathy-event-manager.c:501
 msgid "_Reject"
 msgstr "ਰੱਦ �ਰ�(_R)"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:507
 msgid "_Answer"
 msgstr "�ਵਾਬ ਦਿ�(_A)"
 
-#: ../src/empathy-event-manager.c:623
+#: ../src/empathy-event-manager.c:618
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s ਤ�� ਵਿਡ�� �ਾਲ � ਰਹ� ਹ�"
 
-#: ../src/empathy-event-manager.c:700
+#: ../src/empathy-event-manager.c:695
 msgid "Room invitation"
 msgstr "ਰ�ਮ ਸੱਦਾ"
 
-#: ../src/empathy-event-manager.c:702
+#: ../src/empathy-event-manager.c:697
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s ����ੰਣ �ਰਨ ਲ� ਸੱਦਾ"
 
-#: ../src/empathy-event-manager.c:709
+#: ../src/empathy-event-manager.c:704
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ਤ�ਹਾਨ�ੰ %s ����ੰਨ �ਰਨ ਲ� ਸੱਦ ਰਿਹਾ ਹ�"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:712
 msgid "_Decline"
 msgstr "�ਨ�ਾਰ(_D)"
 
-#: ../src/empathy-event-manager.c:722
+#: ../src/empathy-event-manager.c:717
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "ਦਾ�ਲ(_J)"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:743
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ਨ� ਤ�ਹਾਨ�ੰ %s ਦਾ�ਲ ਹ�ਣ ਲ� ਸੱਦਿ�"
 
-#: ../src/empathy-event-manager.c:787
+#: ../src/empathy-event-manager.c:749
+#, c-format
+#| msgid "You have been invited to join a chat conference."
+msgid "You have been invited to join %s"
+msgstr "ਤ�ਹਾਨ�ੰ %s ����ੰਨ �ਰਨ ਲ� ਸੱਦਾ ��� ਹ�"
+
+#: ../src/empathy-event-manager.c:797
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s ਤ�� � ਰਿਹਾ ਫਾ�ਲ ਸੰ�ਾਰ"
 
-#: ../src/empathy-event-manager.c:988
+#: ../src/empathy-event-manager.c:1005
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s ਵਲ�� ਮ��ਬਰ� �ਾਹ�ਦ� ਹ�"
 
-#: ../src/empathy-event-manager.c:992
+#: ../src/empathy-event-manager.c:1009
 #, c-format
 msgid ""
 "\n"
@@ -2892,12 +3129,12 @@ msgstr ""
 "\n"
 "ਸ�ਨ�ਹਾ: %s"
 
-#: ../src/empathy-event-manager.c:1035
+#: ../src/empathy-event-manager.c:1052
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ਹ�ਣ �ਫਲਾ�ਨ ਹ�।"
 
-#: ../src/empathy-event-manager.c:1055
+#: ../src/empathy-event-manager.c:1072
 #, c-format
 msgid "%s is now online."
 msgstr "%s ਹ�ਣ �ਨਲਾ�ਨ ਹ�।"
@@ -3038,33 +3275,31 @@ msgstr "ਪਰ����ਾਲ"
 msgid "Source"
 msgstr "ਸਰ�ਤ"
 
-#. Labels for empty contact list
-#: ../src/empathy-main-window.c:95
-#| msgid "No topic defined"
+#: ../src/empathy-main-window.c:383
 msgid "No match found"
 msgstr "��� ਮ�ਲ ਨਹ�� ਲੱਭਿ�"
 
-#: ../src/empathy-main-window.c:519
+#: ../src/empathy-main-window.c:535
 msgid "Reconnect"
 msgstr "ਮ��-��ਨ���"
 
-#: ../src/empathy-main-window.c:525
+#: ../src/empathy-main-window.c:541
 msgid "Edit Account"
 msgstr "��ਾ��� ਸ�ਧ"
 
-#: ../src/empathy-main-window.c:531
+#: ../src/empathy-main-window.c:547
 msgid "Close"
 msgstr "ਬੰਦ �ਰ�"
 
-#: ../src/empathy-main-window.c:1213
+#: ../src/empathy-main-window.c:1229
 msgid "Contact"
 msgstr "ਸੰਪਰ�"
 
-#: ../src/empathy-main-window.c:1538
+#: ../src/empathy-main-window.c:1554
 msgid "Contact List"
 msgstr "ਸੰਪਰ� ਲਿਸ�"
 
-#: ../src/empathy-main-window.c:1647
+#: ../src/empathy-main-window.c:1663
 msgid "Show and edit accounts"
 msgstr "��ਾ��� ਵ��� �ਤ� ਸ�ਧ�"
 
@@ -3158,29 +3393,34 @@ 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:605
+#: ../src/empathy-new-chatroom-dialog.c:607
 #, c-format
+#| msgid ""
+#| "<b>%s</b>\n"
+#| "Invite required: %s\n"
+#| "Password required: %s\n"
+#| "Members: %s"
 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:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "No"
 msgstr "ਨਹ��"
 
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:638
 msgid "Could not start room listing"
 msgstr "ਰ�ਮ ਲਿਸ� �ਰਨਾ ਸ਼�ਰ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:648
 msgid "Could not stop room listing"
 msgstr "ਰ�ਮ ਲਿਸ� �ਰਨਾ ਰ��ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
@@ -3210,39 +3450,39 @@ msgstr "ਰ�ਮ ਲਿਸ�"
 msgid "_Room:"
 msgstr "ਰ�ਮ(_R):"
 
-#: ../src/empathy-preferences.c:136
+#: ../src/empathy-preferences.c:138
 msgid "Message received"
 msgstr "ਸ�ਨ�ਹਾ ਮਿਲਿ�"
 
-#: ../src/empathy-preferences.c:137
+#: ../src/empathy-preferences.c:139
 msgid "Message sent"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ�"
 
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:140
 msgid "New conversation"
 msgstr "ਨਵ�� �ੱਲਬਾਤ"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes online"
 msgstr "ਸੰਪਰ� �ਨਲਾ�ਨ ਹ���"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes offline"
 msgstr "ਸੰਪਰ� ਬੰਦ �ਰ �ਿ�"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:143
 msgid "Account connected"
 msgstr "��ਾ��� ��ਨ��� ��ਤਾ"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:144
 msgid "Account disconnected"
 msgstr "��ਾ��� ��ਨ��ਸ਼ਨ ਬੰਦ ਹ���"
 
-#: ../src/empathy-preferences.c:437
+#: ../src/empathy-preferences.c:445
 msgid "Language"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../src/empathy-preferences.c:873
+#: ../src/empathy-preferences.c:882
 msgid "Preferences"
 msgstr "ਪਸੰਦ"
 
@@ -3295,18 +3535,23 @@ msgid "Location sources:"
 msgstr "�ਿ�ਾਣਾ ਸਰ�ਤ:"
 
 #: ../src/empathy-preferences.ui.h:14
+#| msgid "Conversations"
+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
+#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "ਪਰਾ�ਵ�ਸ�"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:18
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3315,66 +3560,66 @@ msgstr ""
 "�ਿ�ਾਣਾ ਸ਼�ੱਧਤਾ ��ਾ�ਣ ਦਾ ਮਤਲਬ ਹ� �ਿ ਤ�ਹਾਡ� ਸ਼ਹਿਰ, ਸ�ਬਾ �ਤ� ਦ�ਸ਼ ਤ�� ਵੱਧ ��� ਵ� ਵ��ਾ�� ਨਹ�� "
 "�ਾਵ��ਾ। GPS ਧ�ਰਾ ਮ�ੱਲ 1 ਦਸ਼ਮਲਵ ਥਾ� ਨਾਲ ਸ਼�ੱਧ ਹ�ਣ��।"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "��ਸ਼ �ਿੱਤਰਾ� ਵਾ�� ਵ���(_s)"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Show contact _list in rooms"
 msgstr "ਰ�ਮ ਵਿੱ� ਸੰਪਰ� ਲਿਸ� ਵ���(_l)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "ਸਾ��ਡ"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ��� �ਾ��"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ਭਾਸ਼ਾ ਦ� ਲਿਸ� ਵ��ਾ ਰਿਹਾ ਹ�, �ਿੰਨ�ਹਾ� ਲ� ਤ�ਹਾਡ� ��ਲ ਸ਼ਬਦ-��ਸ਼ �ੰਸ�ਾਲ ਹ�।"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "ਥ�ਮ"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "_Automatically connect on startup"
 msgstr "ਸ਼�ਰ� ਸਮ�� ���ਮ��ਿ� ਹ� ��ਨ��� �ਰ�(_A)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../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 "ਨ�ੱ�ਵਰ� (IP, Wi-Fi)(_N) "
 
-#: ../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)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Reduce location accuracy"
 msgstr "�ਿ�ਾਣਾ ਸ਼�ੱਧਤਾ ��ਾ�(_R)"
 
@@ -3490,7 +3735,8 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "��� ਡਾ�ਲਾ� ਨਾ ਵ��ਾ�; ��� ਵ� �ਰ� (�ੰਪ�ਰ� �ਦਿ) �ਤ� ਬੰਦ �ਰ�"
 
 #: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-salut accounts"
+#| msgid "Don't display any dialogs if there are any non-salut accounts"
+msgid "Don't display any dialogs if there are any non-Salut accounts"
 msgstr "�� ��� ਨਾ-ਸਲਾ�� ��ਾ��� ਹ�ਵ� ਤਾ� ��� ਵ� ਡਾ�ਲਾ� ਨਾ ਵ��ਾ�"
 
 #: ../src/empathy-accounts.c:190
@@ -3513,6 +3759,18 @@ msgstr "�ੰਪ�ਥ� ��ਾ���"
 msgid "Empathy Debugger"
 msgstr "�ੰਪ�ਥ� ਡ�ਬੱ�ਰ"
 
+#~ msgid "_Character set:"
+#~ msgstr "�ੱ�ਰ ਸ�ੱ�(_C):"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "�ਮ�ਲ �ਡਰ�ੱਸ(_E):"
+
+#~ msgid "_Nickname:"
+#~ msgstr "ਨਾ�(_N):"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>�ਿ�ਾਣਾ</b>, "
+
 #~ msgid "Send and receive messages"
 #~ msgstr "ਸ�ਨ�ਹ� ਭ��� �ਤ� ਲਵ�"
 
@@ -3633,9 +3891,6 @@ msgstr "�ੰਪ�ਥ� ਡ�ਬੱ�ਰ"
 #~ msgid "Email:"
 #~ msgstr "�ਮ�ਲ:"
 
-#~ msgid "C_all"
-#~ msgstr "�ਾਲ(_a)"
-
 #~ msgid "Edit Custom Messages..."
 #~ msgstr "ਪਸੰਦ�ਦਾ ਸ�ਨ�ਹ� ਸ�ਧ�..."
 
@@ -3834,9 +4089,6 @@ msgstr "�ੰਪ�ਥ� ਡ�ਬੱ�ਰ"
 #~ msgid "Forget password and clear the entry."
 #~ msgstr "ਪਾਸਵਰਡ ਭ�ੱਲ� �ਤ� ���ਰ� ਸਾਫ਼ �ਰ�।"
 
-#~ msgid "Edit the selected IRC network"
-#~ msgstr "��ਣ� IRC ਨ�ੱ�ਵਰ� ਸ�ਧ�"
-
 #~ msgid "Remove the selected IRC network"
 #~ msgstr "��ਣਿ� IRC ਨ��ਵਰ� ਹ�ਾ�"
 
@@ -3855,9 +4107,6 @@ msgstr "�ੰਪ�ਥ� ਡ�ਬੱ�ਰ"
 #~ msgid "Sorry, I don't want you in my contact list anymore."
 #~ msgstr "�ਫਸ�ਸ ਹ�, ਪਰ ਮ�� ਤ�ਹਾਨ�ੰ �ਪਣ� ਸੰਪਰ� ਸ��� ਵਿੱ� ਨਹ�� ਰੱ�ਣਾ �ਾਹ�ੰਦਾ।"
 
-#~ msgid "Contact information"
-#~ msgstr "ਸੰਪਰ� �ਾਣ�ਾਰ�"
-
 #~ msgid "Word"
 #~ msgstr "ਸ਼ਬਦ"
 
@@ -3873,9 +4122,6 @@ msgstr "�ੰਪ�ਥ� ਡ�ਬੱ�ਰ"
 #~ msgid "Invitation _message:"
 #~ msgstr "ਸੱਦਾ ਸ�ਨ�ਹਾ(_m):"
 
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "ਤ�ਹਾਨ�ੰ �ੱ� �ੱਲਬਾਤ �ਨਫਰੰਸ ����ੰਨ �ਰਨ ਲ� ਸੱਦਾ ਹ�।"
-
 #~ msgid "Edit Favorite Room"
 #~ msgstr "ਪਸੰਦ�ਦਾ ਰ�ਮ ਸ�ਧ"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]