changeset 581:abcb6713b6b8

* en_CA.po: Updated Canadian English translation.
author adamw
date Mon, 04 Oct 2004 15:31:25 +0000
parents 87c22f8b1d60
children 5df46f79d9c1
files po/ChangeLog po/en_CA.po
diffstat 2 files changed, 205 insertions(+), 187 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Mon Oct 04 13:35:27 2004 +0000
+++ b/po/ChangeLog	Mon Oct 04 15:31:25 2004 +0000
@@ -1,3 +1,7 @@
+2004-10-04  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2004-10-04  Miloslav Trmac  <mitr@volny.cz>
 
 	* cs.po: Updated Czech translation.
--- a/po/en_CA.po	Mon Oct 04 13:35:27 2004 +0000
+++ b/po/en_CA.po	Mon Oct 04 15:31:25 2004 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gftp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-23 12:44-0400\n"
-"PO-Revision-Date: 2004-09-23 16:37-0400\n"
+"POT-Creation-Date: 2004-10-04 11:30-0400\n"
+"PO-Revision-Date: 2004-10-04 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:117 lib/config_file.c:124 lib/protocols.c:2912
+#: lib/config_file.c:117 lib/config_file.c:124 lib/protocols.c:2949
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Error: Cannot open local file %s: %s\n"
 
-#: lib/config_file.c:134 lib/protocols.c:2619 lib/sslcommon.c:486
+#: lib/config_file.c:134 lib/protocols.c:2656 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:142 lib/protocols.c:2543 lib/sshv2.c:364
+#: lib/config_file.c:142 lib/protocols.c:2580 lib/sshv2.c:364
 #: lib/sslcommon.c:439
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
@@ -680,124 +680,138 @@
 msgid "SSH2"
 msgstr "SSH2"
 
-#: lib/options.h:253 src/gtk/bookmarks.c:879
+#: lib/options.h:253 src/gtk/bookmarks.c:861
 msgid "Bookmark"
 msgstr "Bookmark"
 
-#: lib/protocols.c:220
+#: lib/protocols.c:233
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "File transfer will be throttled to %.2f KB/s\n"
 
-#: lib/protocols.c:373
+#: lib/protocols.c:386
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 
-#: lib/protocols.c:381
+#: lib/protocols.c:394
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Loading directory listing %s from cache (LC_TIME=%s)\n"
 
-#: lib/protocols.c:391
+#: lib/protocols.c:404
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Loading directory listing %s from server (LC_TIME=%s)\n"
 
-#: lib/protocols.c:587
+#. Don't use request->logging_function since the strings must be in UTF-8
+#. for the GTK+ 2.x port
+#: lib/protocols.c:466
+#, c-format
+msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
+msgstr "Error converting string '%s' to UTF-8 from current locale: %s\n"
+
+#. Don't use request->logging_function since the strings must be in UTF-8
+#. for the GTK+ 2.x port
+#: lib/protocols.c:523
+#, c-format
+msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
+msgstr "Error converting string '%s' to current locale from UTF-8: %s\n"
+
+#: lib/protocols.c:606
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Error: Cannot write to cache: %s\n"
 
-#: lib/protocols.c:619
+#: lib/protocols.c:638
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Error: Could not find bookmark %s\n"
 
-#: lib/protocols.c:626
+#: lib/protocols.c:645
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 
-#: lib/protocols.c:736
+#: lib/protocols.c:772
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "The protocol '%s' is currently not supported.\n"
 
-#: lib/protocols.c:1082 lib/protocols.c:1097 lib/protocols.c:2127
-#: lib/protocols.c:2239
+#: lib/protocols.c:1118 lib/protocols.c:1133 lib/protocols.c:2163
+#: lib/protocols.c:2276
 #, c-format
 msgid "Looking up %s\n"
 msgstr "Looking up %s\n"
 
-#: lib/protocols.c:1088 lib/protocols.c:1103 lib/protocols.c:2132
-#: lib/protocols.c:2244
+#: lib/protocols.c:1124 lib/protocols.c:1139 lib/protocols.c:2168
+#: lib/protocols.c:2281
 #, c-format
 msgid "Cannot look up hostname %s: %s\n"
 msgstr "Cannot look up hostname %s: %s\n"
 
