[gftp] Updating Punjabi Translaiton for Punjabi (Gurmukhi)



commit 37efeed5fcd507204417878bbe80979fbea17cf0
Author: A S Alam <aalam users sf net>
Date:   Sat Jun 13 08:14:32 2009 +0530

    Updating Punjabi Translaiton for Punjabi (Gurmukhi)

 po/pa.po |  810 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 408 insertions(+), 402 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index c940deb..0cbad79 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,19 +7,19 @@
 # Amanpreet Singh Alam <aalam redhat cpm>, 2004.
 # Amanpreet Singh Alam <amanpreetalam yahoo com>, 2005.
 # A S Alam <apbrar gmail com>, 2007.
-# A S Alam <aalam users sf net>, 2007.
+# A S Alam <aalam users sf net>, 2007, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gftp.HEAD.pa\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-13 03:24+0000\n"
-"PO-Revision-Date: 2007-11-03 10:27+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gftp&component=general\n";
+"POT-Creation-Date: 2009-04-17 14:23+0000\n"
+"PO-Revision-Date: 2009-06-13 08:11+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
-"Language-Team: Panjabi <punjabi-l10n users sf net>\n"
+"Language-Team: Punjabi/Panjabi <punjab-l10n list sf net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../lib/bookmark.c:38
@@ -32,7 +32,7 @@ msgstr "�ਲਤ URL %s\n"
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "�ਲਤ�: ����� �ੰਡ��ਸ ਫਾ�ਲ ਵਿੱ� %s �ਲਤ ਸਤਰ\n"
 
-#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:571
+#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "�ਲਤ�: ਡਾ�ਰ���ਰ� %s ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s\n"
@@ -43,35 +43,40 @@ msgid "Error: Cannot create temporary file: %s\n"
 msgstr "�ਲਤ�: �ਰ�� ਫਾ�ਲ਼ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s\n"
 
 #: ../lib/cache.c:186 ../lib/cache.c:236 ../lib/config_file.c:157
-#: ../lib/config_file.c:163 ../lib/local.c:144 ../lib/local.c:282
-#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1224
+#: ../lib/config_file.c:163 ../lib/local.c:144 ../lib/local.c:272
+#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "�ਲਤ� ਫਾ�ਲ ਵ�ਰਵਾ �ਰਤਾ ਨ�ੰ ਬੰਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�: %s\n"
 
-#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:189
-#: ../lib/local.c:198 ../lib/local.c:257
+#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
+#: ../lib/local.c:193 ../lib/local.c:247
 #, c-format
 msgid "Error: Cannot seek on file %s: %s\n"
 msgstr "�ਲਤ�: ਫਾ�ਲ %s ਲ� ਪ�ਰਾਪਤ ਨਹ�: %s\n"
 
-#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:3158
+#: ../lib/charset-conv.c:73
+#, c-format
+msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+
+#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "�ਲਤ�: ਲ��ਲ ਫਾ�ਲ %s ��ਲ�ਹ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s\n"
 
-#: ../lib/config_file.c:143 ../lib/protocols.c:2859 ../lib/sslcommon.c:497
+#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:493
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "�ਲਤ�: ਸਾ�� �ੱਤ� ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s\n"
 
-#: ../lib/config_file.c:151 ../lib/protocols.c:2781 ../lib/sshv2.c:445
-#: ../lib/sslcommon.c:450
+#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
+#: ../lib/sslcommon.c:446
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "�ਲਤ�: ਸਾ�� ਤ�� ਪ��ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s\n"
 
-#: ../lib/config_file.c:183 ../lib/config_file.c:738
+#: ../lib/config_file.c:183 ../lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP �ਲਤ�: �ਲਤ ਬ�ੱ�ਮਾਰ� ਫਾ�ਲ ਨਾ� %s\n"
@@ -81,7 +86,7 @@ msgstr "gFTP �ਲਤ�: �ਲਤ ਬ�ੱ�ਮਾਰ� ਫਾ�ਲ ਨ
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "��ਤਾਵਨ�: ਮਾਸ�ਰ ਬ�ੱ�ਮਾਰ� ਫਾ�ਲ %s ਨਹ�� ਲੱਭ� �ਾ ਸ�ਦ� ਹ�।\n"
 
-#: ../lib/config_file.c:203 ../lib/config_file.c:744
+#: ../lib/config_file.c:203 ../lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP �ਲਤ�: ਬ�ੱ�ਮਾਰ� ਫਾ�ਲ %s ��ਲ�ਹ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s\n"
@@ -96,76 +101,76 @@ msgstr "gFTP ��ਤਾਵਨ�: ਬ�ੱ�ਮਾਰ� ਫਾ�ਲ ਵਿ
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP ��ਤਾਵਨ�: ਲਾ�ਨ %d ਵਿੱ� ਲ���ਦ� �ਰ��ਮ��� ਨਹ�� ਹਨ\n"
 
-#: ../lib/config_file.c:505
+#: ../lib/config_file.c:504
 msgid ""
 "This section specifies which hosts are on the local subnet and won't need to "
 "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or "
 "dont_use_proxy=network number/netmask"
 msgstr ""
-"�ਹ ਸ਼��ਸ਼ਨ ਵਿੱ� ਸ�ੱ� �ਰ� �ਿ �ਿਹ�� ਹ�ਸ� ਲ��ਲ ਸਬ-ਨ�ੱ� �ੱਤ� ਹਨ �ਤ� ਪਰਾ�ਸ� ਸਰਵਰ ਲ� �ਾਣ "
-"ਦ� ਲ�� ਨਹ�� ਹ� (�� �ਪਲੱਬਧ ਹ�ਵ� ਤਾ�)। ਸਨ���ਸ: dont_use_proxy=.domain �ਾ� dont_use_proxy=network number/netmask"
+"�ਹ ਸ਼��ਸ਼ਨ ਵਿੱ� ਸ�ੱ� �ਰ� �ਿ �ਿਹ�� ਹ�ਸ� ਲ��ਲ ਸਬ-ਨ�ੱ� �ੱਤ� ਹਨ �ਤ� ਪਰਾ�ਸ� ਸਰਵਰ ਲ� �ਾਣ ਦ� ਲ�� "
+"ਨਹ�� ਹ� (�� �ਪਲੱਬਧ ਹ�ਵ� ਤਾ�)। ਸਨ���ਸ: dont_use_proxy=.domain �ਾ� "
+"dont_use_proxy=network number/netmask"
 
-#: ../lib/config_file.c:508
+#: ../lib/config_file.c:507
 msgid ""
 "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: "
 "All arguments except the file extension are optional"
 msgstr ""
 
-#: ../lib/config_file.c:588 ../lib/config_file.c:833
+#: ../lib/config_file.c:587 ../lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP �ਲਤ�: �ਲਤ ਸੰਰ�ਨਾ ਫਾ�ਲ ਨਾ� %s\n"
 
-#: ../lib/config_file.c:599
+#: ../lib/config_file.c:598
 #, c-format
 msgid "gFTP Error: Could not make directory %s: %s\n"
 msgstr "gFTP �ਲਤ�: %s ਡਾ�ਰ���ਰ� ਬਣਾ� ਨਹ�� �ਾ ਸ��: %s\n"
 
-#: ../lib/config_file.c:609
+#: ../lib/config_file.c:608
 #, c-format
 msgid "gFTP Error: Cannot find master config file %s\n"
 msgstr "gFTP �ਲਤ�: ਮਾਸ�ਰ ਸੰਰ�ਨਾ ਫਾ�ਲ %s ਨਹ�� ਲੱਭ� �ਾ ਸ�ਦ�।\n"
 
-#: ../lib/config_file.c:611
+#: ../lib/config_file.c:610
 #, c-format
 msgid "Did you do a make install?\n"
 msgstr "�� ਤ�ਸ�� �ੰਸ�ਾਲ �ਰਨਾ ਹ�?\n"
 
-#: ../lib/config_file.c:620 ../lib/config_file.c:839
+#: ../lib/config_file.c:619 ../lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP �ਲਤ�: ਸੰਰ�ਨਾ ਫਾ�ਲ %s ��ਲ� ਨਹ� �ਾ ਸ�� ਹ�: %s\n"
 
-#: ../lib/config_file.c:659
+#: ../lib/config_file.c:658
 #, c-format
 msgid "Terminating due to parse errors at line %d in the config file\n"
 msgstr "ਸੰਰ�ਨਾ ਫਾ�ਲ ਵਿੱ� ਲਾ�ਨ %d �ੱਤ� ਪਾਰਸ �ਲਤ��� �ਰ�� �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�\n"
 
-#: ../lib/config_file.c:665
+#: ../lib/config_file.c:664
 #, c-format
 msgid "gFTP Warning: Skipping line %d in config file: %s\n"
 msgstr "gFTP ��ਤਾਵਨ�: ਸੰਰ�ਨਾ ਫਾ�ਲ ਵਿੱ� %d ਲਾ�ਨ �ੱਡ� �ਾ ਰਹ� ਹ�: %s\n"
 
-#: ../lib/config_file.c:672
+#: ../lib/config_file.c:671
 #, c-format
 msgid "gFTP Error: Bad log file name %s\n"
 msgstr "gFTP �ਲਤ�: ਲਾ� ਫਾ�ਲ ਨਾ� %s �ਲਤ ਹ� \n"
 
-#: ../lib/config_file.c:678
+#: ../lib/config_file.c:677
 #, c-format
 msgid "gFTP Warning: Cannot open %s for writing: %s\n"
 msgstr "gFTP ��ਤਾਵਨ�: ਲਿ�ਣ ਲ� %s ��ਲ�ਹ� ਨਹ�� �ਾ ਸ�ਦ�: %s\n"
 
-#: ../lib/config_file.c:733
+#: ../lib/config_file.c:732
 msgid ""
 "Bookmarks file for gFTP. Copyright (C) 1998-2007 Brian Masney <masneyb gftp "
 "org>. Warning: Any comments that you add to this file WILL be overwritten"
 msgstr ""
 "gFTP ਲ� ਬ�ੱ�ਮਾਰ� ਫਾ�ਲ ਹ�। �ਾਪ�ਰਾ�� C) 1998-2007 Brian Masney <masneyb gftp "
-"org>। ��ਤਾਵਨ�: �ਸ ਫਾ�ਲ ਵਿੱ� �� ਤ�ਸ�� ��� �ਿੱਪਣ� ਸ਼ਾਮਲ ��ਤ� ਤਾ� ਫਾ�ਲ "
-"*�ੱਤ�* ਲਿ�ਿ� �ਾਵ��ਾ।"
+"org>। ��ਤਾਵਨ�: �ਸ ਫਾ�ਲ ਵਿੱ� �� ਤ�ਸ�� ��� �ਿੱਪਣ� ਸ਼ਾਮਲ ��ਤ� ਤਾ� ਫਾ�ਲ *�ੱਤ�* ਲਿ�ਿ� �ਾਵ��ਾ।"
 
-#: ../lib/config_file.c:734
+#: ../lib/config_file.c:733
 msgid ""
 "Note: The passwords contained inside this file are scrambled. This algorithm "
 "is not secure. This is to avoid your password being easily remembered by "
@@ -173,24 +178,24 @@ msgid ""
 "this, all passwords were stored in plaintext."
 msgstr ""
 
-#: ../lib/config_file.c:846
+#: ../lib/config_file.c:845
 msgid ""
 "Config file for gFTP. Copyright (C) 1998-2007 Brian Masney <masneyb gftp "
 "org>. Warning: Any comments that you add to this file WILL be overwritten. "
 "If a entry has a (*) in it's comment, you can't change it inside gFTP"
 msgstr ""
-"gFTP ਲ� ਸੰਰ�ਨਾ ਫਾ�ਲ ਹ�। �ਾਪ�ਰਾ�� C) 1998-2007 Brian Masney <masneyb gftp "
-"org>। ��ਤਾਵਨ�: �ਸ ਫਾ�ਲ ਵਿੱ� �� ਤ�ਸ�� ��� �ਿੱਪਣ� ਸ਼ਾਮਲ ��ਤ� ਤਾ� ਫਾ�ਲ "
-"*�ੱਤ�* ਲਿ�ਿ� �ਾਵ��ਾ। "
-"�� ���ਰ� ਲ� �ਸ ਦ� �ਿੱਪਣ� ਵਿੱ� (*) ਹ�ਵ� ਤਾ� ਤ�ਸ�� �ਸ ਨ�ੰ gFTP ਵਿੱ� ਬਦਲ ਨਹ�� ਸ�ਦ� ਹ�।"
+"gFTP ਲ� ਸੰਰ�ਨਾ ਫਾ�ਲ ਹ�। �ਾਪ�ਰਾ�� C) 1998-2007 Brian Masney <masneyb gftp org>। "
+"��ਤਾਵਨ�: �ਸ ਫਾ�ਲ ਵਿੱ� �� ਤ�ਸ�� ��� �ਿੱਪਣ� ਸ਼ਾਮਲ ��ਤ� ਤਾ� ਫਾ�ਲ *�ੱਤ�* ਲਿ�ਿ� �ਾਵ��ਾ। �� "
+"���ਰ� ਲ� �ਸ ਦ� �ਿੱਪਣ� ਵਿੱ� (*) ਹ�ਵ� ਤਾ� ਤ�ਸ�� �ਸ ਨ�ੰ gFTP ਵਿੱ� ਬਦਲ ਨਹ�� ਸ�ਦ� ਹ�।"
 
-#: ../lib/config_file.c:1210 ../lib/protocols.c:382 ../lib/rfc2068.c:546
-#: ../lib/rfc2068.c:547
+#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
+#: ../lib/rfc2068.c:544
+#, c-format
 msgid "<unknown>"
 msgstr "<�ਣ�ਾਣ>"
 
-#: ../lib/config_file.c:1290 ../lib/config_file.c:1353
-#: ../lib/config_file.c:1395 ../lib/config_file.c:1428
+#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
+#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
 #, c-format
 msgid "FATAL gFTP Error: Config option '%s' not found in global hash table\n"
 msgstr "�ਾਤ� gFTP �ਲਤ�: �ਲ�ਬਲ ਹ�ਸ਼ ��ਬਲ ਵਿੱ� ਸੰਰ�ਨਾ ��ਣ '%s' ਨਹ�� ਲੱਭ�\n"
@@ -213,12 +218,13 @@ msgstr "�ਲਤ�: ਫਾ�ਲ ਬੰਦ �ਰਨ ਦ�ਰਾਨ �ਲਤ
 #: ../lib/fsp.c:327
 #, c-format
 msgid "Corrupted file listing from FSP server %s\n"
