# HG changeset patch
# User adamw
# Date 1102889176 0
# Node ID 10bc29d6252c7c96d1b28272774ea15366746363
# Parent  117bcf24add2f26edd284ecd0d9ba19a871c445f
	* en_CA.po: Updated Canadian English translation.

diff -r 117bcf24add2 -r 10bc29d6252c po/ChangeLog
--- a/po/ChangeLog	Sun Dec 12 12:09:56 2004 +0000
+++ b/po/ChangeLog	Sun Dec 12 22:06:16 2004 +0000
@@ -1,3 +1,7 @@
+2004-12-12  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2004-12-09  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated by Daniel van Eeden.
diff -r 117bcf24add2 -r 10bc29d6252c po/en_CA.po
--- a/po/en_CA.po	Sun Dec 12 12:09:56 2004 +0000
+++ b/po/en_CA.po	Sun Dec 12 22:06:16 2004 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gftp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-03 14:04-0500\n"
-"PO-Revision-Date: 2004-12-03 16:37-0400\n"
+"POT-Creation-Date: 2004-12-12 17:05-0500\n"
+"PO-Revision-Date: 2004-12-12 16:37-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: English/Canada <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -47,17 +47,17 @@
 msgid "Error: Cannot seek on file %s: %s\n"
 msgstr "Error: Cannot seek on file %s: %s\n"
 
-#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:2969
+#: lib/config_file.c:126 lib/config_file.c:133 lib/protocols.c:2971
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Error: Cannot open local file %s: %s\n"
 
-#: lib/config_file.c:143 lib/protocols.c:2676 lib/sslcommon.c:486
+#: lib/config_file.c:143 lib/protocols.c:2678 lib/sslcommon.c:486
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Error: Could not write to socket: %s\n"
 
-#: lib/config_file.c:151 lib/protocols.c:2600 lib/sshv2.c:364
+#: lib/config_file.c:151 lib/protocols.c:2602 lib/sshv2.c:364
 #: lib/sslcommon.c:439
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
@@ -748,13 +748,13 @@
 msgstr "The protocol '%s' is currently not supported.\n"
 
 #: lib/protocols.c:1138 lib/protocols.c:1153 lib/protocols.c:2185
-#: lib/protocols.c:2296
+#: lib/protocols.c:2295
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Looking up %s\n"
 
 #: lib/protocols.c:1144 lib/protocols.c:1159 lib/protocols.c:2190
-#: lib/protocols.c:2301
+#: lib/protocols.c:2300
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Cannot look up hostname %s: %s\n"
@@ -770,57 +770,57 @@
 msgid "Failed to create a socket: %s\n"
 msgstr "Failed to create a socket: %s\n"
 
-#: lib/protocols.c:2214 lib/protocols.c:2315
+#: lib/protocols.c:2214 lib/protocols.c:2317
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Trying %s:%d\n"
 
-#: lib/protocols.c:2219 lib/protocols.c:2322
+#: lib/protocols.c:2219 lib/protocols.c:2324
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Cannot connect to %s: %s\n"
 
-#: lib/protocols.c:2255 lib/rfc959.c:639
+#: lib/protocols.c:2254 lib/rfc959.c:645
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Failed to create a IPv4 socket: %s\n"
 
-#: lib/protocols.c:2279 lib/sshv2.c:987
+#: lib/protocols.c:2278 lib/sshv2.c:987
 #, c-format
 msgid "Cannot look up service name %s/tcp. Please check your services file\n"
 msgstr "Cannot look up service name %s/tcp. Please check your services file\n"
 
-#: lib/protocols.c:2338 lib/protocols.c:2978 lib/rfc959.c:648 lib/rfc959.c:803
+#: lib/protocols.c:2340 lib/protocols.c:2980 lib/rfc959.c:654 lib/rfc959.c:831
 #, c-format
 msgid "Error: Cannot set close on exec flag: %s\n"
 msgstr "Error: Cannot set close on exec flag: %s\n"
 
-#: lib/protocols.c:2345
+#: lib/protocols.c:2347
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Connected to %s:%d\n"
 
-#: lib/protocols.c:2576 lib/protocols.c:2651 lib/sshv2.c:355
+#: lib/protocols.c:2578 lib/protocols.c:2653 lib/sshv2.c:355
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Connection to %s timed out\n"
 
-#: lib/protocols.c:2719
+#: lib/protocols.c:2721
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Cannot get socket flags: %s\n"
 
-#: lib/protocols.c:2733
+#: lib/protocols.c:2735
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Cannot set socket to non-blocking: %s\n"
 
-#: lib/protocols.c:2868
+#: lib/protocols.c:2870
 #, c-format
 msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 msgstr "Error: Remote site %s disconnected. Max retries reached...giving up\n"
 
-#: lib/protocols.c:2876
+#: lib/protocols.c:2878
 #, c-format
 msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
 msgstr "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