-#: lib/protocols.c:1456 lib/protocols.c:1457 lib/protocols.c:1498
-#: lib/protocols.c:1499 lib/protocols.c:1562 lib/protocols.c:1569
-#: lib/protocols.c:1645 lib/protocols.c:1646 lib/protocols.c:1682
+#: lib/protocols.c:1492 lib/protocols.c:1493 lib/protocols.c:1534
+#: lib/protocols.c:1535 lib/protocols.c:1598 lib/protocols.c:1605
+#: lib/protocols.c:1681 lib/protocols.c:1682 lib/protocols.c:1718
 msgid "unknown"
 msgstr "unknown"
 
-#: lib/protocols.c:2150
+#: lib/protocols.c:2186
 #, c-format
 msgid "Failed to create a socket: %s\n"
 msgstr "Failed to create a socket: %s\n"
 
-#: lib/protocols.c:2156 lib/protocols.c:2258
+#: lib/protocols.c:2192 lib/protocols.c:2295
 #, c-format
 msgid "Trying %s:%d\n"
 msgstr "Trying %s:%d\n"
 
-#: lib/protocols.c:2161 lib/protocols.c:2265
+#: lib/protocols.c:2197 lib/protocols.c:2302
 #, c-format
 msgid "Cannot connect to %s: %s\n"
 msgstr "Cannot connect to %s: %s\n"
 
-#: lib/protocols.c:2198 lib/rfc959.c:636
+#: lib/protocols.c:2235 lib/rfc959.c:639
 #, c-format
 msgid "Failed to create a IPv4 socket: %s\n"
 msgstr "Failed to create a IPv4 socket: %s\n"
 
-#: lib/protocols.c:2222 lib/sshv2.c:987
+#: lib/protocols.c:2259 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:2281 lib/protocols.c:2921 lib/rfc959.c:645 lib/rfc959.c:800
+#: lib/protocols.c:2318 lib/protocols.c:2958 lib/rfc959.c:648 lib/rfc959.c:803
 #, 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:2288
+#: lib/protocols.c:2325
 #, c-format
 msgid "Connected to %s:%d\n"
 msgstr "Connected to %s:%d\n"
 
-#: lib/protocols.c:2519 lib/protocols.c:2594 lib/sshv2.c:355
+#: lib/protocols.c:2556 lib/protocols.c:2631 lib/sshv2.c:355
 #, c-format
 msgid "Connection to %s timed out\n"
 msgstr "Connection to %s timed out\n"
 
-#: lib/protocols.c:2662
+#: lib/protocols.c:2699
 #, c-format
 msgid "Cannot get socket flags: %s\n"
 msgstr "Cannot get socket flags: %s\n"
 
-#: lib/protocols.c:2676
+#: lib/protocols.c:2713
 #, c-format
 msgid "Cannot set socket to non-blocking: %s\n"
 msgstr "Cannot set socket to non-blocking: %s\n"
 
-#: lib/protocols.c:2811
+#: lib/protocols.c:2848
 #, 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:2819
+#: lib/protocols.c:2856
 #, 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"
@@ -871,7 +885,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:605 lib/sshv2.c:1064
+#: lib/rfc2068.c:254 lib/rfc959.c:608 lib/sshv2.c:1064
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Disconnecting from site %s\n"
@@ -1020,68 +1034,68 @@
 "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:763
-#: lib/rfc959.c:1362
+#: lib/rfc959.c:317 lib/rfc959.c:326 lib/rfc959.c:337 lib/rfc959.c:766
+#: lib/rfc959.c:1364
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Invalid response '%c' received from server.\n"
 
-#: lib/rfc959.c:675 lib/rfc959.c:685
+#: lib/rfc959.c:678 lib/rfc959.c:688
 #, 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:700 lib/rfc959.c:862
+#: lib/rfc959.c:703 lib/rfc959.c:864
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Cannot create a data connection: %s\n"
 
-#: lib/rfc959.c:712 lib/rfc959.c:733 lib/rfc959.c:887
+#: lib/rfc959.c:715 lib/rfc959.c:736 lib/rfc959.c:889
 #, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Cannot get socket name: %s\n"
 
-#: lib/rfc959.c:723 lib/rfc959.c:877
+#: lib/rfc959.c:726 lib/rfc959.c:879
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Cannot bind a port: %s\n"
 