-msgstr ""
+msgstr "FSP ਸਰਵਰ %s ਤ�� ਨਿ�ਾਰਾ ਫਾ�ਲ ਲਿਸ�!\n"
 
-#: ../lib/fsp.c:339 ../lib/fsp.c:340 ../lib/protocols.c:1536
-#: ../lib/protocols.c:1537 ../lib/protocols.c:1578 ../lib/protocols.c:1579
-#: ../lib/protocols.c:1645 ../lib/protocols.c:1652 ../lib/protocols.c:1728
-#: ../lib/protocols.c:1729 ../lib/protocols.c:1765
+#: ../lib/fsp.c:339 ../lib/fsp.c:340 ../lib/parse-dir-listing.c:337
+#: ../lib/parse-dir-listing.c:338 ../lib/parse-dir-listing.c:379
+#: ../lib/parse-dir-listing.c:380 ../lib/parse-dir-listing.c:446
+#: ../lib/parse-dir-listing.c:453 ../lib/parse-dir-listing.c:529
+#: ../lib/parse-dir-listing.c:530 ../lib/parse-dir-listing.c:566
 msgid "unknown"
 msgstr "�ਣ�ਾਣ"
 
@@ -237,51 +243,53 @@ msgstr "ਡਾ�ਰ���ਰ� ਤ�� %s ਸਫਲਤਾਪ�ਰ� ਤ
 msgid "Could not change directory to %s\n"
 msgstr "ਡਾ�ਰ���ਰ� ਤ�� %s ਤਬਦ�ਲ ਨਹ�� ਹ� ਸ��\n"
 
-#: ../lib/fsp.c:471 ../lib/fsp.c:500 ../lib/local.c:490 ../lib/local.c:526
-#: ../src/gtk/transfer.c:263 ../src/gtk/view_dialog.c:329
+#: ../lib/fsp.c:471 ../lib/fsp.c:500 ../lib/local.c:480 ../lib/local.c:516
+#: ../src/gtk/transfer.c:263 ../src/gtk/view_dialog.c:306
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "%s ਸਫਲਤਾਪ�ਰ� ਹ�ਾ�� �ਿ�\n"
 
-#: ../lib/fsp.c:477 ../lib/local.c:496
+#: ../lib/fsp.c:477 ../lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "�ਲਤ�: ਡਾ�ਰ���ਰ� %s ਹ�ਾ� ਨਹ�� �ਾ ਸ��: %s\n"
 
-#: ../lib/fsp.c:506 ../lib/local.c:532 ../src/gtk/transfer.c:267
-#: ../src/gtk/view_dialog.c:333
+#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
+#: ../src/gtk/view_dialog.c:310
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "�ਲਤ�: ਫਾ�ਲ %s ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ�: %s\n"
 
-#: ../lib/fsp.c:528 ../lib/local.c:564
+#: ../lib/fsp.c:528 ../lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "ਡਾ�ਰ���ਰ� %s ਸਫਲਤਾਪ�ਰ� ਬਣਾ� �� ਹ�\n"
 
-#: ../lib/fsp.c:563 ../lib/local.c:600
+#: ../lib/fsp.c:563 ../lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s ਦਾ %s ਵਿੱ� ਨਾ�-ਤਬਦ�ਲ ਸਫਲਤਾਪ�ਰ� ��ਤਾ �ਿ� ਹ�\n"
 
-#: ../lib/fsp.c:575 ../lib/local.c:607
+#: ../lib/fsp.c:575 ../lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "�ਲਤ�: %s ਦਾ ਨਾ� %s ਬਦਲਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s\n"
 
-#: ../lib/ftps.c:157
+#: ../lib/ftps.c:156
 msgid ""
 "FTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
+"FTPS ਸਹਿਯ�� �ਪਲੱਬਧ ਨਹ�� ਹ�, �ਿ���ਿ SSL ਸਹਿਯ�� �ੰਪਾ�ਲ ਨਹ�� "
+"��ਤਾ। ��ਨ��ਸ਼ਨ �ਧ�ਰਾ �ੱਡਿ� �ਾ ਰਿਹਾ ਹ�।\n"
 
 #: ../lib/https.c:91
 msgid ""
 "HTTPS Support unavailable since SSL support was not compiled in. Aborting "
 "connection.\n"
 msgstr ""
-"HTTPS ਸਹਿਯ�� �ਪਲੱਬਧ ਨਹ�� ਹ�, �ਿ���ਿ SSL ਸਹਿਯ�� �ਸ ਵਿੱ� �ੰਪਾ�ਲ ਨਹ�� ਹ�। "
-"��ਨ��ਸ਼ਨ �ੱਡਿ� �ਾ ਰਿਹਾ ਹ�।\n"
+"HTTPS ਸਹਿਯ�� �ਪਲੱਬਧ ਨਹ�� ਹ�, �ਿ���ਿ SSL ਸਹਿਯ�� �ਸ ਵਿੱ� �ੰਪਾ�ਲ ਨਹ�� ਹ�। ��ਨ��ਸ਼ਨ �ੱਡਿ� �ਾ "
+"ਰਿਹਾ ਹ�।\n"
 
 #: ../lib/local.c:66
 #, c-format
@@ -298,50 +306,45 @@ msgstr "ਲ��ਲ ਡਾ�ਰ���ਰ� ਨ�ੰ %s ਲ� ਬਦਲ
 msgid "Could not change local directory to %s: %s\n"
 msgstr "ਲ��ਲ ਡਾ�ਰ���ਰ� %s ਲ� ਨਹ�� ਬਦਲ� �ਾ ਸ��: %s\n"
 
-#: ../lib/local.c:248
+#: ../lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "�ਲਤ�: ਲ��ਲ ਫਾ�ਲ %s ਲ� ਨਹ�� �ਾ ਸ�ਦ�: %s\n"
 
-#: ../lib/local.c:434
+#: ../lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "ਲ��ਲ ਡਾ�ਰ���ਰ� ਲਿਸ�ਿੰ� %s ਲ� ਨਹ�� �ਾ ਸ��: %s\n"
 
-#: ../lib/local.c:644
+#: ../lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "%s ਦਾ ਢੰ� %o ਸਫਲਤਾਪ�ਰ� ਤਬਦ�ਲ ��ਤਾ �ਿ� ਹ�\n"
 
-#: ../lib/local.c:651
+#: ../lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr ""
 
-#: ../lib/local.c:686
+#: ../lib/local.c:676
 #, c-format
 msgid "Successfully changed the time stamp of %s\n"
-msgstr ""
+msgstr "%s ਦ� ਸਮਾ� ਮ�ਹਰ ਠ�� ਤਰ�ਹਾ� ਬਦਲ� ��\n"
 
-#: ../lib/local.c:693
+#: ../lib/local.c:683
 #, c-format
 msgid "Error: Could not change the time stamp of %s: %s\n"
-msgstr ""
+msgstr "�ਲਤ�: %s ਲ� ਸਮਾ�-ਮ�ਹਰ ਬਦਲ� ਨਹ�� �ਾ ਸ��: %s\n"
 
-#: ../lib/local.c:760
+#: ../lib/local.c:750
 msgid "local filesystem"
 msgstr "ਲ��ਲ ਫਾ�ਲ ਸਿਸ�ਮ"
 
-#: ../lib/misc.c:407
+#: ../lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "ਵਰਤ��: gftp "
 
-#: ../lib/misc.c:407 ../lib/rfc2068.c:304 ../src/uicommon/gftpui.c:630
-#, c-format
-msgid "\n"
-msgstr "\n"
-
 #. @null@
 #: ../lib/options.h:25 ../lib/rfc959.c:26
 msgid "none"
@@ -353,15 +356,15 @@ msgstr "ਫਾ�ਲ"
 
 #: ../lib/options.h:26
 msgid "size"
-msgstr "��ਾਰ"
+msgstr "ਸਾ��਼"
 
 #: ../lib/options.h:26
 msgid "user"
-msgstr "�ਪਭ��ਤਾ"
+msgstr "ਯ��਼ਰ"
 
 #: ../lib/options.h:27
 msgid "group"
-msgstr "ਸਮ�ਹ"
+msgstr "�ਰ�ੱਪ"
 
 #: ../lib/options.h:28
 msgid "datetime"
@@ -369,7 +372,7 @@ msgstr "ਸਮਾ�-ਮਿਤ�"
 
 #: ../lib/options.h:29
 msgid "attribs"
-msgstr "ਵਿਸ਼�ਸਤਾ"
+msgstr "ਵਿਸ਼�ਸ਼ਤਾ"
 
 #. @null@
 #: ../lib/options.h:32
@@ -386,19 +389,19 @@ msgstr "ਸਧਾਰਨ"
 
 #: ../lib/options.h:43
 msgid "View program:"
-msgstr "�ਾਰ� ਵ���:"
+msgstr "ਪਰ��ਰਾਮ ਵ���:"
 
 #: ../lib/options.h:44
 msgid ""
 "The default program used to view files. If this is blank, the internal file "
 "viewer will be used"
 msgstr ""
-"ਫਾ�ਲ ਵ��ਣ ਲ� ਵਰਤਣ ਵਾਸਤ� ਡਿਫਾਲ� ਪਰ��ਰਾਮ ਹ�। �� �ਹ �ਾਲ� ਹ��� ਤਾ� �ੰਦਰ�ਨ� ਫਾ�ਲ "
-"ਦਰਸ਼� ਵਰਤਿ� �ਾਵ��ਾ।"
+"ਫਾ�ਲ ਵ��ਣ ਲ� ਵਰਤਣ ਵਾਸਤ� ਡਿਫਾਲ� ਪਰ��ਰਾਮ ਹ�। �� �ਹ �ਾਲ� ਹ��� ਤਾ� �ੰਦਰ�ਨ� ਫਾ�ਲ ਦਰਸ਼� "
+"ਵਰਤਿ� �ਾਵ��ਾ।"
 
 #: ../lib/options.h:46
 msgid "Edit program:"
-msgstr "�ਾਰ� ਸ�ਧ:"
+msgstr "ਪਰ��ਰਾਮ ਸ�ਧ:"
 
 #: ../lib/options.h:47
 msgid "The default program used to edit files."
@@ -420,7 +423,9 @@ msgstr "ਰਿਮ�� �ੱ�ਰ ਸ�ੱ�:"
 msgid ""
 "This is a comma separated list of charsets to try to convert the remote "
 "messages to the current locale"
-msgstr "�ਹ �ੱ�ਰ-ਸ�ੱ� ਦ� �ੱ� �ਾਮਿ�� ਨਾਲ ਵੱ� ��ਤ� ਲਿਸ� ਹ�, �� �ਿ ਮ���ਦਾ ਲ���ਲ ਤ�� ਰਿਮ�� ਸ�ਨ�ਹ� ਬਦਲਣ ਦ� ��ਸ਼ਿਸ਼ ਹ�"
+msgstr ""
+"�ਹ �ੱ�ਰ-ਸ�ੱ� ਦ� �ੱ� �ਾਮਿ�� ਨਾਲ ਵੱ� ��ਤ� ਲਿਸ� ਹ�, �� �ਿ ਮ���ਦਾ ਲ���ਲ ਤ�� ਰਿਮ�� ਸ�ਨ�ਹ� ਬਦਲਣ ਦ� "
+"��ਸ਼ਿਸ਼ ਹ�"
 
 #: ../lib/options.h:56
 msgid "Remote LC_TIME:"
@@ -431,6 +436,8 @@ msgid ""
 "This is the value of LC_TIME for the remote site. This is so that dates can "
 "be parsed properly in the directory listings."
 msgstr ""
+"ਰਿਮ�� ਸਾ�� ਲ� �ਹ LC_TIME ਦਾ ਮ�ੱਲ ਹ�। �ਹ ਤਾ� ਹ� �ਿ ਤਾ� �ਿ ਡਾ�ਰ���ਰ� ਵ��ਾ�ਣ ਦ�ਰਾਨ ਮਿਤ� ਨ�ੰ ਪਾਰਸ "
+"��ਤਾ �ਾ ਸ��।"
 
 #: ../lib/options.h:60
 msgid "Cache TTL:"
@@ -478,7 +485,7 @@ msgstr "ਫਾ�ਲ �ਾ�ਮ ਰੱ��"
 
 #: ../lib/options.h:85
 msgid "Preserve file times of transfered files"
-msgstr ""
+msgstr "�ਰਾ�ਸਫਰ ��ਤ��� ਫਾ�ਲਾ� ਦਾ ਫਾ�ਲ ਸਮਾ� ਸ�ਰੱ�ਿ�ਤ ਰੱ��"
 
 #: ../lib/options.h:87
 msgid "Refresh after each file transfer"
@@ -498,7 +505,7 @@ msgstr "ਪਹਿਲਾ� ਡਾ�ਰ���ਰ��� ਰੱ�� �ਤ
 
 #: ../lib/options.h:96
 msgid "Show hidden files"
-msgstr "ਲ��ਵ��� ਫਾ�ਲ਼ਾ� ਵ��ਾ�"
+msgstr "ਲ��ਵ��� ਫਾ�ਲਾ� ਵ���"
 
 #: ../lib/options.h:99
 msgid "Show hidden files in the listboxes"
@@ -506,27 +513,27 @@ msgstr "ਲਿਸ�-ਬ�ਸ� ਵਿੱ� ਲ��ਵ��� ਫਾ�
 
 #: ../lib/options.h:100
 msgid "Show transfer status in title"
-msgstr "�ਾ��ਲ ਵਿੱ� �ਰਾ�ਸਫਰ ਸ���ਸ ਵ���"
+msgstr "�ਾ��ਲ ਵਿੱ� �ਰਾ�ਸਫਰ ਸ���ਸ ਵ���"
 
 #: ../lib/options.h:102
 msgid "Show the file transfer status in the titlebar"
-msgstr ""
+msgstr "�ਾ��ਲ-ਪੱ�� ਵਿੱ� ਫਾ�ਲ �ਰਾ�ਸਫਰ ਹਾਲਤ ਵ���"
 
 #: ../lib/options.h:103
 msgid "Start file transfers"
-msgstr "ਫਾ�ਲ ਤਬਦ�ਲ� ਵ��ਾ�"
+msgstr "ਫਾ�ਲ �ਰਾ�ਸਫਰ ਸ਼�ਰ�"
 
 #: ../lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
-msgstr ""
+msgstr "�ਦ�� �ਤਾਰ ਮਿਲ� ਤਾ� ���ਮ��ਿ� ਹ� ਫਾ�ਲ �ਰਾ�ਸਫਰ ਸ਼�ਰ� �ਰ�"
 
 #: ../lib/options.h:107
 msgid "Allow manual commands in GUI"