@@ -894,7 +894,7 @@
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 
-#: lib/rfc2068.c:254 lib/rfc959.c:608 lib/sshv2.c:1064
+#: lib/rfc2068.c:254 lib/rfc959.c:613 lib/sshv2.c:1064
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Disconnecting from site %s\n"
@@ -990,10 +990,26 @@
 "can you type in %pu"
 
 #: lib/rfc959.c:69
+msgid "Ignore PASV address"
+msgstr "Ignore PASV address"
+
+#: lib/rfc959.c:72
+msgid ""
+"If this is enabled, then the remote FTP server's PASV IP address field will "
+"be ignored and the host's IP address will be used instead. This is often "
+"needed for routers giving their internal rather then their external IP "
+"address in a PASV reply."
+msgstr ""
+"If this is enabled, then the remote FTP server's PASV IP address field will "
+"be ignored and the host's IP address will be used instead. This is often "
+"needed for routers that give their internal rather then their external IP "
+"address in a PASV reply."
+
+#: lib/rfc959.c:74
 msgid "Passive file transfers"
 msgstr "Passive file transfers"
 
-#: lib/rfc959.c:72
+#: lib/rfc959.c:77
 msgid ""
 "If this is enabled, then the remote FTP server will open up a port for the "
 "data connection. If you are behind a firewall, you will need to enable this. "
@@ -1009,11 +1025,11 @@
 "gFTP will open up a port on the client side and the remote server will "
 "attempt to connect to it."
 
-#: lib/rfc959.c:74
+#: lib/rfc959.c:79
 msgid "Resolve Remote Symlinks (LIST -L)"
 msgstr "Resolve Remote Symlinks (LIST -L)"
 
-#: lib/rfc959.c:77
+#: lib/rfc959.c:82
 msgid ""
 "The remote FTP server will attempt to resolve symlinks in the directory "
 "listings. Generally, this is a good idea to leave enabled. The only time you "
@@ -1025,11 +1041,11 @@
 "will want to disable this is if the remote FTP server doesn't support the -L "
 "option to LIST"
 
-#: lib/rfc959.c:79
+#: lib/rfc959.c:84
 msgid "Transfer files in ASCII mode"
 msgstr "Transfer files in ASCII mode"
 
-#: lib/rfc959.c:82
+#: lib/rfc959.c:87
 msgid ""
 "If you are transfering a text file from Windows to UNIX box or vice versa, "
 "then you should enable this. Each system represents newlines differently for "
@@ -1043,68 +1059,73 @@
 "leave this off. If you are downloading binary data, you will want to disable "
 "this."
 
-#: lib/rfc959.c:317 lib/rfc959.c:326 lib/rfc959.c:337 lib/rfc959.c:766
-#: lib/rfc959.c:1364
+#: lib/rfc959.c:322 lib/rfc959.c:331 lib/rfc959.c:342 lib/rfc959.c:794
+#: lib/rfc959.c:1392
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Invalid response '%c' received from server.\n"
 
-#: lib/rfc959.c:678 lib/rfc959.c:688
+#: lib/rfc959.c:684 lib/rfc959.c:694
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr "Cannot find an IP address in PASV response '%s'\n"
 
-#: lib/rfc959.c:703 lib/rfc959.c:864
+#: lib/rfc959.c:720
+#, c-format
+msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
+msgstr "Ignoring IP address in PASV response; connecting to %d.%d.%d.%d:%d\n"
+
+#: lib/rfc959.c:731 lib/rfc959.c:892
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Cannot create a data connection: %s\n"
 
-#: lib/rfc959.c:715 lib/rfc959.c:736 lib/rfc959.c:889
+#: lib/rfc959.c:743 lib/rfc959.c:764 lib/rfc959.c:917
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Cannot get socket name: %s\n"
 
-#: lib/rfc959.c:726 lib/rfc959.c:879
+#: lib/rfc959.c:754 lib/rfc959.c:907
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Cannot bind a port: %s\n"
 
-#: lib/rfc959.c:745 lib/rfc959.c:898
+#: lib/rfc959.c:773 lib/rfc959.c:926
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Cannot listen on port %d: %s\n"
 
-#: lib/rfc959.c:794
+#: lib/rfc959.c:822
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Failed to create a IPv6 socket: %s\n"
 
-#: lib/rfc959.c:814
+#: lib/rfc959.c:842
 msgid ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 
-#: lib/rfc959.c:842 lib/rfc959.c:851
+#: lib/rfc959.c:870 lib/rfc959.c:879
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Invalid EPSV response '%s'\n"
 
-#: lib/rfc959.c:908
+#: lib/rfc959.c:936
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Cannot get address of local socket: %s\n"
 
-#: lib/rfc959.c:982
+#: lib/rfc959.c:1010
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Cannot accept connection from server: %s\n"
 
-#: lib/rfc959.c:1519
+#: lib/rfc959.c:1547
 msgid "total"
 msgstr "total"
 
-#: lib/rfc959.c:1521 lib/sshv2.c:1351
+#: lib/rfc959.c:1549 lib/sshv2.c:1351
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Warning: Cannot parse listing %s\n"