-#: lib/rfc959.c:742 lib/rfc959.c:896
+#: lib/rfc959.c:745 lib/rfc959.c:898
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Cannot listen on port %d: %s\n"
 
-#: lib/rfc959.c:791
+#: lib/rfc959.c:794
 #, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Failed to create a IPv6 socket: %s\n"
 
-#: lib/rfc959.c:811
+#: lib/rfc959.c:814
 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:840 lib/rfc959.c:849
+#: lib/rfc959.c:842 lib/rfc959.c:851
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr "Invalid EPSV response '%s'\n"
 
-#: lib/rfc959.c:906
+#: lib/rfc959.c:908
 #, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Cannot get address of local socket: %s\n"
 
-#: lib/rfc959.c:980
+#: lib/rfc959.c:982
 #, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Cannot accept connection from server: %s\n"
 
-#: lib/rfc959.c:1517
+#: lib/rfc959.c:1519
 msgid "total"
 msgstr "total"
 
-#: lib/rfc959.c:1519
+#: lib/rfc959.c:1521 lib/sshv2.c:1351
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Warning: Cannot parse listing %s\n"
@@ -1226,7 +1240,7 @@
 msgid "%d: Utime %s %d\n"
 msgstr "%d: Utime %s %d\n"
 
-#: lib/sshv2.c:609 src/gtk/bookmarks.c:1038 src/gtk/bookmarks.c:1292
+#: lib/sshv2.c:609 src/gtk/bookmarks.c:1020 src/gtk/bookmarks.c:1273
 #: src/gtk/chmod_dialog.c:253 src/gtk/gtkui_transfer.c:361
 #: src/gtk/misc-gtk.c:982 src/gtk/options_dialog.c:1109
 #: src/gtk/options_dialog.c:1313
@@ -1274,7 +1288,7 @@
 msgid "Error: Message size %d too big\n"
 msgstr "Error: Message size %d too big\n"
 
-#: lib/sshv2.c:730 lib/sshv2.c:1166 lib/sshv2.c:1789 lib/sshv2.c:1927
+#: lib/sshv2.c:730 lib/sshv2.c:1166 lib/sshv2.c:1793 lib/sshv2.c:1931
 #, c-format
 msgid "Error: Message size %d too big from server\n"
 msgstr "Error: Message size %d too big from server\n"
@@ -1383,7 +1397,7 @@
 
 #: src/uicommon/gftpui.c:101
 msgid "Operation canceled\n"
-msgstr "Operation canceled\n"
+msgstr "Operation cancelled\n"
 
 #: src/uicommon/gftpui.c:190
 msgid ""
@@ -1413,7 +1427,7 @@
 #: src/uicommon/gftpui.c:322 src/uicommon/gftpui.c:357
 #: src/uicommon/gftpui.c:392 src/uicommon/gftpui.c:427
 #: src/uicommon/gftpui.c:463 src/uicommon/gftpui.c:528
-#: src/uicommon/gftpui.c:609 src/uicommon/gftpui.c:871
+#: src/uicommon/gftpui.c:609 src/uicommon/gftpui.c:873
 msgid "Error: Not connected to a remote site\n"
 msgstr "Error: Not connected to a remote site\n"
 
@@ -1471,7 +1485,7 @@
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Error: Variable %s is not available in the text port of gFTP\n"
 
-#: src/uicommon/gftpui.c:835
+#: src/uicommon/gftpui.c:837
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1479,267 +1493,267 @@
 "Supported commands:\n"
 "\n"
 
-#: src/uicommon/gftpui.c:878
+#: src/uicommon/gftpui.c:880
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr "usage: %s <filespec>\n"
 
-#: src/uicommon/gftpui.c:963
+#: src/uicommon/gftpui.c:965
 msgid "about"
 msgstr "about"
 
-#: src/uicommon/gftpui.c:964
-msgid "Shows gFTP information"
-msgstr "Shows gFTP information"
-
-#: src/uicommon/gftpui.c:965
-msgid "ascii"
-msgstr "ascii"
-
 #: src/uicommon/gftpui.c:966
+msgid "Shows gFTP information"
+msgstr "Shows gFTP information"
+
+#: src/uicommon/gftpui.c:967
+msgid "ascii"
+msgstr "ascii"
+
+#: src/uicommon/gftpui.c:968
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Sets the current file transfer mode to Ascii (only for FTP)"
 