-msgstr ""
+msgstr "GUI ਵਿੱ� ਦਸਤ� �ਮਾ�ਡ ਮਨ�਼�ਰ"
 
 #: ../lib/options.h:109
 msgid "Allow entering manual commands in the GUI (functions like the text port)"
-msgstr ""
+msgstr "GUI ਵਿੱ� ਦਸਤ� �ਮਾ�ਡ ਦ�ਣਾ ਮਨ�਼�ਰ (���ਸ� ਪ�ਰ� ਵਾ�� �ੰਮ)"
 
 #: ../lib/options.h:111
 msgid "Remember last directory"
@@ -534,7 +541,7 @@ msgstr "��ਰ� ਡਾ�ਰ���ਰ� ਯਾਦ ਰੱ��"
 
 #: ../lib/options.h:113
 msgid "Save the last local and remote directory when the application is closed"
-msgstr ""
+msgstr "�ਦ�� �ਪਲ���ਸ਼ਨ ਬੰਦ ਹ�ਵ� ਤਾ� ��ਰ� ਲ��ਲ �ਤ� ਰਿਮ�� ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
 
 #: ../lib/options.h:115
 msgid "Connect to remote server on startup"
@@ -542,7 +549,7 @@ msgstr "ਸ਼�ਰ� ਸਮ�� ਰਿਮ�� ਸਰਵਰ ਤ�� �
 
 #: ../lib/options.h:117
 msgid "Automatically connect to the remote server when the application is started."
-msgstr ""
+msgstr "�ਦ�� �ਪਲ���ਸ਼ਨ �ਾਲ� ਹ�ਵ� ਤਾ� ���ਮ��ਿ� ਹ� ਰਿਮ�� ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰ�।"
 
 #: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
 #: ../src/gtk/options_dialog.c:1240
@@ -563,7 +570,7 @@ msgstr "��ਨ��� ਮ��-�ਰਾ�:"
 
 #: ../lib/options.h:130
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
-msgstr ""
+msgstr "���ਮ��ਿ� ਮ��-�ਰਾ� �ਰਨ ਦ� �ਿਣਤ�। ਲ�ਾਤਾਰ ਮ��-�ਰਾ� �ਰਨ ਲ� 0 ਸ�ੱ� �ਰ�।"
 
 #: ../lib/options.h:132
 msgid "Retry sleep time:"
@@ -575,7 +582,7 @@ msgstr "ਰ�-�ਰਾ��� ਦ� ਵਿੱ� �ਡ�� ਲ� ਸ�
 
 #: ../lib/options.h:136
 msgid "Max KB/S:"
-msgstr "�ਧਿ� KB/S:"
+msgstr "ਵੱਧ�-ਵੱਧ KB/S:"
 
 #: ../lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
@@ -583,21 +590,21 @@ msgstr "ਵੱਧ�-ਵੱਧ KB/s, �� �ੱ� ਫਾ�ਲ �ਰਾ�
 
 #: ../lib/options.h:141
 msgid "Transfer Block Size:"
-msgstr "ਤਬਦ�ਲ ਬਲਾ� ��ਾਰ:"
+msgstr "�ਰਾ�ਸਫਰ ਬਲਾ� ��ਾਰ:"
 
 #: ../lib/options.h:144
 msgid ""
 "The block size that is used when transfering files. This should be a "
 "multiple of 1024."
-msgstr ""
+msgstr "ਫਾ�ਲਾ� �ਰਾ�ਸਫਰ �ਰਨ ਲ� ਬਲਾ� ਦਾ ਸਾ��਼ ਹ�। �ਹ 1024 ਦਾ ��ਣਾ�� ਹ�ਣਾ �ਾਹ�ਦਾ ਹ�।"
 
 #: ../lib/options.h:147
 msgid "Default Protocol:"
-msgstr "ਮ�ਲ ਪ�ਰ����ਾਲ:"
+msgstr "ਡਿਫਾਲ� ਪਰ����ਾਲ:"
 
 #: ../lib/options.h:149
 msgid "This specifies the default protocol to use"
-msgstr "�ਹ ਵਰਤਣ ਲ� ਮ�ਲ ਪ�ਰ����ਾਲ ਨਿਰਧਾਰਤ �ਰਦਾ ਹ�"
+msgstr "�ਹ ਵਰਤਣ ਲ� ਡਿਫਾਲ� ਪਰ����ਾਲ ਦਿੰਦਾ ਹ�"
 
 #: ../lib/options.h:151 ../lib/options.h:154
 msgid "Enable IPv6 support"
@@ -608,8 +615,8 @@ msgid ""
 "This defines what will happen when you double click a file in the file "
 "listboxes. 0=View file 1=Edit file 2=Transfer file"
 msgstr ""
-"�ਹ ਤਹਿ �ਰਦ� ਹ� �ਿ �� ਤ�ਸ�� ਫਾ�ਲ ਲਿਸ�-ਬਾ�ਸ ਵਿੱ� �ੱ� ਫਾ�ਲ �ੱਤ� ਡਬਲ �ਲਿੱ� �ਰ� ਤਾ� "
-"�� ਹ�ਵ��ਾ। 0=ਫਾ�ਲ ਵ���, 1=ਫਾ�ਲ ਸ�ਧ 2=ਫਾ�ਲ �ਰਾ�ਸਫਰ"
+"�ਹ ਤਹਿ �ਰਦ� ਹ� �ਿ �� ਤ�ਸ�� ਫਾ�ਲ ਲਿਸ�-ਬਾ�ਸ ਵਿੱ� �ੱ� ਫਾ�ਲ �ੱਤ� ਡਬਲ �ਲਿੱ� �ਰ� ਤਾ� �� ਹ�ਵ��ਾ। "
+"0=ਫਾ�ਲ ਵ���, 1=ਫਾ�ਲ ਸ�ਧ 2=ਫਾ�ਲ �ਰਾ�ਸਫਰ"
 
 #: ../lib/options.h:162
 msgid "The default width of the local files listbox"
@@ -629,19 +636,17 @@ msgstr "ਤਬਦ�ਲ ਸ���ਬ�ਸ� ਦ� ਮ�ਲ ��ਾ�"
 
 #: ../lib/options.h:174
 msgid "The default height of the logging window"
-msgstr "ਲਾ�ਿੰਨ �ਰ��ਾ ਦ� ਮ�ਲ ��ਾ�"
+msgstr "ਲਾ��ਨ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�"
 
 #: ../lib/options.h:177
 msgid ""
 "The width of the filename column in the transfer window. Set this to 0 to "
 "have this column automagically resize."
-msgstr ""
-"�ਰਾ�ਸਫਰ ਵਿੰਡ� ਵਿੱ� ਫਾ�ਲ-ਨਾ� �ਾਲਮ ਦ� ���ਾ� ਹ�। �ਹ �ਾਲਮ ਨ�ੰ ���ਮ��ਿ� ਸ�ੱ� �ਰਨ ਲ� "
-"�ਹ 0 ਦਿ�।"
+msgstr "�ਰਾ�ਸਫਰ ਵਿੰਡ� ਵਿੱ� ਫਾ�ਲ-ਨਾ� �ਾਲਮ ਦ� ���ਾ� ਹ�। �ਹ �ਾਲਮ ਨ�ੰ ���ਮ��ਿ� ਸ�ੱ� �ਰਨ ਲ� �ਹ 0 ਦਿ�।"
 
 #: ../lib/options.h:190 ../lib/options.h:196
 msgid "The default column to sort by"
-msgstr "ਮ�ਲ �ਾਲਮ, �ਿਸ ਰਾਹ�� ��ਰਮਬੱਧ �ਰਨਾ ਹ�"
+msgstr "ਡਿਫਾਲ� �ਾਲਮ, �ਿਸ ਰਾਹ�� ��ਰਮਬੱਧ �ਰਨਾ ਹ�"
 
 #: ../lib/options.h:193 ../lib/options.h:199
 msgid "Sort ascending or descending"
@@ -652,8 +657,8 @@ msgid ""
 "The width of the filename column in the file listboxes. Set this to 0 to "
 "have this column automagically resize. Set this to -1 to disable this column"
 msgstr ""
-"ਫਾ�ਲ ਲਿਸ�ਬਾ�ਸ ਵਿੱ� ਫਾ�ਲ ਨਾ� �ਾਲਮ ਦ� ���ਾ� ਹ�। �ਸ ਦਾ ਡਿਫਾਲ� 0 ਹ�ਵ��ਾ, ���ਰ ਤ�ਸ�� �ਾਹ�ੰਦ� ਹ� �ਿ �ਹ "
-"���ਮ��ਿ� ਢੰ� ਨਾਲ ਰ�-ਸਾ��਼ ਹ�ਵ�। �ਸ �ਾਲਮ ਨ�ੰ �ਯ�� �ਰਨ ਲ਼� -1 ਦਿ�।"
+"ਫਾ�ਲ ਲਿਸ�ਬਾ�ਸ ਵਿੱ� ਫਾ�ਲ ਨਾ� �ਾਲਮ ਦ� ���ਾ� ਹ�। �ਸ ਦਾ ਡਿਫਾਲ� 0 ਹ�ਵ��ਾ, ���ਰ ਤ�ਸ�� �ਾਹ�ੰਦ� "
+"ਹ� �ਿ �ਹ ���ਮ��ਿ� ਢੰ� ਨਾਲ ਰ�-ਸਾ��਼ ਹ�ਵ�। �ਸ �ਾਲਮ ਨ�ੰ �ਯ�� �ਰਨ ਲ਼� -1 ਦਿ�।"
 
 #: ../lib/options.h:206 ../lib/options.h:224
 msgid ""
@@ -743,136 +748,74 @@ msgstr "ਬ�ੱ�ਮਾਰ�"
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:225
+#: ../lib/protocols.c:228
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "ਫਾ�ਲ਼ ਤਬਦ�ਲ ਦ� �ਤ� %.2f KB/s\n"
 
-#: ../lib/protocols.c:378
+#: ../lib/protocols.c:381
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
-msgstr ""
+msgstr "LC_TIME '%s' ਸ�ੱ� �ਰਨ ਲ� �ਲਤ�। '%s' ਵਰਤਿ� �ਾ ਰਿਹਾ ਹ�\n"
 
-#: ../lib/protocols.c:389
+#: ../lib/protocols.c:392
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
-msgstr ""
+msgstr "��ਸ ਤ�� ਡਾ�ਰ���ਰ� ਲਿਸ� %s ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ� (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:399
+#: ../lib/protocols.c:402
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
-msgstr ""
-
-#: ../lib/protocols.c:461
-#, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
+msgstr "ਸਰਵਰ ਤ�� ਡਾ�ਰ���ਰ� ਲਿਸ� %s ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ� (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:654
+#: ../lib/protocols.c:452
 #, c-format
 msgid ""
 "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
 "match the current directory (%s)\n"
 msgstr ""
 
-#: ../lib/protocols.c:680
+#: ../lib/protocols.c:483
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
-msgstr "�ਲਤ�: ����� ਲ� ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s\n"
+msgstr "�ਲਤ�: ��ਸ਼ ਲ� ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s\n"
 
-#: ../lib/protocols.c:713
+#: ../lib/protocols.c:516
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "�ਲਤ�: ਬ�ੱ�ਮਾਰ� %s ਨ�ੰ ���ਿ� ਨਹ�� �ਾ ਸ�ਿ�\n"
 
-#: ../lib/protocols.c:720
+#: ../lib/protocols.c:523
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "ਬ�ੱ�ਮਾਰ� �ਲਤ�: ਬ�ੱ�ਮਾਰ� ���ਰ� %s ਲ� ਹ�ਸ� ਨਾ� ਨਹ��\n"
 
-#: ../lib/protocols.c:842 ../lib/protocols.c:869
+#: ../lib/protocols.c:645 ../lib/protocols.c:672
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
-msgstr "ਪ�ਰ����ਾਲ '%s' �ਸ ਮ��� ਸਹਾ�� ਨਹ�� ਹ�।\n"
+msgstr "ਪਰ����ਾਲ '%s' �ਸ ਮ��� ਸਹਾ�� ਨਹ�� ਹ�।\n"
 
-#: ../lib/protocols.c:1159 ../lib/protocols.c:1174 ../lib/protocols.c:2356
-#: ../lib/protocols.c:2469
-#, c-format
-msgid "Looking up %s\n"
-msgstr "%s ਦ� ��� �ਾਰ�\n"
-
-#: ../lib/protocols.c:1165 ../lib/protocols.c:1180 ../lib/protocols.c:2361
-#: ../lib/protocols.c:2474
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "ਹ�ਸ� ਨਾ� %s ਨ�ੰ ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s\n"
-
-#: ../lib/protocols.c:2091
+#: ../lib/protocols.c:1155
 #, c-format
 msgid "Found recursive symbolic link %s\n"
 msgstr ""
 
-#: ../lib/protocols.c:2379
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "ਸਾ�� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s\n"
-
-#: ../lib/protocols.c:2385 ../lib/protocols.c:2491
-#, c-format
-msgid "Trying %s:%d\n"
-msgstr "%s ਲ� ��ਸ਼ਿਸ �ਾਰ�:%d\n"
-
-#: ../lib/protocols.c:2390 ../lib/protocols.c:2498
-#, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "%s ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s\n"
-
-#: ../lib/protocols.c:2428 ../lib/rfc959.c:706
-#, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "IPv4 ਸਾ�� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s\n"
-
-#: ../lib/protocols.c:2452 ../lib/sshv2.c:1142
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr "ਸਰਵਿਸ ਨਾ� %s/tcp ���� ਨਹ�� �ਾ ਸ�ਦ� ਹ�। �ਪਣ� ਸਰਵਿਸ ਫਾ�ਲ ��ੱ� �ਰ� ��\n"
-
-#: ../lib/protocols.c:2514 ../lib/protocols.c:3167 ../lib/rfc959.c:715
-#: ../lib/rfc959.c:892
-#, c-format
-msgid "Error: Cannot set close on exec flag: %s\n"
-msgstr "�ਲਤ�: exec ਨਿਸ਼ਾਨ ਤ� ਬੰਦ ਦਿੱਤਾ ਨਹ�� �ਾ ਸ�ਿ�: %s\n"
-
-#: ../lib/protocols.c:2521
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "%s ਨਾਲ ���ਿ�:%d\n"
-
-#: ../lib/protocols.c:2757 ../lib/protocols.c:2834 ../lib/sshv2.c:435
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "%s ਨਾਲ ��ਨ��ਸ਼ਨ �ੰਤਰਾਲ ਸਮਾਪਤ\n"
-
-#: ../lib/protocols.c:2904
-#, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "ਸਾ�� ਨਿਸ਼ਾਨ ਪ�ਰਾਪਤ ਨਹ��: %s\n"
-
-#: ../lib/protocols.c:2918
-#, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "ਸਾ�� ਲ� ਨਾ-ਪਾਬੰਦ� ਨਹ�� ਹ� ਸ��: %s\n"
-
-#: ../lib/protocols.c:3064
+#: ../lib/protocols.c:1533
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "�ਲਤ�: ਰਿਮ�� ਸਾ�� %s ਨਾਲ ��ਨ��ਸ਼ਨ ��ੱ�ਿ� ਹ�। �ਧਿ�ਤਮ ��ਸ਼ਿਸ਼ਾ� ਹ��...�ੱਡਿ� �ਾਦਾ ਹ�\n"
 