-#: src/uicommon/gftpui.c:967
+#: src/uicommon/gftpui.c:969
 msgid "binary"
 msgstr "binary"
 
-#: src/uicommon/gftpui.c:968
+#: src/uicommon/gftpui.c:970
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Sets the current file transfer mode to Binary (only for FTP)"
 
-#: src/uicommon/gftpui.c:969
+#: src/uicommon/gftpui.c:971
 msgid "cd"
 msgstr "cd"
 
-#: src/uicommon/gftpui.c:970 src/uicommon/gftpui.c:972
+#: src/uicommon/gftpui.c:972 src/uicommon/gftpui.c:974
 msgid "Changes the remote working directory"
 msgstr "Changes the remote working directory"
 
-#: src/uicommon/gftpui.c:971
+#: src/uicommon/gftpui.c:973
 msgid "chdir"
 msgstr "chdir"
 
-#: src/uicommon/gftpui.c:973
+#: src/uicommon/gftpui.c:975
 msgid "chmod"
 msgstr "chmod"
 
-#: src/uicommon/gftpui.c:974
+#: src/uicommon/gftpui.c:976
 msgid "Changes the permissions of a remote file"
 msgstr "Changes the permissions of a remote file"
 
-#: src/uicommon/gftpui.c:975
+#: src/uicommon/gftpui.c:977
 msgid "clear"
 msgstr "clear"
 
-#: src/uicommon/gftpui.c:976
-msgid "Available options: cache"
-msgstr "Available options: cache"
-
-#: src/uicommon/gftpui.c:977
-msgid "close"
-msgstr "close"
-
 #: src/uicommon/gftpui.c:978
-msgid "Disconnects from the remote site"
-msgstr "Disconnects from the remote site"
+msgid "Available options: cache"
+msgstr "Available options: cache"
 
 #: src/uicommon/gftpui.c:979
-msgid "delete"
-msgstr "delete"
+msgid "close"
+msgstr "close"
 
 #: src/uicommon/gftpui.c:980
-msgid "Removes a remote file"
-msgstr "Removes a remote file"
+msgid "Disconnects from the remote site"
+msgstr "Disconnects from the remote site"
 
 #: src/uicommon/gftpui.c:981
+msgid "delete"
+msgstr "delete"
+
+#: src/uicommon/gftpui.c:982
+msgid "Removes a remote file"
+msgstr "Removes a remote file"
+
+#: src/uicommon/gftpui.c:983
 msgid "get"
 msgstr "get"
 
-#: src/uicommon/gftpui.c:982 src/uicommon/gftpui.c:1006
+#: src/uicommon/gftpui.c:984 src/uicommon/gftpui.c:1008
 msgid "Downloads remote file(s)"
 msgstr "Downloads remote file(s)"
 
-#: src/uicommon/gftpui.c:983
-msgid "help"
-msgstr "help"
-
-#: src/uicommon/gftpui.c:984
-msgid "Shows this help screen"
-msgstr "Shows this help screen"
-
 #: src/uicommon/gftpui.c:985
+msgid "help"
+msgstr "help"
+
+#: src/uicommon/gftpui.c:986
+msgid "Shows this help screen"
+msgstr "Shows this help screen"
+
+#: src/uicommon/gftpui.c:987
 msgid "lcd"
 msgstr "lcd"
 
-#: src/uicommon/gftpui.c:986 src/uicommon/gftpui.c:988
+#: src/uicommon/gftpui.c:988 src/uicommon/gftpui.c:990
 msgid "Changes the local working directory"
 msgstr "Changes the local working directory"
 
-#: src/uicommon/gftpui.c:987
+#: src/uicommon/gftpui.c:989
 msgid "lchdir"
 msgstr "lchdir"
 
-#: src/uicommon/gftpui.c:989
+#: src/uicommon/gftpui.c:991
 msgid "lchmod"
 msgstr "lchmod"
 
-#: src/uicommon/gftpui.c:990
+#: src/uicommon/gftpui.c:992
 msgid "Changes the permissions of a local file"
 msgstr "Changes the permissions of a local file"
 
-#: src/uicommon/gftpui.c:991
+#: src/uicommon/gftpui.c:993
 msgid "ldelete"
 msgstr "ldelete"
 
-#: src/uicommon/gftpui.c:992
+#: src/uicommon/gftpui.c:994
 msgid "Removes a local file"
 msgstr "Removes a local file"
 
-#: src/uicommon/gftpui.c:993
+#: src/uicommon/gftpui.c:995
 msgid "lls"
 msgstr "lls"
 
-#: src/uicommon/gftpui.c:994
+#: src/uicommon/gftpui.c:996
 msgid "Shows the directory listing for the current local directory"
 msgstr "Shows the directory listing for the current local directory"
 
-#: src/uicommon/gftpui.c:995
-msgid "lmkdir"
-msgstr "lmkdir"
-
-#: src/uicommon/gftpui.c:996
-msgid "Creates a local directory"
-msgstr "Creates a local directory"
-
 #: src/uicommon/gftpui.c:997
+msgid "lmkdir"
+msgstr "lmkdir"
+
+#: src/uicommon/gftpui.c:998
+msgid "Creates a local directory"
+msgstr "Creates a local directory"
+
+#: src/uicommon/gftpui.c:999
 msgid "lpwd"
 msgstr "lpwd"
 
-#: src/uicommon/gftpui.c:998
+#: src/uicommon/gftpui.c:1000
 msgid "Show current local directory"
 msgstr "Show current local directory"
 
-#: src/uicommon/gftpui.c:999
+#: src/uicommon/gftpui.c:1001
 msgid "lrename"
 msgstr "lrename"
 
-#: src/uicommon/gftpui.c:1000
+#: src/uicommon/gftpui.c:1002
 msgid "Rename a local file"
 msgstr "Rename a local file"
 
-#: src/uicommon/gftpui.c:1001
+#: src/uicommon/gftpui.c:1003
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: src/uicommon/gftpui.c:1002
-msgid "Remove a local directory"
-msgstr "Remove a local directory"
-
-#: src/uicommon/gftpui.c:1003
-msgid "ls"
-msgstr "ls"
-
 #: src/uicommon/gftpui.c:1004
+msgid "Remove a local directory"
+msgstr "Remove a local directory"
+
+#: src/uicommon/gftpui.c:1005
+msgid "ls"
+msgstr "ls"
+
+#: src/uicommon/gftpui.c:1006
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Shows the directory listing for the current remote directory"
 
-#: src/uicommon/gftpui.c:1005
+#: src/uicommon/gftpui.c:1007
 msgid "mget"
 msgstr "mget"
 
-#: src/uicommon/gftpui.c:1007
-msgid "mkdir"
-msgstr "mkdir"
-
-#: src/uicommon/gftpui.c:1008
-msgid "Creates a remote directory"
-msgstr "Creates a remote directory"
-
 #: src/uicommon/gftpui.c:1009
+msgid "mkdir"
+msgstr "mkdir"
+
+#: src/uicommon/gftpui.c:1010
+msgid "Creates a remote directory"
+msgstr "Creates a remote directory"
+
+#: src/uicommon/gftpui.c:1011
 msgid "mput"
 msgstr "mput"
 
-#: src/uicommon/gftpui.c:1010 src/uicommon/gftpui.c:1014
+#: src/uicommon/gftpui.c:1012 src/uicommon/gftpui.c:1016
 msgid "Uploads local file(s)"
 msgstr "Uploads local file(s)"
 
-#: src/uicommon/gftpui.c:1011
+#: src/uicommon/gftpui.c:1013
 msgid "open"
 msgstr "open"
 
-#: src/uicommon/gftpui.c:1012
+#: src/uicommon/gftpui.c:1014
 msgid "Opens a connection to a remote site"
 msgstr "Opens a connection to a remote site"
 
-#: src/uicommon/gftpui.c:1013
+#: src/uicommon/gftpui.c:1015
 msgid "put"
 msgstr "put"
 
-#: src/uicommon/gftpui.c:1015
-msgid "pwd"
-msgstr "pwd"
-
-#: src/uicommon/gftpui.c:1016
-msgid "Show current remote directory"
-msgstr "Show current remote directory"
-
 #: src/uicommon/gftpui.c:1017
+msgid "pwd"
+msgstr "pwd"
+
+#: src/uicommon/gftpui.c:1018
+msgid "Show current remote directory"
+msgstr "Show current remote directory"
+
+#: src/uicommon/gftpui.c:1019
 msgid "quit"
 msgstr "quit"
 