-#: ../lib/protocols.c:3072
+#: ../lib/protocols.c:1541
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "�ਲਤ�: ਰਿਮ�� ਸਾ�� %s ਨਾਲ ��ਨ��ਸ਼ਨ ��ੱ�ਿ� ਹ�। %d ਸ�ਿੰ� ਵਿੱ� ���ਿ� �ਾਵ��ਾ।\n"
 
+#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
+#: ../lib/socket-connect.c:126
+#, c-format
+msgid "Error: Cannot set close on exec flag: %s\n"
+msgstr "�ਲਤ�: exec ਨਿਸ਼ਾਨ ਤ� ਬੰਦ ਦਿੱਤਾ ਨਹ�� �ਾ ਸ�ਿ�: %s\n"
+
 #: ../lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
@@ -911,11 +854,11 @@ msgstr "ਫਾ�ਲਵਾਲ ਤ� ���ਨ ਲ� ਪ�ਰ�"
 
 #: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
 msgid "Proxy username:"
-msgstr "ਪਰਾ�ਸ� �ਪਭ��ਤਾ-ਨਾ�:"
+msgstr "ਪਰਾ�ਸ� ਯ��਼ਰ-ਨਾ�:"
 
 #: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
 msgid "Your firewall username"
-msgstr "ਤ�ਹਾਡਾ ਫਾ�ਰਵਾਲ �ਪਭ��ਤਾ ਨਾ�"
+msgstr "ਤ�ਹਾਡਾ ਫਾ�ਰਵਾਲ ਯ��਼ਰ-ਨਾ�"
 
 #: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
 msgid "Proxy password:"
@@ -933,7 +876,7 @@ msgstr "HTTP/1.1 ਵਰਤ��"
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "�� ਤ�ਸ�� HTTP/1.1 �ਾ� HTTP/1.0 ਵਰਤਣਾ �ਾਹ�ੰਦ� ਹ�"
 
-#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:843
+#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
 #, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
@@ -942,25 +885,25 @@ msgstr ""
 "ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ ਮਿਲਿ� ਹ�, ਡਿਸ-��ਨ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�\n"
 "ਰਿਮ�� ਸਰਵਰ ਨ� �ਲਤ �ੱ� ਸਾ��਼ '%s' ਵਾਪਸ ਭ��ਿ� ਹ�\n"
 
-#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1219
+#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "ਸਾ�� %s ਤ�� ��ਨ��ਸ਼ਨ ��ੱ� �ਿ�\n"
 
-#: ../lib/rfc2068.c:304
+#: ../lib/rfc2068.c:301
 msgid "Starting the file transfer at offset "
 msgstr "�ਫਸ�� ਤ� ਫਾ�ਲ ਤਬਦ�ਲ� ਸ਼�ਰ� ਹ��"
 
-#: ../lib/rfc2068.c:325
+#: ../lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "ਫਾ�ਲ਼ %s ਨ�ੰ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ\n"
 
-#: ../lib/rfc2068.c:424 ../lib/sshv2.c:1301
+#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "ਡਾ�ਰ���ਰ� ਸ��� ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹ�...\n"
 
-#: ../lib/rfc2068.c:819 ../lib/sshv2.c:895
+#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ ਮਿਲਿ� ਹ�, ਬੰਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�\n"
 
@@ -1004,7 +947,7 @@ msgstr "�ਮ�ਲ �ਡਰ�ੱਸ:"
 msgid ""
 "This is the password that will be used whenever you log into a remote FTP "
 "server as anonymous"
-msgstr "�ਹ ਤ�ਹਾਡਾ ਪਾਸਵਰਡ ਹ�, �� �ਿ ਤ�ਸ�� ਰਿਮ�� FTP ਸਰਵਰ ਨਾਲ ��ਿ�ਤ �ਪਭ��ਤਾ ਤ� ਲਾ�ਿੰਨ �ਰਨਾ ਹ�ਵ��ਾ"
+msgstr "�ਹ ਤ�ਹਾਡਾ ਪਾਸਵਰਡ ਹ�, �� �ਿ ਤ�ਸ�� ਰਿਮ�� FTP ਸਰਵਰ ਨਾਲ ��ਿ�ਤ ਯ��਼ਰ ਵ��� ਲਾ��ਨ �ਰਨਾ ਹ�ਵ��ਾ"
 
 #: ../lib/rfc959.c:59
 msgid "Proxy account:"
@@ -1027,7 +970,12 @@ msgid ""
 "host of the FTP server. The second character can be u (user), p (pass), h "
 "(host), o (port) or a (account). For example, to specify the proxy user, you "
 "can you type in %pu"
-msgstr "�ਹ ਤਹਿ �ਰਦ� ਹ� �ਿ ਤ�ਹਾਡਾ ਪਰਾ�ਸ� ਸਰਵਰ ਸਾਨ�ੰ �ਿਵ�� ਲਾ��ਨ �ਰਨ ਦ�ਣਾ �ਾਹ�ੰਦਾ ਹ�। ਤ�ਸ�� % ਨਾਲ ਸ਼�ਰ� ਹ�ਣ ਵਾਲ� 2 �ੱ�ਰਾ� ਦ� ਤਬਦ�ਲ ਲਾ�ਨ ਦ� ਸ�ਦ� ਹ�, �� �ਿ ਠ�� ਡਾ�� ਨਾਲ ਬਦਲ� �ਾਵ���। ਪਹਿਲਾ� �ੱ�ਰ p ਪਰਾ�ਸ� ਲ� ਹ� ਸ�ਦਾ ਹ� �ਾ� h FTP ਸਰਵਰ ਦ� ਹ�ਸ� ਲ�। ਦ��ਾ �ੱ�ਰ u (ਯ��਼ਰ), p (ਪਾਸਵਰਡ), h (ਹ�ਸ�), o (ਪ�ਰ�), �ਾ� a (��ਾ���) ਲ� ਹ� ਸ�ਦਾ ਹ�। �ਦਾਹਰਨ ਵਾਸਤ� ਪਰਾ�ਸ� ਯ��਼ਰ ਲ� ਤ�ਸ�� %pu ਲਿ� ਸ�ਦ� ਹ�।"
+msgstr ""
+"�ਹ ਤਹਿ �ਰਦ� ਹ� �ਿ ਤ�ਹਾਡਾ ਪਰਾ�ਸ� ਸਰਵਰ ਸਾਨ�ੰ �ਿਵ�� ਲਾ��ਨ �ਰਨ ਦ�ਣਾ �ਾਹ�ੰਦਾ ਹ�। ਤ�ਸ�� % ਨਾਲ "
+"ਸ਼�ਰ� ਹ�ਣ ਵਾਲ� 2 �ੱ�ਰਾ� ਦ� ਤਬਦ�ਲ ਲਾ�ਨ ਦ� ਸ�ਦ� ਹ�, �� �ਿ ਠ�� ਡਾ�� ਨਾਲ ਬਦਲ� �ਾਵ���। ਪਹਿਲਾ� "
+"�ੱ�ਰ p ਪਰਾ�ਸ� ਲ� ਹ� ਸ�ਦਾ ਹ� �ਾ� h FTP ਸਰਵਰ ਦ� ਹ�ਸ� ਲ�। ਦ��ਾ �ੱ�ਰ u (ਯ��਼ਰ), p "
+"(ਪਾਸਵਰਡ), h (ਹ�ਸ�), o (ਪ�ਰ�), �ਾ� a (��ਾ���) ਲ� ਹ� ਸ�ਦਾ ਹ�। �ਦਾਹਰਨ ਵਾਸਤ� ਪਰਾ�ਸ� ਯ��਼ਰ "
+"ਲ� ਤ�ਸ�� %pu ਲਿ� ਸ�ਦ� ਹ�।"
 
 #: ../lib/rfc959.c:69
 msgid "Ignore PASV address"
@@ -1054,11 +1002,10 @@ msgid ""
 "gFTP will open up a port on the client side and the remote server will "
 "attempt to connect to it."
 msgstr ""
-"�� �ਹ ਯ�� ��ਤਾ ਤਾ� ਰਿਮ�� FTP ਸਰਵਰ �ੱ� ਡਾ�ਾ ��ਨ��ਸ਼ਨ ਲ� �ੱ� ਪ�ਰ� ��ਲ�ਹ��ਾ। �� ਤ�ਸ�� "
-"ਫਾ�ਰਵਾਲ ਦ� ਪਿੱ�� ਹ� ਤਾ� ਤ�ਹਾਨ�ੰ �ਹ ਯ�� �ਰਨ ਦ� ਲ�� ਪਵ���। �ਮ ਤ�ਰ �ੱਤ� �ਹ �ਦ�� ਤੱ� "
-"ਯ�� ਰੱ�ਣਾ ਵਧ�� ਹ�, �ਦ�� ਤੱ� �ਿ ਤ�ਸ�� �ੱ� ਪ�ਰਾਣ� FTP ਸਰਵਰ ਨਾਲ ਨਹ�� ��� ਰਹ�, �� �ਿ "
-"�ਸ ਲ� ਸਹਾ�� ਨਹ�� ਹ�। �� �ਹ �ਯ�� ��ਤਾ ਤਾ� gFTP �ਲਾ�� ਸਾ�ਡ �ੱਤ� �ੱ� ਪ�ਰ� "
-"��ਲ�ਹ��ਾ �ਤ� ਰਿਮ�� ਸਰਵਰ �ਸ ਨਾਲ ��ਨ��� �ਰਨ ਦ� ��ਸ਼ਿਸ਼ �ਰ��ਾ।"
+"�� �ਹ ਯ�� ��ਤਾ ਤਾ� ਰਿਮ�� FTP ਸਰਵਰ �ੱ� ਡਾ�ਾ ��ਨ��ਸ਼ਨ ਲ� �ੱ� ਪ�ਰ� ��ਲ�ਹ��ਾ। �� ਤ�ਸ�� ਫਾ�ਰਵਾਲ ਦ� "
+"ਪਿੱ�� ਹ� ਤਾ� ਤ�ਹਾਨ�ੰ �ਹ ਯ�� �ਰਨ ਦ� ਲ�� ਪਵ���। �ਮ ਤ�ਰ �ੱਤ� �ਹ �ਦ�� ਤੱ� ਯ�� ਰੱ�ਣਾ ਵਧ�� ਹ�, �ਦ�� ਤੱ� "
+"�ਿ ਤ�ਸ�� �ੱ� ਪ�ਰਾਣ� FTP ਸਰਵਰ ਨਾਲ ਨਹ�� ��� ਰਹ�, �� �ਿ �ਸ ਲ� ਸਹਾ�� ਨਹ�� ਹ�। �� �ਹ �ਯ�� ��ਤਾ "
+"ਤਾ� gFTP �ਲਾ�� ਸਾ�ਡ �ੱਤ� �ੱ� ਪ�ਰ� ��ਲ�ਹ��ਾ �ਤ� ਰਿਮ�� ਸਰਵਰ �ਸ ਨਾਲ ��ਨ��� �ਰਨ ਦ� ��ਸ਼ਿਸ਼ �ਰ��ਾ।"
 
 #: ../lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
@@ -1071,8 +1018,9 @@ msgid ""
 "will want to disable this is if the remote FTP server doesn't support the -L "
 "option to LIST"
 msgstr ""
-"ਰਿਮ�� FTP ਸਰਵਰ ਡਾ�ਰ���ਰ� ਲਿਸ� ਵਿੱ� symlink ਲੱਭਣ ਦ� ��ਸ਼ਿਸ਼ �ਰ��ਾ। �ਮ ਤ�ਰ �ੱਤ�, "
-"�ਹ �ਾਲ� �ੱਡਣਾ ਠ�� ਹ�। ਤ�ਸ�� �ਸ ਨ�ੰ ��ਵਲ �ਸ� ਸਮ�� �ਯ�� �ਰਨਾ �ਾਹ���, �ਦ�� �ਿ ਰਿਮ�� FTP -L ��ਣ ਨਾਲ LIST ਲ� ਸਹਿਯ��� ਨਾ ਹ�ਵ�।"
+"ਰਿਮ�� FTP ਸਰਵਰ ਡਾ�ਰ���ਰ� ਲਿਸ� ਵਿੱ� symlink ਲੱਭਣ ਦ� ��ਸ਼ਿਸ਼ �ਰ��ਾ। �ਮ ਤ�ਰ �ੱਤ�, �ਹ �ਾਲ� "
+"�ੱਡਣਾ ਠ�� ਹ�। ਤ�ਸ�� �ਸ ਨ�ੰ ��ਵਲ �ਸ� ਸਮ�� �ਯ�� �ਰਨਾ �ਾਹ���, �ਦ�� �ਿ ਰਿਮ�� FTP -L ��ਣ ਨਾਲ LIST "
+"ਲ� ਸਹਿਯ��� ਨਾ ਹ�ਵ�।"
 
 #: ../lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
@@ -1092,81 +1040,141 @@ msgstr ""
 "��ਣ ਨ�ੰ �ਯ�� �ਰ ਸ�ਦ� ਹ�।"
 
 #: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
-#: ../lib/rfc959.c:855 ../lib/rfc959.c:1449
+#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "ਸਰਵਰ ਤ�� '%c' �ਵਾਬ ਮਿਲਿ� ਹ�।\n"
 
+#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "IPv4 ਸਾ�� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s\n"
+
 #: ../lib/rfc959.c:745 ../lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "PASV �ਵਾਬ '%s' ਵਿੱ� ��� IP �ਡਰ�ੱਸ ਨਹ�� ਲੱਭਿ� �ਾ ਸ�ਿ�\n"
 