-#: src/uicommon/gftpui.c:1018
+#: src/uicommon/gftpui.c:1020
 msgid "Exit from gFTP"
 msgstr "Exit from gFTP"
 
-#: src/uicommon/gftpui.c:1019
+#: src/uicommon/gftpui.c:1021
 msgid "rename"
 msgstr "rename"
 
-#: src/uicommon/gftpui.c:1020
+#: src/uicommon/gftpui.c:1022
 msgid "Rename a remote file"
 msgstr "Rename a remote file"
 
-#: src/uicommon/gftpui.c:1021
+#: src/uicommon/gftpui.c:1023
 msgid "rmdir"
 msgstr "rmdir"
 
-#: src/uicommon/gftpui.c:1022
+#: src/uicommon/gftpui.c:1024
 msgid "Remove a remote directory"
 msgstr "Remove a remote directory"
 
-#: src/uicommon/gftpui.c:1023
+#: src/uicommon/gftpui.c:1025
 msgid "set"
 msgstr "set"
 
-#: src/uicommon/gftpui.c:1024
+#: src/uicommon/gftpui.c:1026
 msgid ""
 "Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 "Show configuration file variables. You can also set variables by set var=val"
 
-#: src/uicommon/gftpui.c:1026
+#: src/uicommon/gftpui.c:1028
 msgid "site"
 msgstr "site"
 
-#: src/uicommon/gftpui.c:1027
+#: src/uicommon/gftpui.c:1029
 msgid "Run a site specific command"
 msgstr "Run a site specific command"
 
-#: src/uicommon/gftpui.c:1117
+#: src/uicommon/gftpui.c:1119
 msgid "Error: Command not recognized\n"
 msgstr "Error: Command not recognized\n"
 
-#: src/uicommon/gftpui.c:1370
+#: src/uicommon/gftpui.c:1372
 msgid "Error: Remote site disconnected after trying to transfer file\n"
 msgstr "Error: Remote site disconnected after trying to transfer file\n"
 
-#: src/uicommon/gftpui.c:1438
+#: src/uicommon/gftpui.c:1440
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Could not download %s from %s\n"
 
-#: src/uicommon/gftpui.c:1461
+#: src/uicommon/gftpui.c:1463
 #, c-format
 msgid "Successfully transferred %s at %.2f KB/s\n"
 msgstr "Successfully transferred %s at %.2f KB/s\n"
@@ -1786,19 +1800,19 @@
 msgid "Remember password"
 msgstr "Remember password"
 
-#: src/gtk/bookmarks.c:469 src/gtk/bookmarks.c:479
+#: src/gtk/bookmarks.c:485 src/gtk/bookmarks.c:495
 msgid "New Folder"
 msgstr "New Folder"
 
-#: src/gtk/bookmarks.c:470
+#: src/gtk/bookmarks.c:486
 msgid "Enter the name of the new folder to create"
 msgstr "Enter the name of the new folder to create"
 
-#: src/gtk/bookmarks.c:480
+#: src/gtk/bookmarks.c:496
 msgid "Enter the name of the new item to create"
 msgstr "Enter the name of the new item to create"
 
-#: src/gtk/bookmarks.c:553
+#: src/gtk/bookmarks.c:569
 #, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
@@ -1807,101 +1821,101 @@
 "Are you sure you want to erase the bookmark\n"
 "%s and all it's children?"
 
-#: src/gtk/bookmarks.c:554
+#: src/gtk/bookmarks.c:570
 msgid "Delete Bookmark"
 msgstr "Delete Bookmark"
 
-#: src/gtk/bookmarks.c:581
+#: src/gtk/bookmarks.c:597
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: src/gtk/bookmarks.c:843 src/gtk/bookmarks.c:846
+#: src/gtk/bookmarks.c:825 src/gtk/bookmarks.c:828
 msgid "Edit Entry"
 msgstr "Edit Entry"
 
-#: src/gtk/bookmarks.c:884
+#: src/gtk/bookmarks.c:866
 msgid "Description:"
 msgstr "Description:"
 
-#: src/gtk/bookmarks.c:899
+#: src/gtk/bookmarks.c:881
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: src/gtk/bookmarks.c:912
+#: src/gtk/bookmarks.c:894
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gtk/bookmarks.c:929
+#: src/gtk/bookmarks.c:911
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtk/bookmarks.c:953
+#: src/gtk/bookmarks.c:935
 msgid "Remote Directory:"
 msgstr "Remote Directory:"
 
-#: src/gtk/bookmarks.c:966
+#: src/gtk/bookmarks.c:948
 msgid "Local Directory:"
 msgstr "Local Directory:"
 
-#: src/gtk/bookmarks.c:983
+#: src/gtk/bookmarks.c:965
 msgid "Username:"
 msgstr "Username:"
 
-#: src/gtk/bookmarks.c:996 src/text/textui.c:86
+#: src/gtk/bookmarks.c:978 src/text/textui.c:86
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtk/bookmarks.c:1010
+#: src/gtk/bookmarks.c:992
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtk/bookmarks.c:1024
+#: src/gtk/bookmarks.c:1006
 msgid "Log in as ANONYMOUS"
 msgstr "Log in as ANONYMOUS"
 
-#: src/gtk/bookmarks.c:1049 src/gtk/bookmarks.c:1303
+#: src/gtk/bookmarks.c:1031 src/gtk/bookmarks.c:1284
 #: src/gtk/chmod_dialog.c:265 src/gtk/gtkui_transfer.c:373
 #: src/gtk/options_dialog.c:1120 src/gtk/options_dialog.c:1324
 msgid "  Cancel  "
 msgstr "  Cancel  "
 
-#: src/gtk/bookmarks.c:1059 src/gtk/options_dialog.c:1335
+#: src/gtk/bookmarks.c:1040 src/gtk/options_dialog.c:1335
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtk/bookmarks.c:1209
+#: src/gtk/bookmarks.c:1190
 msgid "/_File"
 msgstr "/_File"
 
-#: src/gtk/bookmarks.c:1210
+#: src/gtk/bookmarks.c:1191
 msgid "/File/tearoff"
 msgstr "/File/tearoff"
 
-#: src/gtk/bookmarks.c:1211
+#: src/gtk/bookmarks.c:1192
 msgid "/File/New Folder..."
 msgstr "/File/New Folder..."
 
-#: src/gtk/bookmarks.c:1212
+#: src/gtk/bookmarks.c:1193
 msgid "/File/New Item..."
 msgstr "/File/New Item..."
 
-#: src/gtk/bookmarks.c:1213
+#: src/gtk/bookmarks.c:1194
 msgid "/File/Delete"
 msgstr "/File/Delete"
 
-#: src/gtk/bookmarks.c:1214
+#: src/gtk/bookmarks.c:1195
 msgid "/File/Properties..."
 msgstr "/File/Properties..."
 
-#: src/gtk/bookmarks.c:1215
+#: src/gtk/bookmarks.c:1196
 msgid "/File/sep"
 msgstr "/File/sep"
 
-#: src/gtk/bookmarks.c:1216
+#: src/gtk/bookmarks.c:1197
 msgid "/File/Close"
 msgstr "/File/Close"
 
-#: src/gtk/bookmarks.c:1234 src/gtk/bookmarks.c:1237
+#: src/gtk/bookmarks.c:1215 src/gtk/bookmarks.c:1218
 msgid "Edit Bookmarks"
 msgstr "Edit Bookmarks"
 
@@ -2391,7 +2405,7 @@
 
 #: src/gtk/gtkui.c:274
 msgid "Operation canceled...you must enter a string\n"
-msgstr "Operation canceled...you must enter a string\n"
+msgstr "Operation cancelled...you must enter a string\n"
 
 #: src/gtk/gtkui.c:312
 msgid "Mkdir"
@@ -2485,7 +2499,7 @@
 
 #: src/gtk/menu-items.c:37
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
-msgstr "Change Filespec: Operation canceled...you must enter a string\n"
+msgstr "Change Filespec: Operation cancelled...you must enter a string\n"
 
 #: src/gtk/menu-items.c:74 src/gtk/menu-items.c:77
 msgid "Change Filespec"
@@ -2777,7 +2791,7 @@
 
 #: src/gtk/view_dialog.c:114
 msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "Edit: You must specify an editor in the options dialog\n"
+msgstr "Edit: You must specify an editor in the options dialogue\n"
 
 #: src/gtk/view_dialog.c:127
 #, c-format