-#: ../lib/rfc959.c:781
+#: ../lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
-msgstr "PASV �ਵਾਬ ਦ� IP ਸਿਰਨਾਵ�� ਨ�ੰ �ਣਡਿੱਠਾ ��ਤਾ �ਾਦਾ ਹ�, %d.%d.%d.%d:%d ਤ� ���ਿ� �ਾਦਾ ਹ�\n"
+msgstr "PASV �ਵਾਬ ਦ� IP �ਡਰ�ੱਸ ਨ�ੰ �ਣਡਿੱਠਾ ��ਤਾ �ਾਦਾ ਹ�, %d.%d.%d.%d:%d ਤ� ���ਿ� �ਾਦਾ ਹ�\n"
 
-#: ../lib/rfc959.c:792 ../lib/rfc959.c:953
+#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "ਡਾ�ਾ ��ਨ��ਸ਼ਨ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s\n"
 
-#: ../lib/rfc959.c:804 ../lib/rfc959.c:825 ../lib/rfc959.c:978
+#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "ਸਾ�� ਨਾ� ਪ�ਰਾਪਤ ਨਹ�� ਹ� ਸ�ਦਾ: %s\n"
 
-#: ../lib/rfc959.c:815 ../lib/rfc959.c:968
+#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
-msgstr "ਪ�ਰ� ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s\n"
+msgstr "ਪ�ਰ� ਨਾਲ ਬਾ�ਡ ਨਹ�� �ਾ ਸ�ਦਾ: %s\n"
 
-#: ../lib/rfc959.c:834 ../lib/rfc959.c:987
+#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "ਪ�ਰ� %d ਤ� ਸ�ਣਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s\n"
 
-#: ../lib/rfc959.c:883
+#: ../lib/rfc959.c:876
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "�ੱ� IPv6 ਸਾ�� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s\n"
 
-#: ../lib/rfc959.c:903
+#: ../lib/rfc959.c:895
 msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr "�ਲਤ�: �ਹ �ਾਪਦਾ ਹ� �ਿ �ਸ�� IPv6 ਨਾਲ ��ਨ��� ਨਹ�� ਹ� ਰਹ� ਹਾ�। ��ਨ��ਸ਼ਨ �ਧ�ਰਾ �ੱਡਿ�।\n"
 
-#: ../lib/rfc959.c:931 ../lib/rfc959.c:940
+#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "�ਲਤ EPSV �ਵਾਬ '%s'\n"
 
-#: ../lib/rfc959.c:997
+#: ../lib/rfc959.c:989
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "ਲ��ਲ ਸਾ�� ਦਾ �ਡਰ�ੱਸ ਨਹ�� ਮਿਲਿ�: %s\n"
 
-#: ../lib/rfc959.c:1084
+#: ../lib/rfc959.c:1076
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "ਸਰਵਰ ਤ�� ��ਨ��ਸ਼ਨ ਸਵ��ਾਰ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: %s\n"
 
-#: ../lib/rfc959.c:1619
+#: ../lib/rfc959.c:1584
 msgid "total"
 msgstr "��ੱਲ"
 
-#: ../lib/rfc959.c:1621
+#: ../lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "ਸਾਵਧਾਨ: %s ਸ��� ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ\n"
 
+#: ../lib/socket-connect-getaddrinfo.c:77
+#: ../lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "%s ਦ� ��� �ਾਰ�\n"
+
+#: ../lib/socket-connect-getaddrinfo.c:82
+#: ../lib/socket-connect-gethostbyname.c:69
+#, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr "ਹ�ਸ� ਨਾ� %s ਨ�ੰ ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s\n"
+
+#: ../lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "ਸਾ�� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s\n"
+
+#: ../lib/socket-connect-getaddrinfo.c:121
+#: ../lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "%s ਲ� ��ਸ਼ਿਸ �ਾਰ�:%d\n"
+
+#: ../lib/socket-connect-getaddrinfo.c:127
+#: ../lib/socket-connect-gethostbyname.c:141
+#, c-format
+msgid "Cannot connect to %s: %s\n"
+msgstr "%s ਨਾਲ ��ਨ��� ਨਹ�� �ਾ ਸ�ਦਾ: %s\n"
+
+#: ../lib/socket-connect-getaddrinfo.c:152
+#: ../lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "%s ਨਾਲ ��ਨ��� ��ਤਾ:%d\n"
+
+#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#, c-format
+msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgstr "ਸਰਵਿਸ ਨਾ� %s/tcp ���� ਨਹ�� �ਾ ਸ�ਦ� ਹ�। �ਪਣ� ਸਰਵਿਸ ਫਾ�ਲ ��ੱ� �ਰ� ��\n"
+
+#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "%s ਨਾਲ ��ਨ��ਸ਼ਨ �ੰਤਰਾਲ ਸਮਾਪਤ\n"
+
+#: ../lib/sockutils.c:338
+#, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "ਸਾ�� ਨਿਸ਼ਾਨ ਪ�ਰਾਪਤ ਨਹ��: %s\n"
+
+#: ../lib/sockutils.c:352
+#, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "ਸਾ�� ਲ� ਨਾ-ਪਾਬੰਦ� ਨਹ�� ਹ� ਸ��: %s\n"
+
 #: ../lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
 
 #: ../lib/sshv2.c:31
 msgid "SSH Prog Name:"
-msgstr "SSH �ਾਰ� ਨਾ�:"
+msgstr "SSH ਪਰ��ਰਾਮ ਨਾ�:"
 
 #: ../lib/sshv2.c:33
 msgid "The path to the SSH executable"
@@ -1178,7 +1186,7 @@ msgstr "SSH ਵਾਧ� ਮ�ੱਲ:"
 
 #: ../lib/sshv2.c:36
 msgid "Extra parameters to pass to the SSH program"
-msgstr "SSH �ਾਰ� ਲ� ਵਾਧ� ਮ�ੱਲ ਦਿ�"
+msgstr "SSH ਪਰ��ਰਾਮ ਲ� ਵਾਧ� ਮ�ੱਲ ਦਿ�"
 
 #: ../lib/sshv2.c:38
 msgid "Need SSH User/Pass"
@@ -1191,7 +1199,7 @@ msgstr "SSH ��ਨ��ਸ਼ਨ ਲ� ਯ��਼ਰ ਨਾ�/ਪਾਸਵ
 #: ../lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
-msgstr "�ਾਰ� %s �ੱਲ਼ ਰਿਹਾ ਹ�\n"
+msgstr "ਪਰ��ਰਾਮ %s �ੱਲ਼ ਰਿਹਾ ਹ�\n"
 
 #: ../lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
@@ -1215,10 +1223,10 @@ msgstr "(ਹਾ�(yes)/ਨਹ��(no))?"
 
 #: ../lib/sshv2.c:514
 msgid "Enter PASSCODE:"
-msgstr "ਪਾਸਵਰਡ ਦਿ�:"
+msgstr "ਪਾਸ��ਡ ਦਿ�:"
 
-#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:585
-#: ../src/gtk/transfer.c:595
+#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
+#: ../src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "ਪਾਸਵਰਡ ਦਿ�"
 
@@ -1233,17 +1241,17 @@ msgstr "�ਲਤ�: �ਲਤ ਪਾਸਵਰਡ ਦਿੱਤਾ �ਿ� ਹ
 #: ../lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
-msgstr "%d: ਪ�ਰ����ਾਲ ਸ਼�ਰ��ਤ\n"
+msgstr "%d: ਪਰ����ਾਲ ਸ਼�ਰ��ਤ\n"
 
 #: ../lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
-msgstr "%d: ਪ�ਰ����ਾਲ ਵਰ�ਨ %d\n"
+msgstr "%d: ਪਰ����ਾਲ ਵਰ�ਨ %d\n"
 
 #: ../lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
-msgstr "%d: %s ��ਲ�\n"
+msgstr "%d: %s ��ਲ�ਹ�\n"
 
 #: ../lib/sshv2.c:614
 #, c-format
@@ -1348,8 +1356,8 @@ msgstr "ਸਰਵਰ ਨ� �ਣ�ਾਣ ਸ�ਨ�ਹਾ ਦਿੱਤਾ 
 msgid "Error: Message size %d too big\n"
 msgstr "�ਲਤ�: ਸ�ਨ�ਹਾ ��ਾਰ %d ਬਹ�ਤ ਵੱਡਾ ਹ�\n"
 
-#: ../lib/sshv2.c:811 ../lib/sshv2.c:1320 ../lib/sshv2.c:1895
-#: ../lib/sshv2.c:2015
+#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
+#: ../lib/sshv2.c:1957
 #, c-format
 msgid "Error: Message size %d too big from server\n"
 msgstr "�ਲਤ�: ਸਰਵਰ ਤ�� ਸ�ਨ�ਹਾ ��ਾਰ %d ਬਹ�ਤ ਵੱਡਾ ਹ�\n"
@@ -1359,18 +1367,18 @@ msgid ""
 "There was an error initializing a SSH connection with the remote server. The "
 "error message from the remote server follows:\n"
 msgstr ""
-"ਰਿਮ�� ਸਰਵਰ ਨਾਲ SSH ��ਨ��ਸ਼ਨ ਸ਼�ਰ� �ਰਨ ਦ�ਰਾਨ �ੱ� �ਲਤ� ਹ�। "
-"ਰਿਮ�� ਸਰਵਰ ਵਲ�� �ੱ�� ਦਿੱਤਾ �ਲਤ� ਸ�ਨ�ਹਾ ਮਿਲਿ�:\n"
+"ਰਿਮ�� ਸਰਵਰ ਨਾਲ SSH ��ਨ��ਸ਼ਨ ਸ਼�ਰ� �ਰਨ ਦ�ਰਾਨ �ੱ� �ਲਤ� ਹ�। ਰਿਮ�� ਸਰਵਰ ਵਲ�� �ੱ�� ਦਿੱਤਾ �ਲਤ� "
+"ਸ�ਨ�ਹਾ ਮਿਲਿ�:\n"
 
-#: ../lib/sshv2.c:1134
+#: ../lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "%s ਤ� SSH ��ਨ��ਸ਼ਨ ਸਫਲਤਾਪ�ਰ� ��ੱਲਿ�\n"
 
-#: ../lib/sshv2.c:1186
+#: ../lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
-msgstr "SSH ਸਰਵਰ %s ਤ� ਸਫਲਤਾਪ�ਰ� ਲਾ�ਿੰਨ ��ਤਾ �ਿ�\n"
+msgstr "SSH ਸਰਵਰ %s ਤ� ਸਫਲਤਾਪ�ਰ� ਲਾ��ਨ ��ਤਾ �ਿ�\n"
 
 #: ../lib/sslcommon.c:31
 msgid "SSL Engine"
@@ -1378,7 +1386,7 @@ msgstr "SSL �ੰ�ਣ"
 
 #: ../lib/sslcommon.c:34
 msgid "SSL Entropy File:"
-msgstr "SSL ���ਰ�ਪ� ਫਾ�ਲ:"
+msgstr "SSL �ੰ��ਰ�ਪ� ਫਾ�ਲ:"
 
 #: ../lib/sslcommon.c:36
 msgid "SSL entropy file"
@@ -1386,11 +1394,11 @@ msgstr "SSL �ੰ��ਰ�ਪ� ਫਾ�ਲ"
 
 #: ../lib/sslcommon.c:37
 msgid "Entropy Seed Length:"
-msgstr "���ਰ�ਪ� ਸ�ਡ ਲੰਬਾ�:"
+msgstr "�ੰ��ਰ�ਪ� ਸ�ਡ ਲੰਬਾ�:"
 
 #: ../lib/sslcommon.c:39
 msgid "The maximum number of bytes to seed the SSL engine with"
-msgstr "SSL ਨਾਲ �ਧਿ�ਤਮ ਬਾ��ਾ� ਦ� �ਿਣਤ�"
+msgstr "SSL �ੰ�ਣ ਨਾਲ ਸ�ਡ �ਰਨ ਲ� �ਧਿ�ਤਮ ਬਾ��ਾ� ਦ� �ਿਣਤ�"
 
 #: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
 msgid "Verify SSL Peer"
@@ -1413,7 +1421,7 @@ msgstr ""
 msgid "Cannot get peer certificate\n"
 msgstr "ਪ��ਰ ਸਰ��ਫਿ��� ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ\n"
 
-#: ../lib/sslcommon.c:199
+#: ../lib/sslcommon.c:196
 #, c-format
 msgid ""
 "ERROR: The host in the SSL certificate (%s) does not match the host that we "
@@ -1422,31 +1430,31 @@ msgstr ""
 "�ਲਤ�: SSL ਸਰ��ਫਿ��� (%s) ਵਿੱ� ਹ�ਸ� �ਸ ਹ�ਸ� ਨਾਲ ਮਿਲਦਾ ਨਹ�� ਹ�, �ਿਸ ਨਾਲ �ਸ�� ��ਨ��� "
 "��ਤਾ ਹ� (%s)। ��ਨ��ਸ਼ਨ �ਧ�ਰਾ �ੱਡਿ�।\n"
 
-#: ../lib/sslcommon.c:306
+#: ../lib/sslcommon.c:302
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr "OpenSSL ਬਾ�ਨਰ� ਸ਼�ਰ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�\n"
 
-#: ../lib/sslcommon.c:321
+#: ../lib/sslcommon.c:317
 msgid "Error loading default SSL certificates\n"
-msgstr "ਮ�ਲ SSL ਸਰ��ਫਿ��� ਲ�ਡ �ਰਨ �ਲਤ�\n"
+msgstr "ਡਿਫਾਲ� SSL ਸਰ��ਫਿ��� ਲ�ਡ �ਰਨ �ਲਤ�\n"
 
-#: ../lib/sslcommon.c:333
+#: ../lib/sslcommon.c:329
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr "ਸ�ਫ਼ਰ ਲਿਸ� ਸ��ਿੰ� �ਲਤ� (��� ਠ�� ਸ�ਫ਼ਰ ਨਹ��)\n"
 
-#: ../lib/sslcommon.c:353 ../lib/sslcommon.c:427 ../lib/sslcommon.c:475
+#: ../lib/sslcommon.c:349 ../lib/sslcommon.c:423 ../lib/sslcommon.c:471
 msgid "Error: SSL engine was not initialized\n"
 msgstr "�ਲਤ�: SSL �ੰ�ਣ �ਾਲ� ਨਹ�� ਹ� ਸ�ਿ�\n"
 
-#: ../lib/sslcommon.c:370
+#: ../lib/sslcommon.c:366
 msgid "Error setting up SSL connection (BIO object)\n"
 msgstr "�ਲਤ�, SSL ��ਨ��ਸ਼ਨ ਬਣਾ�ਣ ਦ�ਰਾਨ (BIO ��ਾ�)\n"
 
-#: ../lib/sslcommon.c:380
+#: ../lib/sslcommon.c:376
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr "�ਲਤ� SSL ��ਨ��ਸਨ ਬਣਾ�ਣ ਦ�ਰਾਨ (SSL ��ਾ�)\n"
 
-#: ../lib/sslcommon.c:401
+#: ../lib/sslcommon.c:397
 #, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "ਪ��ਰ ਸਰ��ਫਿ��� ਨਾਲ �ਲਤ�: %s\n"
@@ -1460,97 +1468,86 @@ msgstr "�ਾਰਵਾ� ਰੱਦ ��ਤ�\n"
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "��ਨ��ਸ਼ਨ ਲ� ਮ�� ��ਸ਼ਸ �ਰਨ ਤ�� ਪਹਿਲਾ� %d ਸ�ਿੰ� �ਡ��\n"
 
-#: ../src/uicommon/gftpui.c:157
-msgid ""
-">. If you have any questions, comments, or suggestions about this program, "
-"please feel free to email them to me. You can always find out the latest "
-"news about gFTP from my website at http://www.gftp.org/\n";
-msgstr ""
-"> �� ਤ�ਹਾਨ�ੰ �ਸ ਪਰ��ਰਾਮ ਬਾਰ� ��� ਸਵਾਲ, ਸ��ਾ� �ਾ� �ਾਣ�ਾਰ� ਹ�ਵ� ਤਾ� ਮ�ਨ�ੰ �ਮ�ਲ ਭ��ਣ "
-"ਦ� ���ਲ �ਰਨ�। ਤ�ਸ�� ਮ�ਰ� ਵ�ੱਬ ਸਾ�� http://www.gftp.org/ ਤ�� ਹਮ�ਸ਼ਾ ਨਵਾ� gFTP ਲ� "
-"ਸ�ਦ� ਹ�।\n"
-
-#: ../src/uicommon/gftpui.c:158
+#: ../src/uicommon/gftpui.c:156
 msgid ""
 "gFTP comes with ABSOLUTELY NO WARRANTY; for details, see the COPYING file. "
 "This is free software, and you are welcome to redistribute it under certain "
 "conditions; for details, see the COPYING file\n"
 msgstr ""
-"gFTP ਦ� �ਸਲ ਵਿੱ� ��� ਵਾਰੰ�� ਨਹ�� ਹ�। ਵ�ਰਵ� ਲ�, ਤ�ਸ�� COPYING ਫਾ�ਲ ਵ�� "
-"ਸ�ਦ� ਹ�। "
-"�ਸ ਮ�ਫਤ/ਮ��ਤ ਸਾਫ�ਵ��ਰ ਹ� �ਤ� ਤ�ਹਾਨ�ੰ ��� ਸ਼ਰਤਾ� �ੱਤ� �ਸ ਨ�ੰ ਮ��-ਵੰਡਣ ਦਾ �ਧਿ�ਾਰ ਹ�। "
-"ਵ�ਰਵ� ਲ� COPYING ਫਾ�ਲ ਵ���।\n"
+"gFTP ਦ� �ਸਲ ਵਿੱ� ��� ਵਾਰੰ�� ਨਹ�� ਹ�। ਵ�ਰਵ� ਲ�, ਤ�ਸ�� COPYING ਫਾ�ਲ ਵ�� ਸ�ਦ� ਹ�। �ਸ ਮ�ਫਤ/"
+"ਮ��ਤ ਸਾਫ�ਵ��ਰ ਹ� �ਤ� ਤ�ਹਾਨ�ੰ ��� ਸ਼ਰਤਾ� �ੱਤ� �ਸ ਨ�ੰ ਮ��-ਵੰਡਣ ਦਾ �ਧਿ�ਾਰ ਹ�। ਵ�ਰਵ� ਲ� COPYING "
+"ਫਾ�ਲ ਵ���।\n"
 
-#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
+#: ../src/uicommon/gftpui.c:158 ../src/gtk/menu-items.c:491
 msgid "Translated by"
 msgstr ""
-"�ਮਨਪ�ਰ�ਤ ਸਿੰ� �ਲਮ (amanpreetalam yahoo com)\n"
+"�ਮਨਪਰ�ਤ ਸਿੰ� �ਲਮ (aalam users sf net)\n"
 "Punjab Open Source Softrware Tercel\n"
-"http://punlinux.sf.net";
+"http://www.satluj.com";
 
-#: ../src/uicommon/gftpui.c:207 ../src/uicommon/gftpui.c:249
-#: ../src/uicommon/gftpui.c:289 ../src/uicommon/gftpui.c:324
-#: ../src/uicommon/gftpui.c:359 ../src/uicommon/gftpui.c:395
-#: ../src/uicommon/gftpui.c:431 ../src/uicommon/gftpui.c:496
-#: ../src/uicommon/gftpui.c:577 ../src/uicommon/gftpui.c:845
+#: ../src/uicommon/gftpui.c:205 ../src/uicommon/gftpui.c:247
+#: ../src/uicommon/gftpui.c:287 ../src/uicommon/gftpui.c:322
+#: ../src/uicommon/gftpui.c:357 ../src/uicommon/gftpui.c:393
+#: ../src/uicommon/gftpui.c:429 ../src/uicommon/gftpui.c:494
+#: ../src/uicommon/gftpui.c:575 ../src/uicommon/gftpui.c:845
 msgid "Error: Not connected to a remote site\n"
 msgstr "�ਲਤ�: ਰਿਮ�� ਸਾ�� ਨਾਲ ���� ਨਹ��\n"
 
-#: ../src/uicommon/gftpui.c:218
+#: ../src/uicommon/gftpui.c:216
 msgid "usage: chmod <mode> <file>\n"
 msgstr "ਵਰਤ��: chmod <mode> <file>\n"
 
-#: ../src/uicommon/gftpui.c:259
+#: ../src/uicommon/gftpui.c:257
 msgid "usage: rename <old name> <new name>\n"
 msgstr "ਵਰਤ��: rename <old name> <new name>\n"
 
-#: ../src/uicommon/gftpui.c:295
+#: ../src/uicommon/gftpui.c:293
 msgid "usage: delete <file>\n"
 msgstr "ਵਰਤ��: delete <file>\n"
 
-#: ../src/uicommon/gftpui.c:330
+#: ../src/uicommon/gftpui.c:328
 msgid "usage: rmdir <directory>\n"
 msgstr "ਵਰਤ��: rmdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:365
+#: ../src/uicommon/gftpui.c:363
 msgid "usage: site <site command>\n"
 msgstr "ਵਰਤ��: site <site command>\n"
 
-#: ../src/uicommon/gftpui.c:401
+#: ../src/uicommon/gftpui.c:399
 msgid "usage: mkdir <new directory>\n"
 msgstr "ਵਰਤ��: mkdir <new directory>\n"
 
-#: ../src/uicommon/gftpui.c:437 ../src/uicommon/gftpui.c:455
+#: ../src/uicommon/gftpui.c:435 ../src/uicommon/gftpui.c:453
 msgid "usage: chdir <directory>\n"
 msgstr "ਵਰਤ��: chdir <directory>\n"
 
-#: ../src/uicommon/gftpui.c:528
+#: ../src/uicommon/gftpui.c:526
 msgid "Invalid argument\n"
 msgstr "�ਲਤ ਮ�ੱਲ\n"
 
-#: ../src/uicommon/gftpui.c:541
+#: ../src/uicommon/gftpui.c:539
 msgid "Clear the directory cache\n"
-msgstr "ਡਾ�ਰ���ਰ� ����� ਸਾ�\n"
+msgstr "ਡਾ�ਰ���ਰ� ��ਸ ਸਾ�\n"
 
-#: ../src/uicommon/gftpui.c:630
+#: ../src/uicommon/gftpui.c:628
 msgid "usage: open "
 msgstr "ਵਰਤ��: open "
 
-#: ../src/uicommon/gftpui.c:706
+#: ../src/uicommon/gftpui.c:704
 msgid "usage: set [variable = value]\n"
 msgstr "ਵਰਤ��: set [variable = value]\n"
 
-#: ../src/uicommon/gftpui.c:720
+#: ../src/uicommon/gftpui.c:718
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
-msgstr "�ਲਤ�: ਮ�ੱਲ %s ਠ�� ਸੰਰ�ਨਾ ਮ�ੱਲ ਨਹ�ਨ ਹ�।\n"
+msgstr "�ਲਤ�: ਮ�ੱਲ %s ਠ�� ਸੰਰ�ਨਾ ਮ�ੱਲ ਨਹ�� ਹ�।\n"
 
-#: ../src/uicommon/gftpui.c:727
+#: ../src/uicommon/gftpui.c:725
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "�ਲਤ�: ਮ�ੱਲ %s gFTP ਦ� ਪਾਠ ਢੰ� ਦ�ਰਾਨ �ਪਲੱਬਧ ਹ�\n"
 
-#: ../src/uicommon/gftpui.c:809
+#: ../src/uicommon/gftpui.c:807
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1569,7 +1566,7 @@ msgstr "about"
 
 #: ../src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
-msgstr "gFTP �ਾਣ�ਾਰ� ਵ��ਾ�"
+msgstr "gFTP �ਾਣ�ਾਰ� ਵ���"
 
 #: ../src/uicommon/gftpui.c:939
 msgid "ascii"
@@ -1653,7 +1650,7 @@ msgstr "help"
 
 #: ../src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
-msgstr "�ਹ ਮੱਦਦ ਪਰਦਾ ਵ��ਾ�"
+msgstr "�ਹ ਮੱਦਦ ਸ�ਰ�ਨ ਵ���"
 
 #: ../src/uicommon/gftpui.c:961
 msgid "lcd"
@@ -1757,7 +1754,7 @@ msgstr "open"
 
 #: ../src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
-msgstr "ਰਿਮ�� ਸਾ�� ਤ� ��ਨ��ਸ਼ਨ ��ਲ�"
+msgstr "ਰਿਮ�� ਸਾ�� ਤ� ��ਨ��ਸ਼ਨ ��ਲ�ਹ�"
 
 #: ../src/uicommon/gftpui.c:991
 msgid "put"
@@ -1769,7 +1766,7 @@ msgstr "pwd"
 
 #: ../src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
-msgstr "ਮ���ਦਾ ਰਿਮ�� ਡਾ�ਰ���ਰ� ਵ��ਾ�"
+msgstr "ਮ���ਦਾ ਰਿਮ�� ਡਾ�ਰ���ਰ� ਵ���"
 
 #: ../src/uicommon/gftpui.c:995
 msgid "quit"
@@ -1785,7 +1782,7 @@ msgstr "rename"
 
 #: ../src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
-msgstr "ਰਿਮ�� ਫਾ�ਲ ਨਾ� ਤਬਦ�ਲ"
+msgstr "ਰਿਮ�� ਫਾ�ਲ ਨਾ� ਬਦਲ�"
 
 #: ../src/uicommon/gftpui.c:999
 msgid "rmdir"
@@ -1815,27 +1812,27 @@ msgstr "ਸਾ�� �ਾਸ �ਮਾ�ਡ �ਲਾ�"
 msgid "Error: Command not recognized\n"
 msgstr "�ਲਤ�: �ਮਾ�ਡ ਪ�ਾਣ� ਨਹ�� ��\n"
 
-#: ../src/uicommon/gftpui.c:1334
+#: ../src/uicommon/gftpui.c:1304
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "%s ਸਫਲਤਾਪ�ਰ� %.2f KB/s ਦਰ ਨਾਲ ਤਬਦ�ਲ ��ਤ� ��\n"
 
-#: ../src/uicommon/gftpui.c:1365
+#: ../src/uicommon/gftpui.c:1335
 #, c-format
 msgid "Skipping file %s on host %s\n"
 msgstr "ਫਾ�ਲ %s ਨ�ੰ ਹ�ਸ� %s ਤ�� �ੱਡਿ� �ਾਦਾ ਹ�\n"
 
-#: ../src/uicommon/gftpui.c:1389
+#: ../src/uicommon/gftpui.c:1359
 #, c-format
 msgid "Stopping the transfer on host %s\n"
 msgstr "%s ਹ�ਸ� ਤ� ਤਬਦ�ਲ� ਰ��� �ਾ ਰਹ� ਹ�\n"
 
-#: ../src/uicommon/gftpui.c:1540
+#: ../src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "%s ਨ�ੰ %s ਤ�� ਡਾ�ਨਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ\n"
 
-#: ../src/uicommon/gftpui.c:1596
+#: ../src/uicommon/gftpui.c:1561
 #, c-format
 msgid ""
 "There were %d files or directories that could not be transferred. Check the "
@@ -1843,11 +1840,11 @@ msgid ""
 msgstr ""
 
 #: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
-#: ../src/gtk/gftp-gtk.c:1096 ../src/gtk/misc-gtk.c:505
+#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
 #: ../src/gtk/misc-gtk.c:513
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
-msgstr "%s: �ਿਰਪਾ �ਰ�� ��� ਵ� �ਰਨ ਤ�� ਪਹਿਲਾ� ਰ��� ਬ�ਨ ਦਬਾ�\n"
+msgstr "%s: ��� ਵ� �ਰਨ ਤ�� ਪਹਿਲਾ� ਰ��� ਬ�ਨ ਦਬਾ� ��।\n"
 
 #: ../src/gtk/bookmarks.c:41
 msgid "Run Bookmark"
@@ -1902,7 +1899,7 @@ msgstr "ਨਵ�� ���ਮ"
 
 #: ../src/gtk/bookmarks.c:483
 msgid "Enter the name of the new item to create"
-msgstr "ਨਵ�� ��ਾ� ਬਣਾ�ਣ ਲ਼� ਨਾ� ਦਿ�"
+msgstr "ਨਵ�� ���ਮ ਬਣਾ�ਣ ਲ� ਨਾ� ਦਿ�"
 
 #: ../src/gtk/bookmarks.c:556
 #, c-format
@@ -1939,7 +1936,7 @@ msgstr "ਪ�ਰ�:"
 
 #: ../src/gtk/bookmarks.c:933
 msgid "Protocol:"
-msgstr "ਪ�ਰ����ਾਲ:"
+msgstr "ਪਰ����ਾਲ:"
 
 #: ../src/gtk/bookmarks.c:957
 msgid "Remote Directory:"
@@ -1951,7 +1948,7 @@ msgstr "ਲ��ਲ ਡਾ�ਰ���ਰ�:"
 
 #: ../src/gtk/bookmarks.c:987
 msgid "Username:"
-msgstr "�ਪਭ��ਤਾ ਨਾ�:"
+msgstr "ਯ��਼ਰ ਨਾ�:"
 
 #: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
 msgid "Password:"
@@ -1963,7 +1960,7 @@ msgstr "��ਾ���:"
 
 #: ../src/gtk/bookmarks.c:1028
 msgid "Log in as ANONYMOUS"
-msgstr "ANONYMOUS ਵਾ�� ਲਾ�ਿੰਨ"
+msgstr "ANONYMOUS ਵਾ�� ਲਾ��ਨ"
 
 #: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
 #: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
@@ -1977,7 +1974,7 @@ msgstr "/ਫਾ�ਲ(_F)"
 
 #: ../src/gtk/bookmarks.c:1205
 msgid "/File/tearoff"
-msgstr "/File/tearoff"
+msgstr "/ਫਾ�ਲ/tearoff"
 
 #: ../src/gtk/bookmarks.c:1206
 msgid "/File/New _Folder..."
@@ -2034,11 +2031,11 @@ msgstr "SGID"
 
 #: ../src/gtk/chmod_dialog.c:188
 msgid "Sticky"
-msgstr "�ਿਪ�ਾ�"
+msgstr "ਸ�ਿੱ��"
 
-#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:780
+#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
 msgid "User"
-msgstr "�ਪਭ��ਤਾ"
+msgstr "ਯ��਼ਰ"
 
 #: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
 #: ../src/gtk/chmod_dialog.c:240
@@ -2055,9 +2052,9 @@ msgstr "ਲਿ�ਣ"
 msgid "Execute"
 msgstr "�ਲਾ�ਣ"
 
-#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:781
+#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
 msgid "Group"
-msgstr "ਸਮ�ਹ"
+msgstr "�ਰ�ੱਪ"
 
 #: ../src/gtk/chmod_dialog.c:232
 msgid "Other"
@@ -2086,10 +2083,10 @@ msgstr "ਫਾ�ਲਾ�/ਡਾ�ਰ���ਰ��� ਹ�ਾ�"
 msgid "Delete"
 msgstr "ਹ�ਾ�"
 
-#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1097 ../src/gtk/misc-gtk.c:929
+#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
 #: ../src/gtk/misc-gtk.c:1004
 msgid "Connect"
-msgstr "����"
+msgstr "��ਨ���"
 
 #: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
 #, c-format
@@ -2114,11 +2111,11 @@ msgstr ""
 
 #: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
 msgid "Open Location"
-msgstr ""
+msgstr "�ਿ�ਾਣਾ ��ਲ�ਹ�"
 
 #: ../src/gtk/gftp-gtk.c:219
 msgid "Enter a URL to connect to"
-msgstr "���ਨ ਲ� URL ਦਿ�"
+msgstr "��ਨ��� ਲ� URL ਦਿ�"
 
 #: ../src/gtk/gftp-gtk.c:265
 msgid "/_FTP"
@@ -2163,7 +2160,7 @@ msgstr "/ਲ��ਲ(_L)"
 
 #: ../src/gtk/gftp-gtk.c:282
 msgid "/Local/tearoff"
-msgstr "/Local/tearoff"
+msgstr "/ਲ��ਲ/tearoff"
 
 #: ../src/gtk/gftp-gtk.c:283
 msgid "/Local/_Open Location..."
@@ -2175,15 +2172,15 @@ msgstr "/ਲ��ਲ/ਡਿਸ-��ਨ��� �ਰ�(_i)"
 
 #: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
 msgid "/Local/sep"
-msgstr "/Local/sep"
+msgstr "/ਲ��ਲ/sep"
 
 #: ../src/gtk/gftp-gtk.c:287
 msgid "/Local/Change _Filespec..."
-msgstr "/ਲ��ਲ/_Filespec ਤਬਦ�ਲ..."
+msgstr "/ਲ��ਲ/_Filespec ਬਦਲ�..."
 
 #: ../src/gtk/gftp-gtk.c:289
 msgid "/Local/_Show selected"
-msgstr "/ਲ��ਲ/��ਣ� ਵ��ਾ�(_S)"
+msgstr "/ਲ��ਲ/��ਣ� ਵ���(_S)"
 
 #: ../src/gtk/gftp-gtk.c:290
 msgid "/Local/Select _All"
@@ -2191,15 +2188,15 @@ msgstr "/ਲ��ਲ/ਸਭ ��ਣ�(_A)"
 
 #: ../src/gtk/gftp-gtk.c:291
 msgid "/Local/Select All Files"
-msgstr "/ਲ��ਲ/ਸਾਰ��� ਫਾ�ਲਾ� ��ਣ�"
+msgstr "/ਲ��ਲ/ਸਭ ਫਾ�ਲਾ� ��ਣ�"
 
 #: ../src/gtk/gftp-gtk.c:292
 msgid "/Local/Deselect All"
-msgstr "/ਲ��ਲ/ਸਾਰ� ਨਾ ��ਣ�"
+msgstr "/ਲ��ਲ/ਸਭ ਨਾ ��ਣ�"
 
 #: ../src/gtk/gftp-gtk.c:294
 msgid "/Local/Save Directory Listing..."
-msgstr "/ਲ��ਲ/ਡਾ�ਰ���ਰ� ਸ��� ਸੰਭਾਲ�.."
+msgstr "/ਲ��ਲ/ਡਾ�ਰ���ਰ� ਲਿਸ� ਸੰਭਾਲ�.."
 
 #: ../src/gtk/gftp-gtk.c:295
 msgid "/Local/Send SITE Command..."
@@ -2243,7 +2240,7 @@ msgstr "/ਰਿਮ��(_R)"
 
 #: ../src/gtk/gftp-gtk.c:309
 msgid "/Remote/tearoff"
-msgstr "/Remote/tearoff"
+msgstr "/ਰਿਮ��/tearoff"
 
 #: ../src/gtk/gftp-gtk.c:310
 msgid "/Remote/_Open Location..."
@@ -2255,7 +2252,7 @@ msgstr "/ਰਿਮ��/ਡਿਸ�-��ਨ��� �ਰ�(_i)"
 
 #: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
 msgid "/Remote/sep"
-msgstr "/Remote/sep"
+msgstr "/ਰਿਮ��/sep"
 
 #: ../src/gtk/gftp-gtk.c:315
 msgid "/Remote/Change _Filespec..."
@@ -2279,7 +2276,7 @@ msgstr "/ਰਿਮ��/ਸਭ ਨਾ-��ਣ�"
 
 #: ../src/gtk/gftp-gtk.c:322
 msgid "/Remote/Save Directory Listing..."
-msgstr "/ਰਿਮ��/ਡਾ�ਰ���ਰ� ਸ��� ਸੰਭਾਲ�..."
+msgstr "/ਰਿਮ��/ਡਾ�ਰ���ਰ� ਲਿਸ� ਸੰਭਾਲ�..."
 
 #: ../src/gtk/gftp-gtk.c:323
 msgid "/Remote/Send SITE Command..."
@@ -2315,7 +2312,7 @@ msgstr "/ਰਿਮ��/ਵ���(_V)..."
 
 #: ../src/gtk/gftp-gtk.c:333
 msgid "/Remote/_Refresh"
-msgstr "/ਰਿਮ��/ਤਾ�ਾ(_R)"
+msgstr "/ਰਿਮ��/ਤਾ�ਾ �ਰ�(_R)"
 
 #: ../src/gtk/gftp-gtk.c:335
 msgid "/_Bookmarks"
@@ -2323,7 +2320,7 @@ msgstr "/ਬ�ੱ�ਮਾਰ�(_B)"
 
 #: ../src/gtk/gftp-gtk.c:336
 msgid "/Bookmarks/tearoff"
-msgstr "/Bookmarks/tearoff"
+msgstr "/ਬ�ੱ�ਮਾਰ�/tearoff"
 
 #: ../src/gtk/gftp-gtk.c:337
 msgid "/Bookmarks/Add _Bookmark"
@@ -2335,7 +2332,7 @@ msgstr "/ਬ�ੱ�ਮਾਰ�/ਬ�ੱ�ਮਾਰ� ਸ�ਧ"
 
 #: ../src/gtk/gftp-gtk.c:340
 msgid "/Bookmarks/sep"
-msgstr "/Bookmarks/sep"
+msgstr "/ਬ�ੱ�ਮਾਰ�/sep"
 
 #: ../src/gtk/gftp-gtk.c:341
 msgid "/_Transfer"
@@ -2387,7 +2384,7 @@ msgstr "/ਲਾ�(_o)"
 
 #: ../src/gtk/gftp-gtk.c:358
 msgid "/Log/tearoff"
-msgstr "/Log/tearoff"
+msgstr "/ਲਾ�/tearoff"
 
 #: ../src/gtk/gftp-gtk.c:359
 msgid "/Log/_Clear"
@@ -2403,11 +2400,11 @@ msgstr "/ਲਾ�/ਸੰਭਾਲ�(_S)..."
 
 #: ../src/gtk/gftp-gtk.c:362
 msgid "/Tool_s"
-msgstr "/ਸੰਦ(_s)"
+msgstr "/��ਲ(_s)"
 
 #: ../src/gtk/gftp-gtk.c:363
 msgid "/Tools/tearoff"
-msgstr "/ਸੰਦ/ਵੱ� �ਰ�"
+msgstr "/��ਲ/ਵੱ� �ਰ�"
 
 #: ../src/gtk/gftp-gtk.c:364
 msgid "/Tools/C_ompare Windows"
@@ -2443,11 +2440,11 @@ msgstr "ਪ�ਰ�: "
 
 #: ../src/gtk/gftp-gtk.c:537
 msgid "User: "
-msgstr "�ਪਭ��ਤਾ: "
+msgstr "ਯ��਼ਰ: "
 
 #: ../src/gtk/gftp-gtk.c:539
 msgid "_User: "
-msgstr "�ਪਭ��ਤਾ(_U): "
+msgstr "ਯ��਼ਰ(_U): "
 
 #: ../src/gtk/gftp-gtk.c:564
 msgid "Pass: "
@@ -2457,30 +2454,30 @@ msgstr "ਪਾਸਵਰਡ: "
 msgid "Command: "
 msgstr "�ਮਾ�ਡ: "
 
-#: ../src/gtk/gftp-gtk.c:778 ../src/gtk/gftp-gtk.c:989
+#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
 #: ../src/gtk/gtkui_transfer.c:228
 msgid "Filename"
 msgstr "ਫਾ�ਲ ਨਾ�"
 
-#: ../src/gtk/gftp-gtk.c:779
+#: ../src/gtk/gftp-gtk.c:788
 msgid "Size"
 msgstr "��ਾਰ"
 
-#: ../src/gtk/gftp-gtk.c:782
+#: ../src/gtk/gftp-gtk.c:791
 msgid "Date"
 msgstr "ਮਿਤ�"
 
-#: ../src/gtk/gftp-gtk.c:783
+#: ../src/gtk/gftp-gtk.c:792
 msgid "Attribs"
-msgstr "ਵਿਸ਼�ਸਤਾ"
+msgstr "ਵਿਸ਼�ਸ਼ਤਾ"
 
-#: ../src/gtk/gftp-gtk.c:990
+#: ../src/gtk/gftp-gtk.c:997
 msgid "Progress"
 msgstr "ਤਰੱ��"
 
-#: ../src/gtk/gftp-gtk.c:1126
+#: ../src/gtk/gftp-gtk.c:1133
 msgid "Error: You must type in a host to connect to\n"
-msgstr "�ਲਤ�: ਤਹਾਨ�ੰ �ਸ ਹ�ਸ� ਨਾਲ ���ਨ ਲ�\n"
+msgstr "�ਲਤ�: ਤਹਾਨ�ੰ �ਸ ਹ�ਸ� ਨਾਲ ��ਨ��� ਲ� ਦ�ਣਾ ਲਾ�਼ਮ�\n"
 
 #: ../src/gtk/gtkui.c:53
 msgid "Refresh"
@@ -2492,11 +2489,11 @@ msgstr "ਯ��਼ਰ ਨਾ� ਦਿ�"
 
 #: ../src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
-msgstr "�ਿਰਪਾ �ਰ�� �ਸ ਸਾ�� ਲ� �ਪਣਾ ਯ��਼ਰ ਨਾ� ਦਿ�"
+msgstr "�ਸ ਸਾ�� ਲ� �ਪਣਾ ਯ��਼ਰ ਨਾ� ਦਿ� ��"
 
-#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:586 ../src/gtk/transfer.c:596
+#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
-msgstr "�ਿਰਪਾ �ਰ�� �ਸ ਸਾ�� ਲ� �ਪਣਾ ਪਾਸਵਰਡ ਦਿ�"
+msgstr "�ਸ ਸਾ�� ਲ� �ਪਣਾ ਪਾਸਵਰਡ ਦਿ� ��"
 
 #: ../src/gtk/gtkui.c:298
 msgid "Operation canceled...you must enter a string\n"
@@ -2517,12 +2514,12 @@ msgstr "ਬਣਾ�ਣ ਲ� ਡਾ�ਰ���ਰ� ਨਾ� ਦਿ�"
 #: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
 #: ../src/gtk/misc-gtk.c:1007
 msgid "Rename"
-msgstr "ਨਾ�-ਤਬਦ�ਲ"
+msgstr "ਨਾ� ਬਦਲ�"
 
 #: ../src/gtk/gtkui.c:380
 #, c-format
 msgid "What would you like to rename %s to?"
-msgstr "�� ਤ�ਸ�� %s ਦਾ ਨਾ� ਤਬਦ�ਲ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
+msgstr "�� ਤ�ਸ�� %s ਦਾ ਨਾ� ਬਦਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
 msgid "Site"
@@ -2534,26 +2531,26 @@ msgstr "ਸਾ��-�ਾਸ �ਮਾ�ਡ ਦਿ�"
 
 #: ../src/gtk/gtkui.c:406
 msgid "Prepend with SITE"
-msgstr ""
+msgstr "SITE ਨਾਲ ਪਹਿਲਾ� ����"
 
 #: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:496
-#: ../src/gtk/transfer.c:564 ../src/gtk/transfer.c:1021
+#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
+#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "�ੱਡਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:543
-#: ../src/gtk/transfer.c:568
+#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
+#: ../src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "�ਡ�� �ਾਰ� ਹ�..."
 
 #: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
 #: ../src/gtk/gtkui_transfer.c:341
 msgid "Overwrite"
-msgstr "�ੱਪਰ-ਲਿ��"
+msgstr "�ੱਤ� ਲਿ��"
 
 #: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
 #: ../src/gtk/gtkui_transfer.c:347
@@ -2571,7 +2568,7 @@ msgstr "�ਾਰਵਾ�"
 #: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
 #: ../src/gtk/transfer.c:91
 msgid "Transfer Files"
-msgstr "ਫਾ�ਲਾ� ਤਬਦ�ਲ"
+msgstr "ਫਾ�ਲਾ� �ਰਾ�ਸਫਰ"
 
 #: ../src/gtk/gtkui_transfer.c:257
 msgid ""
@@ -2610,8 +2607,7 @@ msgid "Enter the new file specification"
 msgstr "ਨਵ�� ਫਾ�ਲ �ਾਣ�ਾਰ� ਦਿ�"
 
 #: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
-#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:76
-#: ../src/gtk/view_dialog.c:155
+#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "�ਲਤ�: %s ਨ�ੰ ਲਿ�ਣ ਲ� ��ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s\n"
@@ -2640,7 +2636,7 @@ msgid ""
 "Cannot find the license agreement file COPYING. Please make sure it is in "
 "either %s or in %s"
 msgstr ""
-"COPYING ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਨਹ�� ਲੱਭ��� ਹਨ। �ਿਰਪਾ �ਰ�� �ਹ ਯ��ਨ� ਬਣਾ� �ਿ %s �ਾ� %s ਵਿੱ� ਤਾ� "
+"COPYING ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਨਹ�� ਲੱਭ��� ਹਨ। �ਹ ਯ��ਨ� ਬਣਾ� �ਿ %s �ਾ� %s ਵਿੱ� ਤਾ� "
 "ਨਹ��"
 
 #: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
@@ -2655,7 +2651,7 @@ msgid ""
 "Official Homepage: http://www.gftp.org/\n";
 msgstr ""
 "%s\n"
-"Copyright (C) 1998-2007 Brian Masney <masneyb gftp org>\n"
+"Copyright (C) ੧੯੯੮-੨੦੦੭ Brian Masney <masneyb gftp org>\n"
 "ਮ�ੱ� ਸਫਾ: http://www.gftp.org/\n";
 
 #: ../src/gtk/menu-items.c:503
@@ -2666,13 +2662,13 @@ msgstr "�ਸ ਬਾਰ�"
 msgid "License Agreement"
 msgstr "ਲਾ�ਸ�ਸ ਸ਼ਰਤਾ�"
 
-#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:405
+#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
 msgid "  Close  "
 msgstr "  ਬੰਦ"
 
 #: ../src/gtk/menu-items.c:685
 msgid "Compare Windows"
-msgstr "�ਰ��ਾ ਤ�ਲਨਾ"
+msgstr "ਵਿੰਡ� ਤ�ਲਨਾ"
 
 #: ../src/gtk/misc-gtk.c:257
 msgid "Disconnect from the remote server"
@@ -2690,21 +2686,21 @@ msgstr "ਸਭ ਫਾ�ਲ਼ਾ�"
 
 #: ../src/gtk/misc-gtk.c:318
 msgid "] (Cached) ["
-msgstr "] (�����) ["
+msgstr "] (��ਸ ��ਤ�) ["
 
 #: ../src/gtk/misc-gtk.c:329
 msgid "Not connected"
-msgstr "���ਿ� ਨਹ��"
+msgstr "��ਨ��� ਨਹ��"
 
 #: ../src/gtk/misc-gtk.c:431
 #, c-format
 msgid "Error opening file %s: %s\n"
-msgstr "ਫਾ�ਲ %s ��ਲਣ ਦ�ਰਾਨ �ਲਤ�: %s\n"
+msgstr "ਫਾ�ਲ %s ��ਲ�ਹਣ ਦ�ਰਾਨ �ਲਤ�: %s\n"
 
 #: ../src/gtk/misc-gtk.c:521
 #, c-format
 msgid "%s: Not connected to a remote site\n"
-msgstr "%s: ਰਿਮ�� ਸਾ�� ਨਾਲ ���ਿ� ਨਹ�\n"
+msgstr "%s: ਰਿਮ�� ਸਾ�� ਨਾਲ ��ਨ��� ਨਹ��\n"
 
 #: ../src/gtk/misc-gtk.c:528
 #, c-format
@@ -2723,7 +2719,7 @@ msgstr "%s: ਤ�ਹਾਨ�ੰ �ੱ��-�ੱ� �ੱ� ��ਾ�
 
 #: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
 msgid "Change"
-msgstr "ਤਬਦ�ਲ"
+msgstr "ਬਦਲ�"
 
 #: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
 msgid "Add"
@@ -2735,11 +2731,11 @@ msgstr "ਰੱਦ"
 
 #: ../src/gtk/misc-gtk.c:1094
 msgid "  Yes  "
-msgstr " ਹਾ�"
+msgstr " ਹਾ� "
 
 #: ../src/gtk/misc-gtk.c:1104
 msgid "  No  "
-msgstr " ਨਹ��"
+msgstr " ਨਹ�� "
 
 #: ../src/gtk/misc-gtk.c:1164
 msgid "Getting directory listings"
@@ -2747,7 +2743,7 @@ msgstr "ਡਾ�ਰ���ਰ� ਸ��� ਪ�ਰਾਪਤ ��ਤ�
 
 #: ../src/gtk/misc-gtk.c:1184
 msgid "  Stop  "
-msgstr "  ਰ���"
+msgstr "  ਰ��� "
 
 #: ../src/gtk/misc-gtk.c:1194
 #, c-format
@@ -2807,7 +2803,7 @@ msgstr "ਡ�ਮ�ਨ(_D):"
 msgid "Local Hosts"
 msgstr "ਲ��ਲ ਹ�ਸ�"
 
-#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:105
+#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
 msgid "Edit"
 msgstr "ਸ�ਧ"
 
@@ -2827,9 +2823,9 @@ msgstr "ਲਾ��"
 msgid "Receiving file names..."
 msgstr "ਫਾ�ਲ਼ ਨਾ� ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:712
+#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
 msgid "Connecting..."
-msgstr "��� ਰਿਹਾ ਹ�..."
+msgstr "��ਨ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
 #: ../src/gtk/transfer.c:99
 msgid "Retrieve Files: Not connected to a remote site\n"
@@ -2873,90 +2869,90 @@ msgstr ""
 msgid "Edit File"
 msgstr "ਫਾ�ਲ ਸ�ਧ"
 
-#: ../src/gtk/transfer.c:499
+#: ../src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "ਸਮਾਪਤ"
 
-#: ../src/gtk/transfer.c:757
+#: ../src/gtk/transfer.c:734
 #, c-format
 msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "%s, %s ਵਿੱ���  %.2fKB/s ਰਾਹ�� ਭ��ਿ�, %02d:%02d:%02d ਬਾ�� ਸਮਾ�"
 
-#: ../src/gtk/transfer.c:762
+#: ../src/gtk/transfer.c:739
 #, c-format
 msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
 msgstr "ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ� %2s ਵਿੱ��� %1s �ਸ ਤ� %.2fKB/s, %02d:%02d:%02d ਬਾ�� ਸਮਾ�"
 
-#: ../src/gtk/transfer.c:773
+#: ../src/gtk/transfer.c:750
 #, c-format
 msgid "Sent %s of %s, transfer stalled, unknown time remaining"
-msgstr ""
+msgstr "%2$s ਵਿੱ��� %1$s ਭ���, �ਰਾ�ਸਫਰ ਰ���, �ਣ�ਾਣ ਸਮਾ� ਬਾ��"
 
-#: ../src/gtk/transfer.c:779
+#: ../src/gtk/transfer.c:756
 #, c-format
 msgid "Recv %s of %s, transfer stalled, unknown time remaining"
 msgstr "%s ਪ�ਰਾਪਤ� %s ਵਿੱ���, ਤਬਦ�ਲ� ਸਥਿਰ ਹ��, �ਣ�ਾਣਾ ਸਮਾ� ਬਾ�� ਹ�"
 
-#: ../src/gtk/transfer.c:823
+#: ../src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "�ਣ�ਾਣ ਪ�ਰਤ�ਸ਼ਤ ਮ��ੰਮਲ। (ਫਾ�ਲ਼ %ld, %ld ਵਿੱ���)"
 
-#: ../src/gtk/transfer.c:827
+#: ../src/gtk/transfer.c:804
 #, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% ਸਮਾਪਤ, %02d:%02d:%02d ਬਾ�� ਰਹਿੰਦਾ ਸਮਾ� (ਫਾ�ਲ %2ld ਵਿੱ��� %1ld)"
 
-#: ../src/gtk/transfer.c:865
+#: ../src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
-msgstr "ਫਾ�ਲ-ਨਾ� ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ...%s ਬਾ��"
+msgstr "ਫਾ�ਲ-ਨਾ� ਲ� �ਾ ਰਹ� ਹਨ...%s ਬਾ��"
 
-#: ../src/gtk/transfer.c:944 ../src/gtk/transfer.c:966
-#: ../src/gtk/transfer.c:985 ../src/gtk/transfer.c:1007
-#: ../src/gtk/transfer.c:1035 ../src/gtk/transfer.c:1095
+#: ../src/gtk/transfer.c:921 ../src/gtk/transfer.c:943
+#: ../src/gtk/transfer.c:962 ../src/gtk/transfer.c:984
+#: ../src/gtk/transfer.c:1012 ../src/gtk/transfer.c:1072
 msgid "There are no file transfers selected\n"
-msgstr "ਤਬਦ�ਲ �ਰਨ ਲ� ��� ਫਾ�ਲ ��ਣ� ਨਹ�� ��\n"
+msgstr "�ਰਾ�ਸਫਰ �ਰਨ ਲ� ��� ਫਾ�ਲ ��ਣ� ਨਹ�� ��\n"
 
-#: ../src/gtk/view_dialog.c:36
+#: ../src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "ਵ���"
 
-#: ../src/gtk/view_dialog.c:48
+#: ../src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "ਵ���: %s ਡਾ�ਰ���ਰ� ਹ�। �ਸ ਨ�ੰ ਵ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ।\n"
 
-#: ../src/gtk/view_dialog.c:114
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "ਸ�ਧ: ਤ�ਹਾਨ�ੰ ��ਣ ਵਾਰਤਾਲਾਪ ਵਿੱ� ਸੰਪਾਦ� ਦ�ਣਾ ਪਵ��ਾ\n"
-
-#: ../src/gtk/view_dialog.c:127
+#: ../src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "ਸ�ਧ: %s ਡਾ�ਰ���ਰ� ਹ�। ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।\n"
 
-#: ../src/gtk/view_dialog.c:210
+#: ../src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr "ਸ�ਧ: ਤ�ਹਾਨ�ੰ ��ਣ ਡਾ�ਲਾ� ਵਿੱ� ਸੰਪਾਦ� ਦ�ਣਾ ਪਵ��ਾ\n"
+
+#: ../src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "ਵ���: ਹ�ਰ �ਾਰ� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s\n"
 
-#: ../src/gtk/view_dialog.c:213
+#: ../src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "�ੱਲ ਰਿਹਾ �ਾਰ�: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:272
+#: ../src/gtk/view_dialog.c:240
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "%s ਨ�ੰ %s ਨਾਲ ��ਲਿ� �ਾ ਰਿਹਾ ਹ�\n"
 
-#: ../src/gtk/view_dialog.c:307
+#: ../src/gtk/view_dialog.c:282
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "ਫਾ�ਲ %s ਵ��� �ਾ ਰਹ� ਹ�\n"
 
-#: ../src/gtk/view_dialog.c:314
+#: ../src/gtk/view_dialog.c:289
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "ਵ���: ਫਾ�ਲ %s ਨ�ੰ ��ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s\n"
@@ -2964,11 +2960,11 @@ msgstr "ਵ���: ਫਾ�ਲ %s ਨ�ੰ ��ਲਿ� ਨਹ�� �
 #: ../src/text/gftp-text.c:166
 #, c-format
 msgid "Cannot open controlling terminal %s\n"
-msgstr "�ੰ�ਰਲਿੰ� �ਰਮ�ਨ�ਲ %s ��ਲਿ� ਨਹ� �ਾ ਸ�ਦਾ\n"
+msgstr "�ੰ�ਰ�ਲਿੰ� �ਰਮ�ਨਲ %s ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ\n"
 
 #: ../src/text/textui.c:80
 msgid "Username [anonymous]:"
-msgstr "�ਪਭ��ਤਾ ਨਾ� [anonymous]:"
+msgstr "ਯ��਼ਰ ਨਾ� [anonymous]:"
 
 #: ../src/text/textui.c:158
 #, c-format
@@ -2978,6 +2974,16 @@ msgid ""
 "c)"
 msgstr ""
 "%s ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ� (%s ਸਰ�ਤ ��ਾਰ, %s ਨਿਸ਼ਾਨਾ ��ਾਰ):\n"
-"�ਪਰ ਲਿ��(o), ਮ��-ਪ�ਰਾਪਤ(r), �ਧ�ਰਾ �ੱਡ�(s), ਸਭ �ੱਪਰ ਲਿ��(O), ਸਭ ਮ��-ਪ�ਰਾਪਤ(R), ਸਭ �ੱਡ�"
+"�ੱਤ� ਲਿ��(o), ਮ��-ਪ�ਰਾਪਤ(r), �ਧ�ਰਾ �ੱਡ�(s), ਸਭ �ੱਤ� ਲਿ��(O), ਸਭ ਮ��-ਪ�ਰਾਪਤ(R), ਸਭ �ੱਡ�"
 "(S): (%c)"
 
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid ""
+#~ ">. If you have any questions, comments, or suggestions about this "
+#~ "program, please feel free to email them to me. You can always find out "
+#~ "the latest news about gFTP from my website at http://www.gftp.org/\n";
+#~ msgstr ""
+#~ "> �� ਤ�ਹਾਨ�ੰ �ਸ ਪਰ��ਰਾਮ ਬਾਰ� ��� ਸਵਾਲ, ਸ��ਾ� �ਾ� �ਾਣ�ਾਰ� ਹ�ਵ� ਤਾ� ਮ�ਨ�ੰ �ਮ�ਲ ਭ��ਣ ਦ� ���ਲ "
+#~ "�ਰਨ�। ਤ�ਸ�� ਮ�ਰ� ਵ�ੱਬ ਸਾ�� http://www.gftp.org/ ਤ�� ਹਮ�ਸ਼ਾ ਨਵਾ� gFTP ਲ� ਸ�ਦ� ਹ�।\n"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]